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

Fix test case fail

Browse Source 
Bug: 160956047
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib975e906aefc44c59a8465a586832d92664f5147
This commit is contained in:
timhypeng
2020-07-10 21:38:19 +08:00
parent 3d1e9c2ea1
commit b5527e329b
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -94,9 +93,9 @@ public class MediaOutputIndicatorWorkerTest {
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager; ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
mMediaOutputIndicatorWorker = new MediaOutputIndicatorWorker(mContext, URI); mMediaOutputIndicatorWorker = new MediaOutputIndicatorWorker(mContext, URI);
when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager); doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
mMediaControllers.add(mMediaController); mMediaControllers.add(mMediaController);
when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers); doReturn(mMediaControllers).when(mMediaSessionManager).getActiveSessions(any());
mResolver = mock(ContentResolver.class); mResolver = mock(ContentResolver.class);
doReturn(mResolver).when(mContext).getContentResolver(); doReturn(mResolver).when(mContext).getContentResolver();
@@ -144,6 +143,7 @@ public class MediaOutputIndicatorWorkerTest {
@Test @Test
public void onSlicePinned_noActiveController_noPackageName() { public void onSlicePinned_noActiveController_noPackageName() {
mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
mMediaControllers.clear(); mMediaControllers.clear();
mMediaOutputIndicatorWorker.onSlicePinned(); mMediaOutputIndicatorWorker.onSlicePinned();
@@ -186,18 +186,16 @@ public class MediaOutputIndicatorWorkerTest {
@Test @Test
public void onReceive_shouldNotifyChange() { public void onReceive_shouldNotifyChange() {
mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
mMediaOutputIndicatorWorker.onSlicePinned(); mMediaOutputIndicatorWorker.onSlicePinned();
waitForLocalMediaManagerInit(); waitForLocalMediaManagerInit();
// onSlicePinned will registerCallback() and get first callback. Callback triggers this at
// the first time.
verify(mResolver, times(1)).notifyChange(URI, null);
final Intent intent = new Intent(AudioManager.STREAM_DEVICES_CHANGED_ACTION); final Intent intent = new Intent(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
for (BroadcastReceiver receiver : mShadowApplication.getReceiversForIntent(intent)) { for (BroadcastReceiver receiver : mShadowApplication.getReceiversForIntent(intent)) {
receiver.onReceive(mContext, intent); receiver.onReceive(mContext, intent);
} }
// Intent receiver triggers notifyChange() again // Intent receiver triggers notifyChange() again
verify(mResolver, times(2)).notifyChange(URI, null /* observer */); verify(mResolver).notifyChange(URI, null /* observer */);
} }
@Test @Test

8
tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
View File

@@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U
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.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -31,6 +32,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageStats; import android.content.pm.PackageStats;
import android.media.RoutingSessionInfo; import android.media.RoutingSessionInfo;
import android.media.session.MediaSessionManager;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
@@ -77,6 +79,8 @@ public class RemoteVolumeGroupControllerTest {
private PreferenceManager mPreferenceManager; private PreferenceManager mPreferenceManager;
@Mock @Mock
private SharedPreferences mSharedPreferences; private SharedPreferences mSharedPreferences;
@Mock
private MediaSessionManager mMediaSessionManager;
private final List<RoutingSessionInfo> mRoutingSessionInfos = new ArrayList<>(); private final List<RoutingSessionInfo> mRoutingSessionInfos = new ArrayList<>();
@@ -91,7 +95,9 @@ public class RemoteVolumeGroupControllerTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = spy(RuntimeEnvironment.application);
doReturn(mMediaSessionManager).when(mContext).getSystemService(
Context.MEDIA_SESSION_SERVICE);
mController = new RemoteVolumeGroupController(mContext, KEY_REMOTE_VOLUME_GROUP); mController = new RemoteVolumeGroupController(mContext, KEY_REMOTE_VOLUME_GROUP);
mController.mLocalMediaManager = mLocalMediaManager; mController.mLocalMediaManager = mLocalMediaManager;
mPreferenceCategory = spy(new PreferenceCategory(mContext)); mPreferenceCategory = spy(new PreferenceCategory(mContext));

3
tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
View File

@@ -21,6 +21,7 @@ import static com.android.settings.media.MediaOutputSlice.MEDIA_PACKAGE_NAME;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
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;
@@ -92,7 +93,7 @@ public class MediaOutputPanelTest {
when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME); when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME);
when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers); when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
when(mContext.getApplicationContext()).thenReturn(mContext); when(mContext.getApplicationContext()).thenReturn(mContext);
when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager); doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
MediaDescription.Builder builder = new MediaDescription.Builder(); MediaDescription.Builder builder = new MediaDescription.Builder();
builder.setTitle(TEST_SONG); builder.setTitle(TEST_SONG);
builder.setSubtitle(TEST_ARTIST); builder.setSubtitle(TEST_ARTIST);

3
tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
View File

@@ -23,6 +23,7 @@ import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
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;
@@ -147,7 +148,7 @@ public class MediaOutputPreferenceControllerTest {
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager;
mLocalBluetoothManager = Utils.getLocalBtManager(mContext); mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager); doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers); when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME); when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
mPlaybackInfo = new MediaController.PlaybackInfo( mPlaybackInfo = new MediaController.PlaybackInfo(