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

Merge "Avoid flakiness SLO" into main am: aa8b66f3ad

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

Change-Id: I2e906f76248880a2fe2cb1ea36bf6a9783730080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-10-23 08:36:25 +00:00
committed by Automerger Merge Worker
parent 1dd30843d0 aa8b66f3ad
commit f5e3b586cb
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/src/com/android/settings/security/SecurityDashboardActivityTest.java
View File

@@ -31,6 +31,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import androidx.test.annotation.UiThreadTest;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.platform.app.InstrumentationRegistry;
@@ -90,6 +91,7 @@ public class SecurityDashboardActivityTest {
} }
@Test @Test
@UiThreadTest
public void noAvailableAlternativeFragmentAvailable_defaultFragmentSet() { public void noAvailableAlternativeFragmentAvailable_defaultFragmentSet() {
when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment())
.thenReturn(false); .thenReturn(false);
@@ -99,6 +101,7 @@ public class SecurityDashboardActivityTest {
} }
@Test @Test
@UiThreadTest
public void alternativeFragmentAvailable_alternativeFragmentSet() { public void alternativeFragmentAvailable_alternativeFragmentSet() {
when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment())
.thenReturn(true); .thenReturn(true);
@@ -110,6 +113,7 @@ public class SecurityDashboardActivityTest {
} }
@Test @Test
@UiThreadTest
public void noAvailableAlternativeFragmentAvailable_alternativeFragmentNotValid() { public void noAvailableAlternativeFragmentAvailable_alternativeFragmentNotValid() {
when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment())
.thenReturn(false); .thenReturn(false);
@@ -118,6 +122,7 @@ public class SecurityDashboardActivityTest {
} }
@Test @Test
@UiThreadTest
public void alternativeFragmentAvailable_alternativeFragmentIsValid() { public void alternativeFragmentAvailable_alternativeFragmentIsValid() {
when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment())
.thenReturn(true); .thenReturn(true);
@@ -128,6 +133,7 @@ public class SecurityDashboardActivityTest {
} }
@Test @Test
@UiThreadTest
public void onCreate_whenSafetyCenterEnabled_redirectsToSafetyCenter() { public void onCreate_whenSafetyCenterEnabled_redirectsToSafetyCenter() {
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true); when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true);
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
@@ -139,6 +145,7 @@ public class SecurityDashboardActivityTest {
} }
@Test @Test
@UiThreadTest
public void onCreate_whenSafetyCenterDisabled_doesntRedirectToSafetyCenter() { public void onCreate_whenSafetyCenterDisabled_doesntRedirectToSafetyCenter() {
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false); when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false);