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

TelephonyMonitor: Replace boolean decision with multiple status.

Browse Source 
Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40

Use enable, disable, user_enable, user_disable four statuses to
replace the old boolean value,

Bug:36704500
Change-Id: I5d3fd36aecaf36bb6969a6f6354c85bb162a0293
This commit is contained in:
Youhan Wang
2017-05-10 13:50:28 -07:00
parent d6aa9f3454
commit c426fe6c68
2 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
View File

@@ -134,7 +134,24 @@ public class TelephonyMonitorPreferenceControllerTest {
when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
.thenReturn(true);
SettingsShadowSystemProperties.set(
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR, "true");
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
TelephonyMonitorPreferenceController.ENABLED_STATUS);
SettingsShadowSystemProperties.set(
TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
mController.displayPreference(mScreen);
verify(mPreference).setChecked(true);
}
@Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void displayPreference_telephonyMonitorUserEnabled_shouldCheckedPreference() {
when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
.thenReturn(true);
SettingsShadowSystemProperties.set(
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
TelephonyMonitorPreferenceController.USER_ENABLED_STATUS);
SettingsShadowSystemProperties.set(
TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
@@ -149,7 +166,24 @@ public class TelephonyMonitorPreferenceControllerTest {
when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
.thenReturn(true);
SettingsShadowSystemProperties.set(
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR, "false");
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
TelephonyMonitorPreferenceController.DISABLED_STATUS);
SettingsShadowSystemProperties.set(
TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
mController.displayPreference(mScreen);
verify(mPreference).setChecked(false);
}
@Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void displayPreference_telephonyMonitorUserDisabled_shouldUncheckedPreference() {
when(mContext.getResources().getBoolean(R.bool.config_show_telephony_monitor))
.thenReturn(true);
SettingsShadowSystemProperties.set(
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
TelephonyMonitorPreferenceController.USER_DISABLED_STATUS);
SettingsShadowSystemProperties.set(
TelephonyMonitorPreferenceController.BUILD_TYPE, "userdebug");
@@ -168,8 +202,10 @@ public class TelephonyMonitorPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference);
assertThat(SystemProperties.getBoolean(
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR, false)).isTrue();
assertThat(TelephonyMonitorPreferenceController.USER_ENABLED_STATUS.equals(
SystemProperties.get(
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
TelephonyMonitorPreferenceController.DISABLED_STATUS))).isTrue();
}
@Config(shadows = {SettingsShadowSystemProperties.class})
@@ -182,8 +218,10 @@ public class TelephonyMonitorPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference);
assertThat(SystemProperties.getBoolean(
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR, false)).isFalse();
assertThat(TelephonyMonitorPreferenceController.USER_DISABLED_STATUS.equals(
SystemProperties.get(
TelephonyMonitorPreferenceController.PROPERTY_TELEPHONY_MONITOR,
TelephonyMonitorPreferenceController.DISABLED_STATUS))).isTrue();
}
}