Fix test case fail
Bug: 160956047 Test: make -j50 RunSettingsRoboTests Change-Id: Ib975e906aefc44c59a8465a586832d92664f5147
This commit is contained in:
@@ -22,7 +22,6 @@ import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -94,9 +93,9 @@ public class MediaOutputIndicatorWorkerTest {
|
||||
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
|
||||
when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
|
||||
mMediaOutputIndicatorWorker = new MediaOutputIndicatorWorker(mContext, URI);
|
||||
when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
|
||||
doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
|
||||
mMediaControllers.add(mMediaController);
|
||||
when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
|
||||
doReturn(mMediaControllers).when(mMediaSessionManager).getActiveSessions(any());
|
||||
|
||||
mResolver = mock(ContentResolver.class);
|
||||
doReturn(mResolver).when(mContext).getContentResolver();
|
||||
@@ -144,6 +143,7 @@ public class MediaOutputIndicatorWorkerTest {
|
||||
|
||||
@Test
|
||||
public void onSlicePinned_noActiveController_noPackageName() {
|
||||
mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
|
||||
mMediaControllers.clear();
|
||||
|
||||
mMediaOutputIndicatorWorker.onSlicePinned();
|
||||
@@ -186,18 +186,16 @@ public class MediaOutputIndicatorWorkerTest {
|
||||
|
||||
@Test
|
||||
public void onReceive_shouldNotifyChange() {
|
||||
mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
|
||||
mMediaOutputIndicatorWorker.onSlicePinned();
|
||||
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);
|
||||
for (BroadcastReceiver receiver : mShadowApplication.getReceiversForIntent(intent)) {
|
||||
receiver.onReceive(mContext, intent);
|
||||
}
|
||||
// Intent receiver triggers notifyChange() again
|
||||
verify(mResolver, times(2)).notifyChange(URI, null /* observer */);
|
||||
verify(mResolver).notifyChange(URI, null /* observer */);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U
|
||||
|
||||
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.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
@@ -31,6 +32,7 @@ import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageStats;
|
||||
import android.media.RoutingSessionInfo;
|
||||
import android.media.session.MediaSessionManager;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceCategory;
|
||||
@@ -77,6 +79,8 @@ public class RemoteVolumeGroupControllerTest {
|
||||
private PreferenceManager mPreferenceManager;
|
||||
@Mock
|
||||
private SharedPreferences mSharedPreferences;
|
||||
@Mock
|
||||
private MediaSessionManager mMediaSessionManager;
|
||||
|
||||
private final List<RoutingSessionInfo> mRoutingSessionInfos = new ArrayList<>();
|
||||
|
||||
@@ -91,7 +95,9 @@ public class RemoteVolumeGroupControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
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.mLocalMediaManager = mLocalMediaManager;
|
||||
mPreferenceCategory = spy(new PreferenceCategory(mContext));
|
||||
|
@@ -21,6 +21,7 @@ import static com.android.settings.media.MediaOutputSlice.MEDIA_PACKAGE_NAME;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
@@ -92,7 +93,7 @@ public class MediaOutputPanelTest {
|
||||
when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME);
|
||||
when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
|
||||
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();
|
||||
builder.setTitle(TEST_SONG);
|
||||
builder.setSubtitle(TEST_ARTIST);
|
||||
|
@@ -23,6 +23,7 @@ import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
@@ -147,7 +148,7 @@ public class MediaOutputPreferenceControllerTest {
|
||||
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager;
|
||||
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(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
|
||||
mPlaybackInfo = new MediaController.PlaybackInfo(
|
||||
|
Reference in New Issue
Block a user