Merge "Fix battery saver setting default state" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-03-28 19:31:51 +00:00
committed by Android (Google) Code Review
4 changed files with 20 additions and 17 deletions

View File

@@ -45,8 +45,6 @@ public class AutoBatterySaverPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_lowBatteryWarningLevel, 15);
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
mController = new AutoBatterySaverPreferenceController(mContext);
@@ -87,7 +85,7 @@ public class AutoBatterySaverPreferenceControllerTest {
}
@Test
public void testIsChecked_useDefaultValue_returnTrue() {
assertThat(mController.isChecked()).isTrue();
public void testIsChecked_useDefaultValue_returnFalse() {
assertThat(mController.isChecked()).isFalse();
}
}

View File

@@ -71,11 +71,10 @@ public class AutoBatterySeekBarPreferenceControllerTest {
}
@Test
public void testPreference_defaultValue_preferenceVisible() {
public void testPreference_defaultValue_preferenceNotVisible() {
mController.updateState(mPreference);
assertThat(mPreference.isVisible()).isTrue();
assertThat(mPreference.getProgress()).isEqualTo(DEFAULT_LEVEL);
assertThat(mPreference.isVisible()).isFalse();
}
@Test