PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix com.android.settings.media test case fail" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-24 05:01:33 +00:00
committed by Android (Google) Code Review
parent a5c9c0458c 336ff700a2
commit 334985feab
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java
View File

@@ -232,13 +232,20 @@ public class MediaDeviceUpdateWorkerTest {
public void onSlicePinned_packageUpdated_checkPackageName() { public void onSlicePinned_packageUpdated_checkPackageName() {
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager; ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, URI1); mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, URI1);
mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class);
when(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName())
.thenReturn(TEST_DEVICE_PACKAGE_NAME1);
mMediaDeviceUpdateWorker.onSlicePinned(); mMediaDeviceUpdateWorker.onSlicePinned();
assertThat(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName()).matches( assertThat(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName()).matches(
TEST_DEVICE_PACKAGE_NAME1); TEST_DEVICE_PACKAGE_NAME1);
mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, URI2); mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, URI2);
mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class);
when(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName())
.thenReturn(TEST_DEVICE_PACKAGE_NAME2);
mMediaDeviceUpdateWorker.onSlicePinned(); mMediaDeviceUpdateWorker.onSlicePinned();
assertThat(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName()).matches( assertThat(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName()).matches(

4
tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
View File

@@ -121,10 +121,12 @@ public class MediaOutputIndicatorWorkerTest {
@Test @Test
public void onSlicePinned_packageUpdated_checkPackageName() { public void onSlicePinned_packageUpdated_checkPackageName() {
mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
initPlayback(); initPlayback();
when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo); when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState); when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME); when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
when(mLocalMediaManager.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
mMediaOutputIndicatorWorker.onSlicePinned(); mMediaOutputIndicatorWorker.onSlicePinned();
waitForLocalMediaManagerInit(); waitForLocalMediaManagerInit();
@@ -132,7 +134,7 @@ public class MediaOutputIndicatorWorkerTest {
TEST_PACKAGE_NAME); TEST_PACKAGE_NAME);
when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME2); when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME2);
mMediaOutputIndicatorWorker.mLocalMediaManager = null; when(mLocalMediaManager.getPackageName()).thenReturn(TEST_PACKAGE_NAME2);
mMediaOutputIndicatorWorker.onSlicePinned(); mMediaOutputIndicatorWorker.onSlicePinned();
waitForLocalMediaManagerInit(); waitForLocalMediaManagerInit();