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

Remove redundant battery usage slot in database.

Browse Source 
Bug: 336423923
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I1b2d172a42a20a8cc8dc734498e37ed92e4624dd
This commit is contained in:
mxyyiyi
2024-04-23 13:28:44 +08:00
parent 893e8d1f4b
commit 740f348265
4 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
View File

@@ -565,7 +565,9 @@ public final class ConvertUtilsTest {
public void convertToBatteryEventList_normalCase_returnsExpectedResult() {
final BatteryLevelData batteryLevelData =
new BatteryLevelData(
Map.of(1691589600000L, 98, 1691596800000L, 90, 1691596812345L, 80));
// 2023-08-09 14:00:00 UTC
// 2023-08-09 16:00:00 UTC
Map.of(1691589600000L, 98, 1691596800000L, 90));
final List<BatteryEvent> batteryEventList =
ConvertUtils.convertToBatteryEventList(batteryLevelData);
@@ -579,6 +581,31 @@ public final class ConvertUtilsTest {
assertThat(batteryEventList.get(1).getBatteryLevel()).isEqualTo(90);
}
@Test
public void convertToBatteryEventList_multipleDays_returnsExpectedResult() {
final BatteryLevelData batteryLevelData =
new BatteryLevelData(
// 2024-04-23 22:00:00 UTC
// 2024-04-24 00:00:00 UTC
// 2024-04-24 02:00:00 UTC
Map.of(1713909600000L, 98, 1713916800000L, 90, 1713924000000L, 83));
final List<BatteryEvent> batteryEventList =
ConvertUtils.convertToBatteryEventList(batteryLevelData);
assertThat(batteryEventList).hasSize(3);
assertThat(batteryEventList.get(0).getTimestamp()).isEqualTo(1713909600000L);
assertThat(batteryEventList.get(0).getType()).isEqualTo(BatteryEventType.EVEN_HOUR);
assertThat(batteryEventList.get(0).getBatteryLevel()).isEqualTo(98);
assertThat(batteryEventList.get(1).getTimestamp()).isEqualTo(1713916800000L);
assertThat(batteryEventList.get(1).getType()).isEqualTo(BatteryEventType.EVEN_HOUR);
assertThat(batteryEventList.get(1).getBatteryLevel()).isEqualTo(90);
assertThat(batteryEventList.get(2).getTimestamp()).isEqualTo(1713924000000L);
assertThat(batteryEventList.get(2).getType()).isEqualTo(BatteryEventType.EVEN_HOUR);
assertThat(batteryEventList.get(2).getBatteryLevel()).isEqualTo(83);
}
@Test
public void convertToBatteryUsageSlotList_normalCase_returnsExpectedResult() {
BatteryDiffData batteryDiffData1 =