From e9b91f08c4e51db0af55358a1ebbffeef6f2415d Mon Sep 17 00:00:00 2001 From: Tim Peng Date: Thu, 30 Apr 2020 15:23:58 +0800 Subject: [PATCH] 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 --- .../media/MediaDeviceUpdateWorker.java | 22 +++--- .../settings/media/RemoteMediaSlice.java | 32 ++++----- .../RemoteVolumeGroupController.java | 66 ++++++++++-------- .../media/MediaDeviceUpdateWorkerTest.java | 18 +++++ .../settings/media/RemoteMediaSliceTest.java | 54 +++++++-------- .../RemoteVolumeGroupControllerTest.java | 68 +++++++++---------- 6 files changed, 137 insertions(+), 123 deletions(-) diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java index c7682577063..52249ffdbac 100644 --- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java +++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.media.AudioManager; +import android.media.RoutingSessionInfo; import android.net.Uri; import android.os.UserHandle; import android.os.UserManager; @@ -173,6 +174,10 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker return mLocalMediaManager.getSelectedMediaDevice(); } + void adjustSessionVolume(String sessionId, int volume) { + mLocalMediaManager.adjustSessionVolume(sessionId, volume); + } + void adjustSessionVolume(int volume) { mLocalMediaManager.adjustSessionVolume(volume); } @@ -189,15 +194,14 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker return mLocalMediaManager.getSessionName(); } - /** - * Find the active MediaDevice. - * - * @param type the media device type. - * @return MediaDevice list - * - */ - public List getActiveMediaDevice(@MediaDevice.MediaDeviceType int type) { - return mLocalMediaManager.getActiveMediaDevice(type); + List getActiveRemoteMediaDevice() { + final List sessionInfos = new ArrayList<>(); + for (RoutingSessionInfo info : mLocalMediaManager.getActiveMediaSession()) { + if (!info.isSystemSession()) { + sessionInfos.add(info); + } + } + return sessionInfos; } /** diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java index 4e442b77a6b..71a41b36964 100644 --- a/src/com/android/settings/media/RemoteMediaSlice.java +++ b/src/com/android/settings/media/RemoteMediaSlice.java @@ -24,6 +24,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; +import android.media.RoutingSessionInfo; import android.net.Uri; import android.text.TextUtils; import android.util.Log; @@ -41,7 +42,6 @@ import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.SliceBackgroundWorker; import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceBuilderUtils; -import com.android.settingslib.media.MediaDevice; import com.android.settingslib.media.MediaOutputSliceConstants; import java.util.List; @@ -67,7 +67,7 @@ public class RemoteMediaSlice implements CustomSliceable { final int newPosition = intent.getIntExtra(EXTRA_RANGE_VALUE, -1); final String id = intent.getStringExtra(MEDIA_ID); if (!TextUtils.isEmpty(id)) { - getWorker().adjustVolume(getWorker().getMediaDeviceById(id), newPosition); + getWorker().adjustSessionVolume(id, newPosition); } } @@ -80,9 +80,8 @@ public class RemoteMediaSlice implements CustomSliceable { return listBuilder.build(); } // Only displaying remote devices - final List mediaDevices = getWorker().getActiveMediaDevice( - MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE); - if (mediaDevices.isEmpty()) { + final List infos = getWorker().getActiveRemoteMediaDevice(); + if (infos.isEmpty()) { Log.d(TAG, "No active remote media device"); return listBuilder.build(); } @@ -93,27 +92,25 @@ public class RemoteMediaSlice implements CustomSliceable { // To create an empty icon to indent the row final IconCompat emptyIcon = createEmptyIcon(); int requestCode = 0; - for (MediaDevice mediaDevice : mediaDevices) { - final int maxVolume = mediaDevice.getMaxVolume(); + for (RoutingSessionInfo info : infos) { + final int maxVolume = info.getVolumeMax(); if (maxVolume <= 0) { - Log.d(TAG, "Unable to add Slice. " + mediaDevice.getName() + ": max volume is " + Log.d(TAG, "Unable to add Slice. " + info.getName() + ": max volume is " + maxVolume); continue; } - final String title = castVolume + " (" + mediaDevice.getClientAppLabel() + ")"; listBuilder.addInputRange(new InputRangeBuilder() .setTitleItem(icon, ListBuilder.ICON_IMAGE) - .setTitle(title) - .setInputAction(getSliderInputAction(requestCode++, mediaDevice.getId())) - .setPrimaryAction(getSoundSettingAction(title, icon, mediaDevice.getId())) + .setTitle(castVolume) + .setInputAction(getSliderInputAction(requestCode++, info.getId())) + .setPrimaryAction(getSoundSettingAction(castVolume, icon, info.getId())) .setMax(maxVolume) - .setValue(mediaDevice.getCurrentVolume())); + .setValue(info.getVolume())); listBuilder.addRow(new ListBuilder.RowBuilder() .setTitle(outputTitle) - .setSubtitle(mediaDevice.getName()) + .setSubtitle(info.getName()) .setTitleItem(emptyIcon, ListBuilder.ICON_IMAGE) - .setPrimaryAction(getMediaOutputSliceAction( - mediaDevice.getClientPackageName()))); + .setPrimaryAction(getMediaOutputSliceAction(info.getClientPackageName()))); } return listBuilder.build(); } @@ -131,7 +128,8 @@ public class RemoteMediaSlice implements CustomSliceable { return PendingIntent.getBroadcast(mContext, requestCode, intent, 0); } - private SliceAction getSoundSettingAction(String actionTitle, IconCompat icon, String id) { + private SliceAction getSoundSettingAction(CharSequence actionTitle, IconCompat icon, + String id) { final Uri contentUri = new Uri.Builder().appendPath(id).build(); final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, SoundSettings.class.getName(), diff --git a/src/com/android/settings/notification/RemoteVolumeGroupController.java b/src/com/android/settings/notification/RemoteVolumeGroupController.java index c36035aa20e..137f7803d8b 100644 --- a/src/com/android/settings/notification/RemoteVolumeGroupController.java +++ b/src/com/android/settings/notification/RemoteVolumeGroupController.java @@ -18,6 +18,8 @@ package com.android.settings.notification; import android.content.Context; import android.content.Intent; +import android.media.RoutingSessionInfo; +import android.text.TextUtils; import android.util.Log; import androidx.annotation.VisibleForTesting; @@ -51,7 +53,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem static final String SWITCHER_PREFIX = "OUTPUT_SWITCHER"; private PreferenceCategory mPreferenceCategory; - private List mActiveRemoteMediaDevices = new ArrayList<>(); + private List mRoutingSessionInfos = new ArrayList<>(); @VisibleForTesting LocalMediaManager mLocalMediaManager; @@ -67,7 +69,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem @Override public int getAvailabilityStatus() { - if (mActiveRemoteMediaDevices.isEmpty()) { + if (mRoutingSessionInfos.isEmpty()) { return CONDITIONALLY_UNAVAILABLE; } return AVAILABLE_UNSEARCHABLE; @@ -77,12 +79,19 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mPreferenceCategory = screen.findPreference(getPreferenceKey()); - mActiveRemoteMediaDevices.clear(); - mActiveRemoteMediaDevices.addAll(mLocalMediaManager.getActiveMediaDevice( - MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE)); + initRemoteMediaSession(); refreshPreference(); } + private void initRemoteMediaSession() { + mRoutingSessionInfos.clear(); + for (RoutingSessionInfo info : mLocalMediaManager.getActiveMediaSession()) { + if (!info.isSystemSession()) { + mRoutingSessionInfos.add(info); + } + } + } + /** * onDestroy() * {@link androidx.lifecycle.OnLifecycleEvent} @@ -102,27 +111,27 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem final CharSequence outputTitle = mContext.getText(R.string.media_output_title); final CharSequence castVolume = mContext.getText(R.string.remote_media_volume_option_title); mPreferenceCategory.setVisible(true); - int i = 0; - for (MediaDevice device : mActiveRemoteMediaDevices) { - if (mPreferenceCategory.findPreference(device.getId()) != null) { + + for (RoutingSessionInfo info : mRoutingSessionInfos) { + if (mPreferenceCategory.findPreference(info.getId()) != null) { continue; } // Add slider final RemoteVolumeSeekBarPreference seekBarPreference = new RemoteVolumeSeekBarPreference(mContext); - seekBarPreference.setKey(device.getId()); - seekBarPreference.setTitle(castVolume + " (" + device.getClientAppLabel() + ")"); - seekBarPreference.setMax(device.getMaxVolume()); - seekBarPreference.setProgress(device.getCurrentVolume()); + seekBarPreference.setKey(info.getId()); + seekBarPreference.setTitle(castVolume); + seekBarPreference.setMax(info.getVolumeMax()); + seekBarPreference.setProgress(info.getVolume()); seekBarPreference.setMin(0); seekBarPreference.setOnPreferenceChangeListener(this); seekBarPreference.setIcon(R.drawable.ic_volume_remote); mPreferenceCategory.addPreference(seekBarPreference); // Add output indicator final Preference preference = new Preference(mContext); - preference.setKey(SWITCHER_PREFIX + device.getId()); + preference.setKey(SWITCHER_PREFIX + info.getId()); preference.setTitle(outputTitle); - preference.setSummary(device.getName()); + preference.setSummary(info.getName()); mPreferenceCategory.addPreference(preference); } } @@ -135,7 +144,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem return false; } ThreadUtils.postOnBackgroundThread(() -> { - device.requestSetVolume((int) newValue); + mLocalMediaManager.adjustSessionVolume(preference.getKey(), (int) newValue); }); return true; } @@ -145,18 +154,19 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem if (!preference.getKey().startsWith(SWITCHER_PREFIX)) { return false; } - final String key = preference.getKey().substring(SWITCHER_PREFIX.length()); - final MediaDevice device = mLocalMediaManager.getMediaDeviceById(key); - if (device == null) { - return false; + for (RoutingSessionInfo info : mRoutingSessionInfos) { + if (TextUtils.equals(info.getId(), + preference.getKey().substring(SWITCHER_PREFIX.length()))) { + final Intent intent = new Intent() + .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, + info.getClientPackageName()); + mContext.startActivity(intent); + return true; + } } - final Intent intent = new Intent() - .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT) - .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, - device.getClientPackageName()); - mContext.startActivity(intent); - return true; + return false; } @Override @@ -170,9 +180,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem // Preference group is not ready. return; } - mActiveRemoteMediaDevices.clear(); - mActiveRemoteMediaDevices.addAll(mLocalMediaManager.getActiveMediaDevice( - MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE)); + initRemoteMediaSession(); refreshPreference(); } diff --git a/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java index 8014e5639b3..e8f70271487 100644 --- a/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java +++ b/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java @@ -31,6 +31,7 @@ import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.MediaRoute2ProviderService; +import android.media.RoutingSessionInfo; import android.net.Uri; import com.android.settings.testutils.shadow.ShadowAudioManager; @@ -191,4 +192,21 @@ public class MediaDeviceUpdateWorkerTest { verify(mResolver, never()).notifyChange(URI, null); } + + @Test + public void getActiveRemoteMediaSession_verifyList() { + mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class); + final List routingSessionInfos = new ArrayList<>(); + final RoutingSessionInfo remoteSessionInfo = mock(RoutingSessionInfo.class); + final RoutingSessionInfo localSessionInfo = mock(RoutingSessionInfo.class); + when(remoteSessionInfo.isSystemSession()).thenReturn(false); + when(localSessionInfo.isSystemSession()).thenReturn(true); + routingSessionInfos.add(remoteSessionInfo); + routingSessionInfos.add(localSessionInfo); + when(mMediaDeviceUpdateWorker.mLocalMediaManager.getActiveMediaSession()).thenReturn( + routingSessionInfos); + + assertThat(mMediaDeviceUpdateWorker.getActiveRemoteMediaDevice()).containsExactly( + remoteSessionInfo); + } } diff --git a/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java b/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java index b719a9e8f93..017faa5568f 100644 --- a/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java +++ b/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java @@ -24,7 +24,7 @@ import static com.android.settings.slices.CustomSliceRegistry.REMOTE_MEDIA_SLICE import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -32,6 +32,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; +import android.media.RoutingSessionInfo; import android.net.Uri; import androidx.slice.Slice; @@ -43,7 +44,6 @@ import androidx.slice.widget.SliceLiveData; import com.android.settings.slices.SliceBackgroundWorker; import com.android.settingslib.media.LocalMediaManager; -import com.android.settingslib.media.MediaDevice; import org.junit.Before; import org.junit.Test; @@ -64,19 +64,16 @@ import java.util.List; public class RemoteMediaSliceTest { private static final String MEDIA_ID = "media_id"; - 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 TEST_VOLUME = 3; private static MediaDeviceUpdateWorker sMediaDeviceUpdateWorker; @Mock private LocalMediaManager mLocalMediaManager; - @Mock - private MediaDevice mDevice; - private final List mDevices = new ArrayList<>(); + private final List mRoutingSessionInfos = new ArrayList<>(); private Context mContext; private RemoteMediaSlice mRemoteMediaSlice; @@ -93,44 +90,42 @@ public class RemoteMediaSliceTest { sMediaDeviceUpdateWorker = spy(new MediaDeviceUpdateWorker(mContext, REMOTE_MEDIA_SLICE_URI)); sMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager; - when(sMediaDeviceUpdateWorker.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(100); - when(mDevice.getCurrentVolume()).thenReturn(10); - when(mDevice.getClientAppLabel()).thenReturn(TEST_PACKAGE_LABEL); + 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(100); + when(remoteSessionInfo.getVolume()).thenReturn(10); + when(remoteSessionInfo.isSystemSession()).thenReturn(false); + mRoutingSessionInfos.add(remoteSessionInfo); + when(sMediaDeviceUpdateWorker.getActiveRemoteMediaDevice()).thenReturn( + mRoutingSessionInfos); } @Test public void onNotifyChange_noId_doNothing() { - mDevices.add(mDevice); - when(mLocalMediaManager.getMediaDeviceById(mDevices, TEST_DEVICE_1_ID)).thenReturn(mDevice); - sMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices); final Intent intent = new Intent(); intent.putExtra(EXTRA_RANGE_VALUE, TEST_VOLUME); mRemoteMediaSlice.onNotifyChange(intent); - verify(mDevice, never()).requestSetVolume(anyInt()); + verify(sMediaDeviceUpdateWorker, never()) + .adjustSessionVolume(TEST_SESSION_1_ID, TEST_VOLUME); } @Test public void onNotifyChange_verifyAdjustVolume() { - mDevices.add(mDevice); - when(mLocalMediaManager.getMediaDeviceById(mDevices, TEST_DEVICE_1_ID)).thenReturn(mDevice); - sMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices); final Intent intent = new Intent(); - intent.putExtra(MEDIA_ID, TEST_DEVICE_1_ID); + intent.putExtra(MEDIA_ID, TEST_SESSION_1_ID); intent.putExtra(EXTRA_RANGE_VALUE, TEST_VOLUME); mRemoteMediaSlice.onNotifyChange(intent); - verify(mDevice).requestSetVolume(TEST_VOLUME); + verify(sMediaDeviceUpdateWorker).adjustSessionVolume(TEST_SESSION_1_ID, TEST_VOLUME); } @Test - public void getSlice_noActiveDevice_checkRowNumber() { + public void getSlice_noActiveSession_checkRowNumber() { + mRoutingSessionInfos.clear(); final Slice slice = mRemoteMediaSlice.getSlice(); final int rows = SliceQuery.findAll(slice, FORMAT_SLICE, HINT_LIST_ITEM, null).size(); @@ -138,8 +133,7 @@ public class RemoteMediaSliceTest { } @Test - public void getSlice_withActiveDevice_checkRowNumber() { - mDevices.add(mDevice); + public void getSlice_withActiveSession_checkRowNumber() { final Slice slice = mRemoteMediaSlice.getSlice(); final int rows = SliceQuery.findAll(slice, FORMAT_SLICE, HINT_LIST_ITEM, null).size(); @@ -148,15 +142,13 @@ public class RemoteMediaSliceTest { } @Test - public void getSlice_withActiveDevice_checkTitle() { - mDevices.add(mDevice); + public void getSlice_withActiveSession_checkTitle() { final Slice slice = mRemoteMediaSlice.getSlice(); final SliceMetadata metadata = SliceMetadata.from(mContext, slice); final SliceAction primaryAction = metadata.getPrimaryAction(); assertThat(primaryAction.getTitle().toString()).isEqualTo(mContext.getText( - com.android.settings.R.string.remote_media_volume_option_title) - + " (" + TEST_PACKAGE_LABEL + ")"); + com.android.settings.R.string.remote_media_volume_option_title)); } @Implements(SliceBackgroundWorker.class) diff --git a/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java b/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java index d81f30fc6b0..9e140ce3b4e 100644 --- a/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java @@ -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 mDevices = new ArrayList<>(); + private final List 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); } }