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

Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 91c389b9a2 am: 100703a82b

Browse Source 
Change-Id: Iac371239bf42a390ab76143bbbc6765a0d9bf03c
This commit is contained in:
tim peng
2020-04-08 04:24:40 +00:00
committed by Automerger Merge Worker
parent 60aa5b2569 100703a82b
commit e1c7ec38a9
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
View File

@@ -21,7 +21,9 @@ import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDIC
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.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -190,6 +192,14 @@ public class MediaOutputIndicatorSliceTest {
assertThat(metadata.isErrorSlice()).isTrue();
}
@Test
public void onNotifyChange_noWorker_doNothing() {
sMediaOutputIndicatorWorker = null;
mMediaOutputIndicatorSlice.onNotifyChange(new Intent());
verify(mContext, never()).startActivity(any());
}
@Test
public void onNotifyChange_withActiveLocalMedia_verifyIntentExtra() {
when(mMediaController.getSessionToken()).thenReturn(mToken);