Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7890859b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985fe am: 1431d764 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I7e61276edaee46ab2a05eb6dcd4d62d49bd380dd
parents bef3383f 1431d764

tests/robotests/src/com/android/settings/media/MediaDeviceUpdateWorkerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -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(

tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -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();