From 336ff700a2cc451003ce057711ad1615c5be13d9 Mon Sep 17 00:00:00 2001 From: Hugh Chen Date: Wed, 24 Jun 2020 10:37:57 +0800 Subject: [PATCH] Fix com.android.settings.media test case fail Bug: 159760643 Test: make -j42 RunSettingsRoboTests Change-Id: I17246088ade1b5e17974ccf24a5e40b915146574 --- .../settings/media/MediaDeviceUpdateWorkerTest.java | 7 +++++++ .../settings/media/MediaOutputIndicatorWorkerTest.java | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java index be86b6e3984..7a3243b55f9 100644 --- a/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java +++ b/tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java @@ -232,13 +232,20 @@ public class MediaDeviceUpdateWorkerTest { public void onSlicePinned_packageUpdated_checkPackageName() { ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager; when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); + mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, URI1); + mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class); + when(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName()) + .thenReturn(TEST_DEVICE_PACKAGE_NAME1); mMediaDeviceUpdateWorker.onSlicePinned(); assertThat(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName()).matches( TEST_DEVICE_PACKAGE_NAME1); mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, URI2); + mMediaDeviceUpdateWorker.mLocalMediaManager = mock(LocalMediaManager.class); + when(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName()) + .thenReturn(TEST_DEVICE_PACKAGE_NAME2); mMediaDeviceUpdateWorker.onSlicePinned(); assertThat(mMediaDeviceUpdateWorker.mLocalMediaManager.getPackageName()).matches( diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java index 423c7acf098..d9b224796ab 100644 --- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java +++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java @@ -121,10 +121,12 @@ public class MediaOutputIndicatorWorkerTest { @Test public void onSlicePinned_packageUpdated_checkPackageName() { + mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager; initPlayback(); when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo); when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState); when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME); + when(mLocalMediaManager.getPackageName()).thenReturn(TEST_PACKAGE_NAME); mMediaOutputIndicatorWorker.onSlicePinned(); waitForLocalMediaManagerInit(); @@ -132,7 +134,7 @@ public class MediaOutputIndicatorWorkerTest { TEST_PACKAGE_NAME); when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME2); - mMediaOutputIndicatorWorker.mLocalMediaManager = null; + when(mLocalMediaManager.getPackageName()).thenReturn(TEST_PACKAGE_NAME2); mMediaOutputIndicatorWorker.onSlicePinned(); waitForLocalMediaManagerInit();