Remove isChartGraphEnabled() which should always return true after
migration. Bug: 253395332 Test: make RunSettingsRoboTests + manually Change-Id: I0c4a6e00a7a9fd66d4050e5ddcf87176462067cd
This commit is contained in:
@@ -18,8 +18,6 @@ package com.android.settings.applications.appinfo;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.anyDouble;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
@@ -132,33 +130,9 @@ public class AppBatteryPreferenceControllerTest {
|
||||
.isEqualTo(mUidBatteryConsumer);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateBattery_noBatteryStats_summaryNo() {
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
mController.updateBattery();
|
||||
|
||||
assertThat(mBatteryPreference.getSummary())
|
||||
.isEqualTo("No battery use since last full charge");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateBattery_hasBatteryStats_summaryPercent() {
|
||||
mController.mBatteryUsageStats = mBatteryUsageStats;
|
||||
mController.mUidBatteryConsumer = mUidBatteryConsumer;
|
||||
doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(),
|
||||
anyDouble(), anyInt());
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
mController.updateBattery();
|
||||
|
||||
assertThat(mBatteryPreference.getSummary()).isEqualTo("60% use since last full charge");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateBatteryWithDiffEntry_noConsumePower_summaryNo() {
|
||||
mController.displayPreference(mScreen);
|
||||
mController.mIsChartGraphEnabled = true;
|
||||
|
||||
mController.updateBatteryWithDiffEntry();
|
||||
|
||||
@@ -169,7 +143,6 @@ public class AppBatteryPreferenceControllerTest {
|
||||
@Test
|
||||
public void updateBatteryWithDiffEntry_withConsumePower_summaryPercent() {
|
||||
mController.displayPreference(mScreen);
|
||||
mController.mIsChartGraphEnabled = true;
|
||||
mBatteryDiffEntry.mConsumePower = 1;
|
||||
mController.mBatteryDiffEntry = mBatteryDiffEntry;
|
||||
when(mBatteryDiffEntry.getPercentOfTotal()).thenReturn(60.0);
|
||||
|
||||
Reference in New Issue
Block a user