Merge "Merge SafetyCenterStatusHolder into SafetyCenterManagerWrapper" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
67c0b83f7f
@@ -33,7 +33,7 @@ import androidx.test.platform.app.InstrumentationRegistry;
|
||||
|
||||
import com.android.settings.Settings;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.safetycenter.SafetyCenterStatusHolder;
|
||||
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -48,14 +48,14 @@ public class PrivacyDashboardActivityTest {
|
||||
private static final String DEFAULT_FRAGMENT_CLASSNAME = "DefaultFragmentClassname";
|
||||
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
private Settings.PrivacyDashboardActivity mActivity;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
final Intent intent = new Intent();
|
||||
intent.setAction(android.provider.Settings.ACTION_PRIVACY_SETTINGS);
|
||||
intent.setClass(InstrumentationRegistry.getInstrumentation().getTargetContext(),
|
||||
@@ -78,7 +78,7 @@ public class PrivacyDashboardActivityTest {
|
||||
|
||||
@Test
|
||||
public void onCreate_whenSafetyCenterEnabled_redirectsToSafetyCenter() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true);
|
||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
mActivity.handleSafetyCenterRedirection();
|
||||
@@ -89,7 +89,7 @@ public class PrivacyDashboardActivityTest {
|
||||
|
||||
@Test
|
||||
public void onCreate_whenSafetyCenterDisabled_doesntRedirectToSafetyCenter() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false);
|
||||
mActivity.handleSafetyCenterRedirection();
|
||||
|
||||
verify(mActivity, times(0)).startActivity(any());
|
||||
|
@@ -26,7 +26,7 @@ import android.content.Context;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import com.android.settings.safetycenter.SafetyCenterStatusHolder;
|
||||
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
|
||||
import com.android.settings.security.TopLevelSecurityEntryPreferenceController;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -43,12 +43,12 @@ public class TopLevelPrivacyEntryPreferenceControllerTest {
|
||||
private TopLevelPrivacyEntryPreferenceController mTopLevelPrivacyEntryPreferenceController;
|
||||
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
|
||||
mTopLevelPrivacyEntryPreferenceController =
|
||||
new TopLevelPrivacyEntryPreferenceController(
|
||||
@@ -57,7 +57,7 @@ public class TopLevelPrivacyEntryPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_whenSafetyCenterEnabled_returnsUnavailable() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true);
|
||||
|
||||
assertThat(mTopLevelPrivacyEntryPreferenceController.getAvailabilityStatus())
|
||||
.isEqualTo(TopLevelSecurityEntryPreferenceController.CONDITIONALLY_UNAVAILABLE);
|
||||
@@ -65,7 +65,7 @@ public class TopLevelPrivacyEntryPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_whenSafetyCenterDisabled_returnsAvailable() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false);
|
||||
|
||||
assertThat(mTopLevelPrivacyEntryPreferenceController.getAvailabilityStatus())
|
||||
.isEqualTo(TopLevelSecurityEntryPreferenceController.AVAILABLE);
|
||||
|
@@ -41,26 +41,21 @@ public class BiometricsSafetySourceTest {
|
||||
@Mock
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mApplicationContext = ApplicationProvider.getApplicationContext();
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
SafetyCenterManagerWrapper.sInstance = null;
|
||||
SafetyCenterStatusHolder.sInstance = null;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_whenSafetyCenterIsDisabled_sendsNoData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(false);
|
||||
|
||||
BiometricsSafetySource.sendSafetyData(mApplicationContext);
|
||||
|
||||
@@ -70,7 +65,7 @@ public class BiometricsSafetySourceTest {
|
||||
@Test
|
||||
// TODO(b/215517420): Adapt this test when method is implemented.
|
||||
public void sendSafetyData_whenSafetyCenterIsEnabled_sendsNoData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
|
||||
BiometricsSafetySource.sendSafetyData(mApplicationContext);
|
||||
|
||||
|
@@ -56,9 +56,6 @@ public class LockScreenSafetySourceTest {
|
||||
@Mock
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
|
||||
@Mock
|
||||
private ScreenLockPreferenceDetailsUtils mScreenLockPreferenceDetailsUtils;
|
||||
|
||||
@@ -67,18 +64,16 @@ public class LockScreenSafetySourceTest {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mApplicationContext = ApplicationProvider.getApplicationContext();
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
SafetyCenterManagerWrapper.sInstance = null;
|
||||
SafetyCenterStatusHolder.sInstance = null;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_whenSafetyCenterIsDisabled_sendsNoData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(false);
|
||||
|
||||
LockScreenSafetySource.sendSafetyData(mApplicationContext,
|
||||
mScreenLockPreferenceDetailsUtils);
|
||||
@@ -88,7 +83,7 @@ public class LockScreenSafetySourceTest {
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_whenScreenLockIsDisabled_sendsNoData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mScreenLockPreferenceDetailsUtils.isAvailable()).thenReturn(false);
|
||||
|
||||
LockScreenSafetySource.sendSafetyData(mApplicationContext,
|
||||
@@ -227,7 +222,7 @@ public class LockScreenSafetySourceTest {
|
||||
}
|
||||
|
||||
private void whenScreenLockIsEnabled() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mScreenLockPreferenceDetailsUtils.isAvailable()).thenReturn(true);
|
||||
when(mScreenLockPreferenceDetailsUtils.getSummary(anyInt())).thenReturn(SUMMARY);
|
||||
|
||||
|
@@ -32,7 +32,7 @@ import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class SafetyCenterStatusHolderTest {
|
||||
public class SafetyCenterManagerWrapperTest {
|
||||
|
||||
@Mock
|
||||
private Context mContext;
|
||||
@@ -44,13 +44,13 @@ public class SafetyCenterStatusHolderTest {
|
||||
|
||||
@Test
|
||||
public void isEnabled_whenContextNull_returnsFalse() {
|
||||
assertThat(SafetyCenterStatusHolder.get().isEnabled(null)).isFalse();
|
||||
assertThat(SafetyCenterManagerWrapper.get().isEnabled(null)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isEnabled_whenSystemServiceNull_returnsFalse() {
|
||||
when(mContext.getSystemService(SafetyCenterManager.class)).thenReturn(null);
|
||||
|
||||
assertThat(SafetyCenterStatusHolder.get().isEnabled(mContext)).isFalse();
|
||||
assertThat(SafetyCenterManagerWrapper.get().isEnabled(mContext)).isFalse();
|
||||
}
|
||||
}
|
@@ -50,26 +50,21 @@ public class SafetySourceBroadcastReceiverTest {
|
||||
@Mock
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mApplicationContext = ApplicationProvider.getApplicationContext();
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
SafetyCenterManagerWrapper.sInstance = null;
|
||||
SafetyCenterStatusHolder.sInstance = null;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_whenSafetyCenterIsEnabled_withNoIntentAction_sendsNoData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
Intent intent = new Intent().putExtra(EXTRA_REFRESH_SAFETY_SOURCE_IDS, new String[]{});
|
||||
|
||||
new SafetySourceBroadcastReceiver().onReceive(mApplicationContext, intent);
|
||||
@@ -79,7 +74,7 @@ public class SafetySourceBroadcastReceiverTest {
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_whenSafetyCenterIsDisabled_sendsNoData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(false);
|
||||
Intent intent =
|
||||
new Intent()
|
||||
.setAction(ACTION_REFRESH_SAFETY_SOURCES)
|
||||
@@ -94,7 +89,7 @@ public class SafetySourceBroadcastReceiverTest {
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_whenSafetyCenterIsEnabled_withNullSourceIds_sendsNoData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
Intent intent = new Intent().setAction(ACTION_REFRESH_SAFETY_SOURCES);
|
||||
|
||||
new SafetySourceBroadcastReceiver().onReceive(mApplicationContext, intent);
|
||||
@@ -104,7 +99,7 @@ public class SafetySourceBroadcastReceiverTest {
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_whenSafetyCenterIsEnabled_withNoSourceIds_sendsNoData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
Intent intent =
|
||||
new Intent()
|
||||
.setAction(ACTION_REFRESH_SAFETY_SOURCES)
|
||||
@@ -117,7 +112,7 @@ public class SafetySourceBroadcastReceiverTest {
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_withLockscreenSourceId_sendsLockscreenData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
Intent intent =
|
||||
new Intent()
|
||||
.setAction(ACTION_REFRESH_SAFETY_SOURCES)
|
||||
@@ -136,7 +131,7 @@ public class SafetySourceBroadcastReceiverTest {
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_withBiometricsSourceId_sendsBiometricData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
Intent intent =
|
||||
new Intent()
|
||||
.setAction(ACTION_REFRESH_SAFETY_SOURCES)
|
||||
@@ -152,7 +147,7 @@ public class SafetySourceBroadcastReceiverTest {
|
||||
|
||||
@Test
|
||||
public void sendSafetyData_onBootCompleted_sendsBiometricAndLockscreenData() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
|
||||
Intent intent = new Intent().setAction(Intent.ACTION_BOOT_COMPLETED);
|
||||
|
||||
// TODO(b/215517420): Update this test when BiometricSafetySource is implemented to test
|
||||
|
@@ -32,6 +32,7 @@ import androidx.preference.Preference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -49,7 +50,7 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest {
|
||||
private Preference mPreference;
|
||||
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
|
||||
@Mock
|
||||
private Context mContext;
|
||||
@@ -57,7 +58,7 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
|
||||
mPreference = new Preference(ApplicationProvider.getApplicationContext());
|
||||
mPreference.setKey(PREFERENCE_KEY);
|
||||
@@ -67,6 +68,11 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest {
|
||||
new TopLevelSafetyCenterEntryPreferenceController(mContext, PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
SafetyCenterManagerWrapper.sInstance = null;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handlePreferenceTreeClick_forDifferentPreferenceKey_isNotHandled() {
|
||||
Preference preference = new Preference(ApplicationProvider.getApplicationContext());
|
||||
@@ -104,7 +110,7 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_whenSafetyCenterDisabled_returnsUnavailable() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false);
|
||||
|
||||
assertThat(mTopLevelSafetyCenterEntryPreferenceController.getAvailabilityStatus())
|
||||
.isEqualTo(TopLevelSafetyCenterEntryPreferenceController.CONDITIONALLY_UNAVAILABLE);
|
||||
@@ -112,7 +118,7 @@ public class TopLevelSafetyCenterEntryPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_whenSafetyCenterEnabled_returnsAvailable() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true);
|
||||
|
||||
assertThat(mTopLevelSafetyCenterEntryPreferenceController.getAvailabilityStatus())
|
||||
.isEqualTo(TopLevelSafetyCenterEntryPreferenceController.AVAILABLE);
|
||||
|
@@ -29,7 +29,7 @@ import androidx.test.annotation.UiThreadTest;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import com.android.settings.safetycenter.SafetyCenterStatusHolder;
|
||||
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.ResourcesUtils;
|
||||
import com.android.settingslib.drawer.CategoryKey;
|
||||
@@ -51,7 +51,7 @@ public class SecurityAdvancedSettingsTest {
|
||||
private SecurityAdvancedSettings mSecurityAdvancedSettings;
|
||||
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
|
||||
@Before
|
||||
@UiThreadTest
|
||||
@@ -61,7 +61,7 @@ public class SecurityAdvancedSettingsTest {
|
||||
Looper.prepare();
|
||||
}
|
||||
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
|
||||
mSecurityAdvancedSettings = spy(new SecurityAdvancedSettings());
|
||||
@@ -76,7 +76,7 @@ public class SecurityAdvancedSettingsTest {
|
||||
|
||||
@Test
|
||||
public void getCategoryKey_whenSafetyCenterIsEnabled_returnsSecurity() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any())).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any())).thenReturn(true);
|
||||
|
||||
assertThat(mSecurityAdvancedSettings.getCategoryKey())
|
||||
.isEqualTo(CategoryKey.CATEGORY_SECURITY_ADVANCED_SETTINGS);
|
||||
@@ -84,7 +84,7 @@ public class SecurityAdvancedSettingsTest {
|
||||
|
||||
@Test
|
||||
public void getCategoryKey_whenAlternativeFragmentPresented_returnsAlternative() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false);
|
||||
setupAlternativeFragment(true, ALTERNATIVE_CATEGORY_KEY);
|
||||
|
||||
assertThat(mSecurityAdvancedSettings.getCategoryKey())
|
||||
@@ -93,7 +93,7 @@ public class SecurityAdvancedSettingsTest {
|
||||
|
||||
@Test
|
||||
public void getCategoryKey_whenNoAlternativeFragmentPresented_returnsLegacy() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false);
|
||||
setupAlternativeFragment(false, null);
|
||||
|
||||
assertThat(mSecurityAdvancedSettings.getCategoryKey())
|
||||
|
@@ -33,7 +33,7 @@ import androidx.test.platform.app.InstrumentationRegistry;
|
||||
|
||||
import com.android.settings.Settings;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.safetycenter.SafetyCenterStatusHolder;
|
||||
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -53,14 +53,14 @@ public class SecurityDashboardActivityTest {
|
||||
private Intent mDefaultIntent;
|
||||
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
FakeFeatureFactory mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mSecuritySettingsFeatureProvider = mFeatureFactory.getSecuritySettingsFeatureProvider();
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
|
||||
mDefaultIntent = new Intent();
|
||||
mDefaultIntent.setAction(android.provider.Settings.ACTION_SECURITY_SETTINGS);
|
||||
@@ -122,7 +122,7 @@ public class SecurityDashboardActivityTest {
|
||||
|
||||
@Test
|
||||
public void onCreate_whenSafetyCenterEnabled_redirectsToSafetyCenter() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true);
|
||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
mActivity.handleSafetyCenterRedirection();
|
||||
@@ -133,7 +133,7 @@ public class SecurityDashboardActivityTest {
|
||||
|
||||
@Test
|
||||
public void onCreate_whenSafetyCenterDisabled_doesntRedirectToSafetyCenter() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false);
|
||||
|
||||
mActivity.handleSafetyCenterRedirection();
|
||||
|
||||
|
@@ -31,7 +31,7 @@ import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.safetycenter.SafetyCenterStatusHolder;
|
||||
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -55,14 +55,14 @@ public class TopLevelSecurityEntryPreferenceControllerTest {
|
||||
@Mock
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private SafetyCenterStatusHolder mSafetyCenterStatusHolder;
|
||||
private SafetyCenterManagerWrapper mSafetyCenterManagerWrapper;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mSecuritySettingsFeatureProvider = mFeatureFactory.getSecuritySettingsFeatureProvider();
|
||||
SafetyCenterStatusHolder.sInstance = mSafetyCenterStatusHolder;
|
||||
SafetyCenterManagerWrapper.sInstance = mSafetyCenterManagerWrapper;
|
||||
|
||||
mPreference = new Preference(ApplicationProvider.getApplicationContext());
|
||||
mPreference.setKey(PREFERENCE_KEY);
|
||||
@@ -128,7 +128,7 @@ public class TopLevelSecurityEntryPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_whenSafetyCenterEnabled_returnsUnavailable() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(true);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(true);
|
||||
|
||||
assertThat(mTopLevelSecurityEntryPreferenceController.getAvailabilityStatus())
|
||||
.isEqualTo(TopLevelSecurityEntryPreferenceController.CONDITIONALLY_UNAVAILABLE);
|
||||
@@ -136,7 +136,7 @@ public class TopLevelSecurityEntryPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_whenSafetyCenterDisabled_returnsAvailable() {
|
||||
when(mSafetyCenterStatusHolder.isEnabled(any(Context.class))).thenReturn(false);
|
||||
when(mSafetyCenterManagerWrapper.isEnabled(any(Context.class))).thenReturn(false);
|
||||
|
||||
assertThat(mTopLevelSecurityEntryPreferenceController.getAvailabilityStatus())
|
||||
.isEqualTo(TopLevelSecurityEntryPreferenceController.AVAILABLE);
|
||||
|
Reference in New Issue
Block a user