From f49eaf54e6c550a6eefa34398c6b92b47d606ddf Mon Sep 17 00:00:00 2001 From: ykhung Date: Mon, 17 May 2021 14:11:09 +0800 Subject: [PATCH] Fix legacy failed unit test for BatteryInfoLoader fix the legacy failed test since the scale is different, setting the testing value in ms scale (getBatteryTimeRemainingMs()), but getting the data in us scale (info.remainingTimeUs) Bug: 188244142 Test: make SettingsRoboTests Change-Id: Ib389976985eb3741cc96e0ee4a3a000c7f690b37 --- src/com/android/settings/fuelgauge/BatteryDiffEntry.java | 5 +++++ src/com/android/settings/fuelgauge/ConvertUtils.java | 2 +- .../android/settings/fuelgauge/BatteryInfoLoaderTest.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryDiffEntry.java b/src/com/android/settings/fuelgauge/BatteryDiffEntry.java index 7b73638557e..81ad5bec87c 100644 --- a/src/com/android/settings/fuelgauge/BatteryDiffEntry.java +++ b/src/com/android/settings/fuelgauge/BatteryDiffEntry.java @@ -73,6 +73,11 @@ public class BatteryDiffEntry { mBackgroundUsageTimeInMs = backgroundUsageTimeInMs; mBatteryHistEntry = batteryHistEntry; mUserManager = context.getSystemService(UserManager.class); + if (foregroundUsageTimeInMs == 0 + && backgroundUsageTimeInMs == 0 + && consumePower != 0) { + Log.w(TAG, "abnornal BatteryDiffEntry:\n" + this); + } } /** Sets the total consumed power in a specific time slot. */ diff --git a/src/com/android/settings/fuelgauge/ConvertUtils.java b/src/com/android/settings/fuelgauge/ConvertUtils.java index 37f9e1212b4..e05247c3c40 100644 --- a/src/com/android/settings/fuelgauge/ConvertUtils.java +++ b/src/com/android/settings/fuelgauge/ConvertUtils.java @@ -230,7 +230,7 @@ public final class ConvertUtils { if (selectedBatteryEntry == null) { continue; } - // Force refine the cumulative value since it may introduce deviation + // Forces refine the cumulative value since it may introduce deviation // error since we will apply the interpolation arithmetic. final float totalUsageTimeInMs = foregroundUsageTimeInMs + backgroundUsageTimeInMs; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java index 5bcaf0a5cce..0dfabb99313 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java @@ -78,6 +78,6 @@ public class BatteryInfoLoaderTest { BatteryInfo info = loader.loadInBackground(); assertThat(info.remainingLabel).isNotNull(); - assertThat(info.remainingTimeUs).isEqualTo(TEST_TIME_REMAINING); + assertThat(info.remainingTimeUs).isEqualTo(TEST_TIME_REMAINING * 1000); } }