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

Begin transition from BatteryStatsHelper to BatteryUsageStats API.

Browse Source 
For now, keep both BatteryStatsHelper and BatteryUsageStats in play.
The plan is to transition from the former to the latter, one usage
at a time.  When all is said and done, all references to
BatteryStatsHelper will be gone.

Bug: 173745486
Test: atest --host SettingsRoboTests

Change-Id: I37e1dfff0043b1845992f18d72067bb547bb69ff
This commit is contained in:
Dmitri Plotnikov
2020-11-16 15:22:21 -08:00
parent 3deffe9f04
commit 97b3325ece
7 changed files with 190 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
View File

@@ -31,7 +31,9 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.BatteryStats;
import android.os.BatteryUsageStats;
import android.os.Bundle;
import android.os.UidBatteryConsumer;
import androidx.loader.app.LoaderManager;
import androidx.preference.Preference;
@@ -67,6 +69,10 @@ public class AppBatteryPreferenceControllerTest {
@Mock
private BatteryUtils mBatteryUtils;
@Mock
private BatteryUsageStats mBatteryUsageStats;
@Mock
private UidBatteryConsumer mUidBatteryConsumer;
@Mock
private BatterySipper mBatterySipper;
@Mock
private BatterySipper mOtherBatterySipper;
@@ -143,6 +149,8 @@ public class AppBatteryPreferenceControllerTest {
public void updateBattery_hasBatteryStats_summaryPercent() {
mController.mBatteryHelper = mBatteryStatsHelper;
mController.mSipper = mBatterySipper;
mController.mBatteryUsageStats = mBatteryUsageStats;
mController.mUidBatteryConsumer = mUidBatteryConsumer;
doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(),
anyDouble(), anyDouble(), anyInt());
doReturn(new ArrayList<>()).when(mBatteryStatsHelper).getUsageList();
@@ -157,6 +165,8 @@ public class AppBatteryPreferenceControllerTest {
public void isBatteryStatsAvailable_hasBatteryStatsHelperAndSipper_returnTrue() {
mController.mBatteryHelper = mBatteryStatsHelper;
mController.mSipper = mBatterySipper;
mController.mBatteryUsageStats = mBatteryUsageStats;
mController.mUidBatteryConsumer = mUidBatteryConsumer;
assertThat(mController.isBatteryStatsAvailable()).isTrue();
}
@@ -175,6 +185,8 @@ public class AppBatteryPreferenceControllerTest {
when(mBatteryPreference.getKey()).thenReturn(key);
mController.mSipper = mBatterySipper;
mController.mBatteryHelper = mBatteryStatsHelper;
mController.mBatteryUsageStats = mBatteryUsageStats;
mController.mUidBatteryConsumer = mUidBatteryConsumer;
// Should not crash
mController.handlePreferenceTreeClick(mBatteryPreference);
@@ -187,7 +199,8 @@ public class AppBatteryPreferenceControllerTest {
mController.onResume();
verify(mLoaderManager)
.restartLoader(AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY, mController);
.restartLoader(AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY,
mController.mBatteryStatsHelperLoaderCallbacks);
}
@Test

8
tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
View File

@@ -79,7 +79,8 @@ public class BatteryEntryTest {
}
private BatteryEntry createBatteryEntryForApp() {
return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForApp());
return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForApp(),
null);
}
private BatterySipper createSipperForApp() {
@@ -90,7 +91,8 @@ public class BatteryEntryTest {
}
private BatteryEntry createBatteryEntryForSystem() {
return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForSystem());
return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForSystem(),
null);
}
private BatterySipper createSipperForSystem() {
@@ -144,7 +146,7 @@ public class BatteryEntryTest {
final BatterySipper batterySipper = mock(BatterySipper.class);
batterySipper.drainType = DrainType.AMBIENT_DISPLAY;
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
mockUserManager, batterySipper);
mockUserManager, batterySipper, null);
assertThat(entry.iconId).isEqualTo(R.drawable.ic_settings_aod);
assertThat(entry.name).isEqualTo("Ambient display");