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

Merge "Fix batteryInfo unit test" into tm-qpr-dev

Browse Source
This commit is contained in:
Zhenwei Chen
2022-12-07 08:31:44 +00:00
committed by Android (Google) Code Review
parent 1c6313d8c0 b41e06a5fb
commit 47fa893358
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
View File

@@ -68,6 +68,7 @@ public class BatteryInfoTest {
private static final String STATUS_CHARGING_TIME = "50% - 0 min left until full"; private static final String STATUS_CHARGING_TIME = "50% - 0 min left until full";
private static final String STATUS_NOT_CHARGING = "Not charging"; private static final String STATUS_NOT_CHARGING = "Not charging";
private static final String STATUS_CHARGING_FUTURE_BYPASS = "50% - Charging to 12%"; private static final String STATUS_CHARGING_FUTURE_BYPASS = "50% - Charging to 12%";
private static final String STATUS_CHARGING_PAUSED = "50% - Charging paused";
private static final long REMAINING_TIME_NULL = -1; private static final long REMAINING_TIME_NULL = -1;
private static final long REMAINING_TIME = 2; private static final long REMAINING_TIME = 2;
// Strings are defined in frameworks/base/packages/SettingsLib/res/values/strings.xml // Strings are defined in frameworks/base/packages/SettingsLib/res/values/strings.xml
@@ -256,8 +257,6 @@ public class BatteryInfoTest {
@Test @Test
public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() { public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() {
final String expectedString =
mContext.getString(R.string.battery_tip_limited_temporarily_title);
doReturn(TEST_CHARGE_TIME_REMAINING) doReturn(TEST_CHARGE_TIME_REMAINING)
.when(mBatteryUsageStats) .when(mBatteryUsageStats)
.getChargeTimeRemainingMs(); .getChargeTimeRemainingMs();
@@ -269,13 +268,11 @@ public class BatteryInfoTest {
false /* shortString */); false /* shortString */);
assertThat(info.isOverheated).isTrue(); assertThat(info.isOverheated).isTrue();
assertThat(info.chargeLabel.toString()).contains(expectedString); assertThat(info.chargeLabel.toString()).contains(STATUS_CHARGING_PAUSED);
} }
@Test @Test
public void testGetBatteryInfo_dockDefenderActive_updateChargeString() { public void testGetBatteryInfo_dockDefenderActive_updateChargeString() {
final String expectedString =
mContext.getString(R.string.battery_tip_limited_temporarily_title);
doReturn(TEST_CHARGE_TIME_REMAINING / 1000) doReturn(TEST_CHARGE_TIME_REMAINING / 1000)
.when(mBatteryUsageStats).getChargeTimeRemainingMs(); .when(mBatteryUsageStats).getChargeTimeRemainingMs();
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isExtraDefend(); doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isExtraDefend();
@@ -289,7 +286,7 @@ public class BatteryInfoTest {
mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000, mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
false /* shortString */); false /* shortString */);
assertThat(info.chargeLabel.toString()).contains(expectedString); assertThat(info.chargeLabel.toString()).contains(STATUS_CHARGING_PAUSED);
} }
@Test @Test