Modify rule of remote media session UI
-Add preference by remote session in Sound Setting -Add slice item by remote session in Volume panel -Replace media device data with media session data -Add test case Bug: 154918214 Test: make -j50 RunSettingsRoboTests Change-Id: Ib1c873c9f99eebcba377f4115c4b9b4297b20c3d
This commit is contained in:
Tim Peng
@@ -21,11 +21,13 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.media.RoutingSessionInfo;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceCategory;
|
||||
@@ -36,7 +38,6 @@ import com.android.settings.R;
|
||||
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
|
||||
import com.android.settings.widget.SeekBarPreference;
|
||||
import com.android.settingslib.media.LocalMediaManager;
|
||||
import com.android.settingslib.media.MediaDevice;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -55,24 +56,21 @@ import java.util.List;
|
||||
public class RemoteVolumeGroupControllerTest {
|
||||
|
||||
private static final String KEY_REMOTE_VOLUME_GROUP = "remote_media_group";
|
||||
private static final String TEST_PACKAGE_LABEL = "music";
|
||||
private static final String TEST_DEVICE_1_ID = "test_device_1_id";
|
||||
private static final String TEST_DEVICE_1_NAME = "test_device_1_name";
|
||||
private static final String TEST_SESSION_1_ID = "test_session_1_id";
|
||||
private static final String TEST_SESSION_1_NAME = "test_session_1_name";
|
||||
private static final int CURRENT_VOLUME = 30;
|
||||
private static final int MAX_VOLUME = 100;
|
||||
|
||||
@Mock
|
||||
private LocalMediaManager mLocalMediaManager;
|
||||
@Mock
|
||||
private MediaDevice mDevice;
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock
|
||||
private PreferenceManager mPreferenceManager;
|
||||
@Mock
|
||||
private SharedPreferences mSharedPreferences;
|
||||
|
||||
private final List<MediaDevice> mDevices = new ArrayList<>();
|
||||
private final List<RoutingSessionInfo> mRoutingSessionInfos = new ArrayList<>();
|
||||
|
||||
private Context mContext;
|
||||
private RemoteVolumeGroupController mController;
|
||||
@@ -89,92 +87,88 @@ public class RemoteVolumeGroupControllerTest {
|
||||
|
||||
when(mPreferenceCategory.getPreferenceManager()).thenReturn(mPreferenceManager);
|
||||
when(mPreferenceManager.getSharedPreferences()).thenReturn(mSharedPreferences);
|
||||
when(mLocalMediaManager.getActiveMediaDevice(
|
||||
MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE)).thenReturn(mDevices);
|
||||
when(mDevice.getId()).thenReturn(TEST_DEVICE_1_ID);
|
||||
when(mDevice.getName()).thenReturn(TEST_DEVICE_1_NAME);
|
||||
when(mDevice.getMaxVolume()).thenReturn(MAX_VOLUME);
|
||||
when(mDevice.getCurrentVolume()).thenReturn(CURRENT_VOLUME);
|
||||
when(mDevice.getClientAppLabel()).thenReturn(TEST_PACKAGE_LABEL);
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(
|
||||
mPreferenceCategory);
|
||||
final RoutingSessionInfo remoteSessionInfo = mock(RoutingSessionInfo.class);
|
||||
when(remoteSessionInfo.getId()).thenReturn(TEST_SESSION_1_ID);
|
||||
when(remoteSessionInfo.getName()).thenReturn(TEST_SESSION_1_NAME);
|
||||
when(remoteSessionInfo.getVolumeMax()).thenReturn(MAX_VOLUME);
|
||||
when(remoteSessionInfo.getVolume()).thenReturn(CURRENT_VOLUME);
|
||||
when(remoteSessionInfo.isSystemSession()).thenReturn(false);
|
||||
mRoutingSessionInfos.add(remoteSessionInfo);
|
||||
when(mLocalMediaManager.getActiveMediaSession()).thenReturn(mRoutingSessionInfos);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_withActiveDevice_returnAvailableUnsearchable() {
|
||||
mDevices.add(mDevice);
|
||||
public void getAvailabilityStatus_withActiveSession_returnAvailableUnsearchable() {
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_noActiveDevice_returnConditionallyUnavailable() {
|
||||
public void getAvailabilityStatus_noActiveSession_returnConditionallyUnavailable() {
|
||||
mRoutingSessionInfos.clear();
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_noActiveDevice_checkPreferenceCount() {
|
||||
public void displayPreference_noActiveSession_checkPreferenceCount() {
|
||||
mRoutingSessionInfos.clear();
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_withActiveDevice_checkPreferenceCount() {
|
||||
mDevices.add(mDevice);
|
||||
public void displayPreference_withActiveSession_checkPreferenceCount() {
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_withActiveDevice_checkSeekBarTitle() {
|
||||
mDevices.add(mDevice);
|
||||
public void displayPreference_withActiveSession_checkSeekBarTitle() {
|
||||
mController.displayPreference(mScreen);
|
||||
final Preference preference = mPreferenceCategory.findPreference(TEST_DEVICE_1_ID);
|
||||
final Preference preference = mPreferenceCategory.findPreference(TEST_SESSION_1_ID);
|
||||
|
||||
assertThat(preference.getTitle()).isEqualTo(mContext.getText(
|
||||
R.string.remote_media_volume_option_title) + " (" + TEST_PACKAGE_LABEL + ")");
|
||||
R.string.remote_media_volume_option_title));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_withActiveDevice_checkSeekBarMaxVolume() {
|
||||
mDevices.add(mDevice);
|
||||
public void displayPreference_withActiveSession_checkSeekBarMaxVolume() {
|
||||
mController.displayPreference(mScreen);
|
||||
final SeekBarPreference preference = mPreferenceCategory.findPreference(TEST_DEVICE_1_ID);
|
||||
final SeekBarPreference preference = mPreferenceCategory.findPreference(TEST_SESSION_1_ID);
|
||||
|
||||
assertThat(preference.getMax()).isEqualTo(MAX_VOLUME);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_withActiveDevice_checkSeekBarCurrentVolume() {
|
||||
mDevices.add(mDevice);
|
||||
public void displayPreference_withActiveSession_checkSeekBarCurrentVolume() {
|
||||
mController.displayPreference(mScreen);
|
||||
final SeekBarPreference preference = mPreferenceCategory.findPreference(TEST_DEVICE_1_ID);
|
||||
final SeekBarPreference preference = mPreferenceCategory.findPreference(TEST_SESSION_1_ID);
|
||||
|
||||
assertThat(preference.getProgress()).isEqualTo(CURRENT_VOLUME);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_withActiveDevice_checkSwitcherPreferenceTitle() {
|
||||
mDevices.add(mDevice);
|
||||
public void displayPreference_withActiveSession_checkSwitcherPreferenceTitle() {
|
||||
mController.displayPreference(mScreen);
|
||||
final Preference preference = mPreferenceCategory.findPreference(
|
||||
RemoteVolumeGroupController.SWITCHER_PREFIX + TEST_DEVICE_1_ID);
|
||||
RemoteVolumeGroupController.SWITCHER_PREFIX + TEST_SESSION_1_ID);
|
||||
|
||||
assertThat(preference.getTitle()).isEqualTo(mContext.getText(R.string.media_output_title));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_withActiveDevice_checkSwitcherPreferenceSummary() {
|
||||
mDevices.add(mDevice);
|
||||
public void displayPreference_withActiveSession_checkSwitcherPreferenceSummary() {
|
||||
mController.displayPreference(mScreen);
|
||||
final Preference preference = mPreferenceCategory.findPreference(
|
||||
RemoteVolumeGroupController.SWITCHER_PREFIX + TEST_DEVICE_1_ID);
|
||||
RemoteVolumeGroupController.SWITCHER_PREFIX + TEST_SESSION_1_ID);
|
||||
|
||||
assertThat(preference.getSummary()).isEqualTo(TEST_DEVICE_1_NAME);
|
||||
assertThat(preference.getSummary()).isEqualTo(TEST_SESSION_1_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user