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

Merge "Fix Robotest failed" into rvc-dev am: 143668668b am: aa528a6a81

Browse Source 
Change-Id: I8b4ecdbb873976aefcd2e0fa6263fdfcf2b00923
This commit is contained in:
tim peng
2020-04-22 01:34:59 +00:00
committed by Automerger Merge Worker
parent 8b290a8311 aa528a6a81
commit 67529ed6eb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java
View File

@@ -30,6 +30,7 @@ import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_GROUP
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -109,6 +110,7 @@ public class MediaOutputGroupSliceTest {
when(sMediaDeviceUpdateWorker.getPackageName()).thenReturn(TEST_PACKAGE_NAME); when(sMediaDeviceUpdateWorker.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
mDrawable = mContext.getDrawable(R.drawable.ic_check_box_blue_24dp); mDrawable = mContext.getDrawable(R.drawable.ic_check_box_blue_24dp);
when(sMediaDeviceUpdateWorker.getSelectableMediaDevice()).thenReturn(mSelectableDevices); when(sMediaDeviceUpdateWorker.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
doReturn(false).when(sMediaDeviceUpdateWorker).hasAdjustVolumeUserRestriction();
when(mDevice1.getId()).thenReturn(TEST_DEVICE_1_ID); when(mDevice1.getId()).thenReturn(TEST_DEVICE_1_ID);
when(mDevice1.getIcon()).thenReturn(mDrawable); when(mDevice1.getIcon()).thenReturn(mDrawable);
when(mDevice1.getName()).thenReturn(TEST_DEVICE_1_NAME); when(mDevice1.getName()).thenReturn(TEST_DEVICE_1_NAME);

6
tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
View File

@@ -25,6 +25,7 @@ import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@@ -101,10 +102,11 @@ public class MediaOutputSliceTest {
mShadowBluetoothAdapter.setEnabled(true); mShadowBluetoothAdapter.setEnabled(true);
mMediaOutputSlice = new MediaOutputSlice(mContext); mMediaOutputSlice = new MediaOutputSlice(mContext);
mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, mMediaDeviceUpdateWorker = spy(new MediaDeviceUpdateWorker(mContext,
MEDIA_OUTPUT_SLICE_URI); MEDIA_OUTPUT_SLICE_URI));
mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices); mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
mMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager; mMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager;
doReturn(false).when(mMediaDeviceUpdateWorker).hasAdjustVolumeUserRestriction();
mMediaOutputSlice.init(mMediaDeviceUpdateWorker); mMediaOutputSlice.init(mMediaDeviceUpdateWorker);
} }