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

Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 am: b91878940e

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

Change-Id: Ieb4978ed3d1467afaff9473a7cceb34d3dcca002
This commit is contained in:
Jan Tomljanovic
2021-06-29 16:26:46 +00:00
committed by Automerger Merge Worker
parent fe4e0a0cbe b91878940e
commit 9d7cff7532
18 changed files with 171 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
View File

@@ -101,4 +101,16 @@ public class FingerprintProfileStatusPreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER);
}
@Test
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo("fingerprint_settings_profile");
}
@Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new FingerprintProfileStatusPreferenceController(mContext, "key");
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
}

12
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
View File

@@ -48,7 +48,7 @@ public class EnterprisePrivacyPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new EnterprisePrivacyPreferenceController(
mContext, mPrivacyPreferenceControllerHelper);
mContext, mPrivacyPreferenceControllerHelper, KEY_ENTERPRISE_PRIVACY);
}
@Test
@@ -90,7 +90,15 @@ public class EnterprisePrivacyPreferenceControllerTest {
}
@Test
public void testGetPreferenceKey() {
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ENTERPRISE_PRIVACY);
}
@Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new EnterprisePrivacyPreferenceController(
mContext, mPrivacyPreferenceControllerHelper, "key");
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
}

12
tests/robotests/src/com/android/settings/enterprise/FinancedPrivacyPreferenceControllerTest.java
View File

@@ -48,7 +48,7 @@ public class FinancedPrivacyPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new FinancedPrivacyPreferenceController(
mContext, mPrivacyPreferenceControllerHelper);
mContext, mPrivacyPreferenceControllerHelper, PREF_KEY_FINANCED_PRIVACY);
}
@Test
@@ -81,7 +81,15 @@ public class FinancedPrivacyPreferenceControllerTest {
}
@Test
public void testGetPreferenceKey() {
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo(PREF_KEY_FINANCED_PRIVACY);
}
@Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new FinancedPrivacyPreferenceController(
mContext, mPrivacyPreferenceControllerHelper, "key");
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
}

14
tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java
View File

@@ -98,4 +98,18 @@ public class LockUnificationPreferenceControllerTest {
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void getPreferenceKey_byDefault_returnsDefaultValue() {
init();
assertThat(mController.getPreferenceKey()).isEqualTo("unification");
}
@Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new LockUnificationPreferenceController(mContext, mHost, "key");
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
}

12
tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
View File

@@ -89,4 +89,16 @@ public class ScreenPinningPreferenceControllerTest {
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.switch_on_text));
}
@Test
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo("screen_pinning_settings");
}
@Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new ScreenPinningPreferenceController(mContext, "key");
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
}

18
tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
View File

@@ -65,6 +65,7 @@ public class SimLockPreferenceControllerTest {
private SimLockPreferenceController mController;
private Preference mPreference;
private Context mContext;
@Before
public void setUp() {
@@ -75,8 +76,9 @@ public class SimLockPreferenceControllerTest {
shadowApplication.setSystemService(Context.CARRIER_CONFIG_SERVICE, mCarrierManager);
shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager);
shadowApplication.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
mController = new SimLockPreferenceController(RuntimeEnvironment.application);
mPreference = new Preference(RuntimeEnvironment.application);
mContext = RuntimeEnvironment.application;
mController = new SimLockPreferenceController(mContext);
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@@ -136,6 +138,18 @@ public class SimLockPreferenceControllerTest {
assertThat(mPreference.isEnabled()).isTrue();
}
@Test
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo("sim_lock_settings");
}
@Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new SimLockPreferenceController(mContext, "key");
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
private void setupMockIcc() {
final List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
SubscriptionInfo info = mock(SubscriptionInfo.class);

12
tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
View File

@@ -115,4 +115,16 @@ public class VisiblePatternProfilePreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo("visiblepattern_profile");
}
@Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new VisiblePatternProfilePreferenceController(mContext, mLifecycle, "key");
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
}

12
tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
View File

@@ -117,4 +117,16 @@ public class ManageTrustAgentsPreferenceControllerTest {
.isEqualTo(mContext.getResources().getQuantityString(
R.plurals.manage_trust_agents_summary_on, 1, 1));
}
@Test
public void getPreferenceKey_byDefault_returnsDefaultValue() {
assertThat(mController.getPreferenceKey()).isEqualTo("manage_trust_agents");
}
@Test
public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
mController = new ManageTrustAgentsPreferenceController(mContext, "key");
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
}