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

Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: c14daa817b am: c88e678aa9

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

Change-Id: I5a33631c2e7ea1030061e997df4eba1af9e8ecbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-15 13:11:06 +00:00
committed by Automerger Merge Worker
parent 89639372d5 c88e678aa9
commit 6a2327f7fe
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/robotests/src/com/android/settings/slices/SlicePreferenceControllerTest.java
View File

@@ -18,15 +18,15 @@ package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
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;
import static org.mockito.Mockito.when;
import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.lifecycle.Observer;
import androidx.slice.Slice; import androidx.slice.Slice;
import org.junit.Before; import org.junit.Before;
@@ -80,7 +80,6 @@ public class SlicePreferenceControllerTest {
@Test @Test
public void onStop_unregisterObserver() { public void onStop_unregisterObserver() {
when(mLiveData.hasActiveObservers()).thenReturn(true);
mController.onStart(); mController.onStart();
mController.onStop(); mController.onStop();
@@ -88,20 +87,18 @@ public class SlicePreferenceControllerTest {
} }
@Test @Test
public void onStop_noActiveObservers_notUnregisterObserver() { public void onStop_unregisterObserverAndHasSecurityException_noCrash() {
when(mLiveData.hasActiveObservers()).thenReturn(false); LiveData<Slice> liveData = new LiveData<Slice>() {
@Override
public void removeObserver(@NonNull Observer<? super Slice> observer) {
super.removeObserver(observer);
throw new SecurityException("SecurityException Test");
}
};
mController.mLiveData = liveData;
mController.onStart(); mController.onStart();
mController.onStop(); mController.onStop();
verify(mLiveData, never()).removeObserver(mController);
}
@Test
public void onStop_notRegisterObserver_notUnregisterObserver() {
when(mLiveData.hasActiveObservers()).thenReturn(true);
mController.onStop();
verify(mLiveData, never()).removeObserver(mController);
} }
@Test @Test