Format battery java test code
context:go/pixel-energizer-java-format
Test: manual
Bug: 304439460
Fix: 304439460
Change-Id: I5be0ee41afb3a7018bc7e25cceccc25669924d6c
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 80486cb..d01d7e0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -78,11 +78,12 @@
import java.util.concurrent.TimeUnit;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {
- ShadowEntityHeaderController.class,
- ShadowActivityManager.class,
- com.android.settings.testutils.shadow.ShadowFragment.class,
-})
+@Config(
+ shadows = {
+ ShadowEntityHeaderController.class,
+ ShadowActivityManager.class,
+ com.android.settings.testutils.shadow.ShadowFragment.class,
+ })
public class AdvancedPowerUsageDetailTest {
private static final String APP_LABEL = "app label";
private static final String SUMMARY = "summary";
@@ -99,30 +100,19 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private FragmentActivity mActivity;
- @Mock
- private EntityHeaderController mEntityHeaderController;
- @Mock
- private LayoutPreference mHeaderPreference;
- @Mock
- private ApplicationsState mState;
- @Mock
- private ApplicationsState.AppEntry mAppEntry;
- @Mock
- private Bundle mBundle;
- @Mock
- private BatteryEntry mBatteryEntry;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private InstallSourceInfo mInstallSourceInfo;
- @Mock
- private AppOpsManager mAppOpsManager;
- @Mock
- private LoaderManager mLoaderManager;
- @Mock
- private BatteryOptimizeUtils mBatteryOptimizeUtils;
- @Mock
- private BackupManager mBackupManager;
+
+ @Mock private EntityHeaderController mEntityHeaderController;
+ @Mock private LayoutPreference mHeaderPreference;
+ @Mock private ApplicationsState mState;
+ @Mock private ApplicationsState.AppEntry mAppEntry;
+ @Mock private Bundle mBundle;
+ @Mock private BatteryEntry mBatteryEntry;
+ @Mock private PackageManager mPackageManager;
+ @Mock private InstallSourceInfo mInstallSourceInfo;
+ @Mock private AppOpsManager mAppOpsManager;
+ @Mock private LoaderManager mLoaderManager;
+ @Mock private BatteryOptimizeUtils mBatteryOptimizeUtils;
+ @Mock private BackupManager mBackupManager;
private Context mContext;
private PrimarySwitchPreference mAllowBackgroundUsagePreference;
@@ -149,19 +139,26 @@
doReturn(mLoaderManager).when(mFragment).getLoaderManager();
ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setButtonActions(anyInt(), anyInt());
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setIcon(nullable(Drawable.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController).setIcon(nullable(
- ApplicationsState.AppEntry.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
+ .setIcon(nullable(ApplicationsState.AppEntry.class));
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setLabel(nullable(String.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setLabel(nullable(String.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setLabel(nullable(ApplicationsState.AppEntry.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setSummary(nullable(String.class));
when(mBatteryEntry.getUid()).thenReturn(UID);
@@ -184,13 +181,15 @@
final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
- Answer<Void> callable = invocation -> {
- mBundle = captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
- System.out.println("mBundle = " + mBundle);
- return null;
- };
- doAnswer(callable).when(mActivity).startActivityAsUser(captor.capture(),
- nullable(UserHandle.class));
+ Answer<Void> callable =
+ invocation -> {
+ mBundle = captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+ System.out.println("mBundle = " + mBundle);
+ return null;
+ };
+ doAnswer(callable)
+ .when(mActivity)
+ .startActivityAsUser(captor.capture(), nullable(UserHandle.class));
doAnswer(callable).when(mActivity).startActivity(captor.capture());
mAllowBackgroundUsagePreference = new PrimarySwitchPreference(mContext);
@@ -219,7 +218,9 @@
@Test
public void initHeader_HasAppEntry_BuildByAppEntry() {
- ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ ReflectionHelpers.setStaticField(
+ AppUtils.class,
+ "sInstantAppDataProvider",
new InstantAppDataProvider() {
@Override
public boolean isInstantApp(ApplicationInfo info) {
@@ -236,7 +237,9 @@
@Test
public void initHeader_HasAppEntry_InstantApp() {
- ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ ReflectionHelpers.setStaticField(
+ AppUtils.class,
+ "sInstantAppDataProvider",
new InstantAppDataProvider() {
@Override
public boolean isInstantApp(ApplicationInfo info) {
@@ -253,16 +256,13 @@
@Test
public void startBatteryDetailPage_invalidToShowSummary_noFGBDData() {
- AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment,
- mBatteryEntry, USAGE_PERCENT);
+ AdvancedPowerUsageDetail.startBatteryDetailPage(
+ mActivity, mFragment, mBatteryEntry, USAGE_PERCENT);
assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
- assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME))
- .isEqualTo(0);
- assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME))
- .isEqualTo(0);
- assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_SCREEN_ON_TIME))
- .isEqualTo(0);
+ assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)).isEqualTo(0);
+ assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)).isEqualTo(0);
+ assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_SCREEN_ON_TIME)).isEqualTo(0);
assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
.isEqualTo(USAGE_PERCENT);
}
@@ -276,18 +276,22 @@
verify(mActivity).startActivity(captor.capture());
- assertThat(captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
- .getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME))
+ assertThat(
+ captor.getValue()
+ .getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+ .getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME))
.isEqualTo(PACKAGE_NAME[0]);
- assertThat(captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
- .getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
+ assertThat(
+ captor.getValue()
+ .getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+ .getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
.isEqualTo("0%");
}
@Test
- public void startBatteryDetailPage_batteryEntryNotExisted_extractUidFromPackageName() throws
- PackageManager.NameNotFoundException {
+ public void startBatteryDetailPage_batteryEntryNotExisted_extractUidFromPackageName()
+ throws PackageManager.NameNotFoundException {
doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME[0], 0 /* no flag */);
AdvancedPowerUsageDetail.startBatteryDetailPage(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java
index be80e1e..261a315 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AllowBackgroundPreferenceControllerTest.java
@@ -88,8 +88,8 @@
public void testUpdateState_isSystemOrDefaultAppAndRestrictedStates_prefChecked() {
when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_RESTRICTED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_RESTRICTED);
mController.updateState(mMainSwitchPreference);
@@ -101,8 +101,8 @@
public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {
when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_OPTIMIZED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
mController.updateState(mMainSwitchPreference);
@@ -113,8 +113,8 @@
@Test
public void testUpdateState_isRestrictedStates_prefChecked() {
when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_RESTRICTED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_RESTRICTED);
mController.updateState(mMainSwitchPreference);
@@ -125,8 +125,8 @@
@Test
public void testUpdateState_prefUnchecked() {
when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_OPTIMIZED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
mController.updateState(mMainSwitchPreference);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
index 0b6051b..5c3addf 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
@@ -91,26 +91,25 @@
public void testGetAvailabilityStatus_smartBatterySupported_returnDisabled() {
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test
public void testGetAvailabilityStatus_smartBatteryUnSupported_returnAvailable() {
doReturn(false).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
private void putAutoRestrictionValue(int value) {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.APP_AUTO_RESTRICTION_ENABLED,
- value);
+ Settings.Global.putInt(
+ mContext.getContentResolver(), Settings.Global.APP_AUTO_RESTRICTION_ENABLED, value);
}
private int getAutoRestrictionValue() {
- return Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.APP_AUTO_RESTRICTION_ENABLED, ON);
+ return Settings.Global.getInt(
+ mContext.getContentResolver(), Settings.Global.APP_AUTO_RESTRICTION_ENABLED, ON);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
index 350d2ef..8980800 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
@@ -94,30 +94,20 @@
private BatteryBackupHelper mBatteryBackupHelper;
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private BackupDataOutput mBackupDataOutput;
- @Mock
- private BackupDataInputStream mBackupDataInputStream;
- @Mock
- private IDeviceIdleController mDeviceController;
- @Mock
- private IPackageManager mIPackageManager;
- @Mock
- private AppOpsManager mAppOpsManager;
- @Mock
- private UserManager mUserManager;
- @Mock
- private PowerAllowlistBackend mPowerAllowlistBackend;
- @Mock
- private BatteryOptimizeUtils mBatteryOptimizeUtils;
+ @Mock private PackageManager mPackageManager;
+ @Mock private BackupDataOutput mBackupDataOutput;
+ @Mock private BackupDataInputStream mBackupDataInputStream;
+ @Mock private IDeviceIdleController mDeviceController;
+ @Mock private IPackageManager mIPackageManager;
+ @Mock private AppOpsManager mAppOpsManager;
+ @Mock private UserManager mUserManager;
+ @Mock private PowerAllowlistBackend mPowerAllowlistBackend;
+ @Mock private BatteryOptimizeUtils mBatteryOptimizeUtils;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- mPowerUsageFeatureProvider =
- FakeFeatureFactory.setupForTest().powerUsageFeatureProvider;
+ mPowerUsageFeatureProvider = FakeFeatureFactory.setupForTest().powerUsageFeatureProvider;
mContext = spy(RuntimeEnvironment.application);
mStringWriter = new StringWriter();
mPrintWriter = new PrintWriter(mStringWriter);
@@ -173,7 +163,7 @@
public void backupOptimizationMode_nullInstalledApps_ignoreBackupOptimization()
throws Exception {
final UserInfo userInfo =
- new UserInfo(/*userId=*/ 0, /*userName=*/ "google", /*flag=*/ 0);
+ new UserInfo(/* userId= */ 0, /* userName= */ "google", /* flag= */ 0);
doReturn(Arrays.asList(userInfo)).when(mUserManager).getProfiles(anyInt());
doThrow(new RuntimeException())
.when(mIPackageManager)
@@ -199,8 +189,7 @@
}
@Test
- public void backupOptimizationMode_backupOptimizationModeAndIgnoreSystemApp()
- throws Exception {
+ public void backupOptimizationMode_backupOptimizationModeAndIgnoreSystemApp() throws Exception {
final List<String> allowlistedApps = Arrays.asList(PACKAGE_NAME1);
createTestingData(PACKAGE_NAME1, UID1, PACKAGE_NAME2, PACKAGE_NAME3);
// Sets "com.android.testing.1" as system app.
@@ -294,8 +283,7 @@
// Invoke the restoreEntity() method 2nd time.
mBatteryBackupHelper.restoreEntity(mBackupDataInputStream);
- assertThat(TestUtils.getScheduledLevel(mContext))
- .isEqualTo(invalidScheduledLevel);
+ assertThat(TestUtils.getScheduledLevel(mContext)).isEqualTo(invalidScheduledLevel);
}
@Test
@@ -313,9 +301,14 @@
@Test
public void restoreOptimizationMode_invalidModeFormat_skipRestore() throws Exception {
final String invalidNumberFormat = "google";
- final String packageModes =
- PACKAGE_NAME1 + DELIMITER_MODE + MODE_RESTRICTED + DELIMITER +
- PACKAGE_NAME2 + DELIMITER_MODE + invalidNumberFormat;
+ final String package1Mode = PACKAGE_NAME1
+ + DELIMITER_MODE
+ + MODE_RESTRICTED
+ + DELIMITER;
+ final String package2Mode = PACKAGE_NAME2
+ + DELIMITER_MODE
+ + invalidNumberFormat;
+ final String packageModes = package1Mode + package2Mode;
mBatteryBackupHelper.restoreOptimizationMode(packageModes.getBytes());
TimeUnit.SECONDS.sleep(1);
@@ -328,10 +321,19 @@
@Test
public void restoreOptimizationMode_restoreExpectedModes() throws Exception {
- final String packageModes =
- PACKAGE_NAME1 + DELIMITER_MODE + MODE_RESTRICTED + DELIMITER +
- PACKAGE_NAME2 + DELIMITER_MODE + MODE_UNRESTRICTED + DELIMITER +
- PACKAGE_NAME3 + DELIMITER_MODE + MODE_RESTRICTED + DELIMITER;
+ final String package1Mode = PACKAGE_NAME1
+ + DELIMITER_MODE
+ + MODE_RESTRICTED
+ + DELIMITER;
+ final String package2Mode = PACKAGE_NAME2
+ + DELIMITER_MODE
+ + MODE_UNRESTRICTED
+ + DELIMITER;
+ final String package3Mode = PACKAGE_NAME3
+ + DELIMITER_MODE
+ + MODE_RESTRICTED
+ + DELIMITER;
+ final String packageModes = package1Mode + package2Mode + package3Mode;
mBatteryBackupHelper.restoreOptimizationMode(packageModes.getBytes());
TimeUnit.SECONDS.sleep(1);
@@ -358,13 +360,14 @@
verifyBackupData(inOrder, BatteryBackupHelper.KEY_BUILD_PRODUCT, Build.PRODUCT);
verifyBackupData(inOrder, BatteryBackupHelper.KEY_BUILD_MANUFACTURER, Build.MANUFACTURER);
verifyBackupData(inOrder, BatteryBackupHelper.KEY_BUILD_FINGERPRINT, Build.FINGERPRINT);
- inOrder.verify(mBackupDataOutput, never()).writeEntityHeader(
- eq(BatteryBackupHelper.KEY_BUILD_METADATA_1), anyInt());
+ inOrder.verify(mBackupDataOutput, never())
+ .writeEntityHeader(eq(BatteryBackupHelper.KEY_BUILD_METADATA_1), anyInt());
verifyBackupData(inOrder, BatteryBackupHelper.KEY_BUILD_METADATA_2, deviceMetadata);
}
private void mockUid(int uid, String packageName) throws Exception {
- doReturn(uid).when(mPackageManager)
+ doReturn(uid)
+ .when(mPackageManager)
.getPackageUid(packageName, PackageManager.GET_META_DATA);
}
@@ -384,8 +387,8 @@
final Set<String> expectedResultSet =
Set.of(expectedResult.split(BatteryBackupHelper.DELIMITER));
- verify(mBackupDataOutput).writeEntityHeader(
- BatteryBackupHelper.KEY_OPTIMIZATION_LIST, expectedBytes.length);
+ verify(mBackupDataOutput)
+ .writeEntityHeader(BatteryBackupHelper.KEY_OPTIMIZATION_LIST, expectedBytes.length);
verify(mBackupDataOutput).writeEntityData(captor.capture(), eq(expectedBytes.length));
final String actualResult = new String(captor.getValue());
final Set<String> actualResultSet =
@@ -393,11 +396,12 @@
assertThat(actualResultSet).isEqualTo(expectedResultSet);
}
- private void createTestingData(String packageName1, int uid1, String packageName2,
- String packageName3) throws Exception {
+ private void createTestingData(
+ String packageName1, int uid1, String packageName2, String packageName3)
+ throws Exception {
// Sets the getInstalledApplications() method for testing.
final UserInfo userInfo =
- new UserInfo(/*userId=*/ 0, /*userName=*/ "google", /*flag=*/ 0);
+ new UserInfo(/* userId= */ 0, /* userName= */ "google", /* flag= */ 0);
doReturn(Arrays.asList(userInfo)).when(mUserManager).getProfiles(anyInt());
final ApplicationInfo applicationInfo1 = new ApplicationInfo();
applicationInfo1.enabled = true;
@@ -413,10 +417,12 @@
applicationInfo3.uid = 3;
applicationInfo3.packageName = packageName3;
applicationInfo3.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
- doReturn(new ParceledListSlice<ApplicationInfo>(
- Arrays.asList(applicationInfo1, applicationInfo2, applicationInfo3)))
- .when(mIPackageManager)
- .getInstalledApplications(anyLong(), anyInt());
+ doReturn(
+ new ParceledListSlice<ApplicationInfo>(
+ Arrays.asList(
+ applicationInfo1, applicationInfo2, applicationInfo3)))
+ .when(mIPackageManager)
+ .getInstalledApplications(anyLong(), anyInt());
// Sets the AppOpsManager for checkOpNoThrow() method.
doReturn(AppOpsManager.MODE_ALLOWED)
.when(mAppOpsManager)
@@ -434,8 +440,8 @@
new ArraySet<>(Arrays.asList(applicationInfo1, applicationInfo2, applicationInfo3));
}
- private void verifyBackupData(
- InOrder inOrder, String dataKey, String dataContent) throws Exception {
+ private void verifyBackupData(InOrder inOrder, String dataKey, String dataContent)
+ throws Exception {
final byte[] expectedBytes = dataContent.getBytes();
inOrder.verify(mBackupDataOutput).writeEntityHeader(dataKey, expectedBytes.length);
inOrder.verify(mBackupDataOutput).writeEntityData(expectedBytes, expectedBytes.length);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index 62f812d..2f3f5c5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -54,8 +54,7 @@
private static final int BATTERY_INTENT_LEVEL = 80;
private static final int BATTERY_INTENT_SCALE = 100;
- @Mock
- private BatteryBroadcastReceiver.OnBatteryChangedListener mBatteryListener;
+ @Mock private BatteryBroadcastReceiver.OnBatteryChangedListener mBatteryListener;
private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
private Context mContext;
private Intent mChargingIntent;
@@ -75,8 +74,8 @@
mChargingIntent = new Intent(Intent.ACTION_BATTERY_CHANGED);
mChargingIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_INTENT_LEVEL);
mChargingIntent.putExtra(BatteryManager.EXTRA_SCALE, BATTERY_INTENT_SCALE);
- mChargingIntent
- .putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
+ mChargingIntent.putExtra(
+ BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
}
@Test
@@ -85,8 +84,10 @@
assertThat(mBatteryBroadcastReceiver.mBatteryLevel)
.isEqualTo(Utils.getBatteryPercentage(mChargingIntent));
- assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(
- Utils.getBatteryStatus(mContext, mChargingIntent, /* compactStatus= */ false));
+ assertThat(mBatteryBroadcastReceiver.mBatteryStatus)
+ .isEqualTo(
+ Utils.getBatteryStatus(
+ mContext, mChargingIntent, /* compactStatus= */ false));
verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_LEVEL);
}
@@ -103,7 +104,8 @@
@Test
public void onReceive_chargingStatusChanged_dataUpdated() {
- mChargingIntent.putExtra(BatteryManager.EXTRA_CHARGING_STATUS,
+ mChargingIntent.putExtra(
+ BatteryManager.EXTRA_CHARGING_STATUS,
BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE);
mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent);
@@ -123,8 +125,8 @@
@Test
public void onReceive_powerSaveModeChanged_listenerInvoked() {
- mBatteryBroadcastReceiver.onReceive(mContext,
- new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
+ mBatteryBroadcastReceiver.onReceive(
+ mContext, new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_SAVER);
}
@@ -150,16 +152,16 @@
@Test
public void onReceive_dockDefenderBypassed_listenerInvoked() {
- mBatteryBroadcastReceiver.onReceive(mContext,
- new Intent(BatteryUtils.BYPASS_DOCK_DEFENDER_ACTION));
+ mBatteryBroadcastReceiver.onReceive(
+ mContext, new Intent(BatteryUtils.BYPASS_DOCK_DEFENDER_ACTION));
verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_STATUS);
}
@Test
public void onReceive_usbPortComplianceChanged_listenerInvoked() {
- mBatteryBroadcastReceiver.onReceive(mContext,
- new Intent(UsbManager.ACTION_USB_PORT_COMPLIANCE_CHANGED));
+ mBatteryBroadcastReceiver.onReceive(
+ mContext, new Intent(UsbManager.ACTION_USB_PORT_COMPLIANCE_CHANGED));
verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_STATUS);
}
@@ -173,8 +175,10 @@
assertThat(mBatteryBroadcastReceiver.mBatteryLevel)
.isEqualTo(Utils.getBatteryPercentage(mChargingIntent));
- assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(
- Utils.getBatteryStatus(mContext, mChargingIntent, /* compactStatus= */ false));
+ assertThat(mBatteryBroadcastReceiver.mBatteryStatus)
+ .isEqualTo(
+ Utils.getBatteryStatus(
+ mContext, mChargingIntent, /* compactStatus= */ false));
assertThat(mBatteryBroadcastReceiver.mBatteryHealth)
.isEqualTo(BatteryManager.BATTERY_HEALTH_UNKNOWN);
assertThat(mBatteryBroadcastReceiver.mChargingStatus)
@@ -188,10 +192,11 @@
mBatteryBroadcastReceiver.register();
ArgumentCaptor<IntentFilter> captor = ArgumentCaptor.forClass(IntentFilter.class);
- verify(mContext).registerReceiver(
- eq(mBatteryBroadcastReceiver),
- captor.capture(),
- eq(Context.RECEIVER_EXPORTED));
+ verify(mContext)
+ .registerReceiver(
+ eq(mBatteryBroadcastReceiver),
+ captor.capture(),
+ eq(Context.RECEIVER_EXPORTED));
assertAction(captor, Intent.ACTION_BATTERY_CHANGED);
assertAction(captor, PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
assertAction(captor, BatteryUtils.BYPASS_DOCK_DEFENDER_ACTION);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 04d5dbf..83ff582 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -68,22 +68,14 @@
private static final String TIME_LEFT = "2h30min";
private static final String BATTERY_STATUS = "Charging";
- @Mock
- private PreferenceScreen mPreferenceScreen;
- @Mock
- private BatteryInfo mBatteryInfo;
- @Mock
- private EntityHeaderController mEntityHeaderController;
- @Mock
- private UsageProgressBarPreference mBatteryUsageProgressBarPref;
- @Mock
- private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
- @Mock
- private UsbPort mUsbPort;
- @Mock
- private UsbManager mUsbManager;
- @Mock
- private UsbPortStatus mUsbPortStatus;
+ @Mock private PreferenceScreen mPreferenceScreen;
+ @Mock private BatteryInfo mBatteryInfo;
+ @Mock private EntityHeaderController mEntityHeaderController;
+ @Mock private UsageProgressBarPreference mBatteryUsageProgressBarPref;
+ @Mock private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+ @Mock private UsbPort mUsbPort;
+ @Mock private UsbManager mUsbManager;
+ @Mock private UsbPortStatus mUsbPortStatus;
private BatteryHeaderPreferenceController mController;
private Context mContext;
@@ -104,8 +96,9 @@
mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
- doReturn(mBatteryUsageProgressBarPref).when(mPreferenceScreen)
- .findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
+ doReturn(mBatteryUsageProgressBarPref)
+ .when(mPreferenceScreen)
+ .findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
mBatteryInfo.batteryLevel = BATTERY_LEVEL;
@@ -235,8 +228,8 @@
@Test
public void updateHeaderByBatteryTips_lowBatteryTip_showLowBattery() {
setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
- BatteryTip lowBatteryTip = new LowBatteryTip(
- BatteryTip.StateType.NEW, /* powerSaveModeOn */false);
+ BatteryTip lowBatteryTip =
+ new LowBatteryTip(BatteryTip.StateType.NEW, /* powerSaveModeOn */ false);
mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
@@ -265,8 +258,8 @@
@Test
public void updateHeaderByBatteryTips_noBatteryInfo_noAction() {
- BatteryTip lowBatteryTip = new LowBatteryTip(
- BatteryTip.StateType.NEW, /* powerSaveModeOn */false);
+ BatteryTip lowBatteryTip =
+ new LowBatteryTip(BatteryTip.StateType.NEW, /* powerSaveModeOn */ false);
mController.updateHeaderByBatteryTips(lowBatteryTip, null);
@@ -288,8 +281,10 @@
mController.updateHeaderPreference(mBatteryInfo);
- verify(mBatteryUsageProgressBarPref).setBottomSummary(mContext.getString(
- com.android.settingslib.R.string.battery_info_status_not_charging));
+ verify(mBatteryUsageProgressBarPref)
+ .setBottomSummary(
+ mContext.getString(
+ com.android.settingslib.R.string.battery_info_status_not_charging));
}
@Test
@@ -302,8 +297,8 @@
@Test
public void getAvailabilityStatus_returnAvailableUnsearchable() {
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
}
@Test
@@ -319,12 +314,13 @@
public void displayPreference_init_showLoading() {
mController.displayPreference(mPreferenceScreen);
- verify(mBatteryUsageProgressBarPref).setBottomSummary(
- mContext.getString(R.string.settings_license_activity_loading));
+ verify(mBatteryUsageProgressBarPref)
+ .setBottomSummary(mContext.getString(R.string.settings_license_activity_loading));
}
private CharSequence formatBatteryPercentageText() {
- return TextUtils.expandTemplate(mContext.getText(R.string.battery_header_title_alternate),
+ return TextUtils.expandTemplate(
+ mContext.getText(R.string.battery_header_title_alternate),
NumberFormat.getIntegerInstance().format(BATTERY_LEVEL));
}
@@ -333,7 +329,7 @@
mBatteryInfo.statusLabel = BATTERY_STATUS;
mBatteryInfo.discharging = isDischarging;
- when(mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(
- mController, mBatteryInfo)).thenReturn(updatedByStatusFeature);
+ when(mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(mController, mBatteryInfo))
+ .thenReturn(updatedByStatusFeature);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
index b787239..3685a1d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
@@ -46,10 +46,8 @@
private static final long TEST_TIME_REMAINING = 1000L;
- @Mock
- private BatteryStatsManager mBatteryStatsManager;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
+ @Mock private BatteryStatsManager mBatteryStatsManager;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 2ba9f33..0339f57 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -72,21 +72,20 @@
private static final String ENHANCED_STRING_SUFFIX = "based on your usage";
private static final String BATTERY_RUN_OUT_PREFIX = "Battery may run out by";
private static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1);
- private static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED =
- "1 min left until full";
+ private static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED = "1 min left until full";
private static final String TEST_BATTERY_LEVEL_10 = "10%";
private static final String FIFTEEN_MIN_FORMATTED = "15 min";
- private static final Estimate MOCK_ESTIMATE = new Estimate(
- 1000, /* estimateMillis */
- false, /* isBasedOnUsage */
- 1000 /* averageDischargeTime */);
+ private static final Estimate MOCK_ESTIMATE =
+ new Estimate(
+ 1000, /* estimateMillis */
+ false, /* isBasedOnUsage */
+ 1000 /* averageDischargeTime */);
private Intent mDisChargingBatteryBroadcast;
private Intent mChargingBatteryBroadcast;
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
@Before
public void setUp() {
@@ -99,17 +98,22 @@
mChargingBatteryBroadcast = BatteryTestUtils.getChargingIntent();
doReturn(false).when(mFeatureFactory.powerUsageFeatureProvider).isExtraDefend();
- Settings.Global.putInt(mContext.getContentResolver(),
- BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS, 0);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS,
+ 0);
}
@Test
public void testGetBatteryInfo_hasStatusLabel() {
doReturn(REMAINING_TIME_NULL).when(mBatteryUsageStats).getBatteryTimeRemainingMs();
- BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext,
- mDisChargingBatteryBroadcast, mBatteryUsageStats,
- SystemClock.elapsedRealtime() * 1000,
- true /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfoOld(
+ mContext,
+ mDisChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ SystemClock.elapsedRealtime() * 1000,
+ true /* shortString */);
assertThat(info.statusLabel).isEqualTo(STATUS_NOT_CHARGING);
}
@@ -117,8 +121,13 @@
@Test
public void testGetBatteryInfo_doNotShowChargingMethod_hasRemainingTime() {
doReturn(REMAINING_TIME).when(mBatteryUsageStats).getChargeTimeRemainingMs();
- BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
- mBatteryUsageStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfoOld(
+ mContext,
+ mChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.chargeLabel.toString()).isEqualTo(STATUS_CHARGING_TIME);
}
@@ -126,8 +135,13 @@
@Test
public void testGetBatteryInfo_doNotShowChargingMethod_noRemainingTime() {
doReturn(REMAINING_TIME_NULL).when(mBatteryUsageStats).getChargeTimeRemainingMs();
- BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
- mBatteryUsageStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfoOld(
+ mContext,
+ mChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.chargeLabel.toString()).ignoringCase().isEqualTo(STATUS_CHARGING_NO_TIME);
}
@@ -135,9 +149,15 @@
@Test
public void testGetBatteryInfo_pluggedInUsingShortString_usesCorrectData() {
doReturn(TEST_CHARGE_TIME_REMAINING / 1000)
- .when(mBatteryUsageStats).getChargeTimeRemainingMs();
- BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
- mBatteryUsageStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
+ .when(mBatteryUsageStats)
+ .getChargeTimeRemainingMs();
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfoOld(
+ mContext,
+ mChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ SystemClock.elapsedRealtime() * 1000,
+ true /* shortString */);
assertThat(info.discharging).isEqualTo(false);
assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1 min left until full");
@@ -145,15 +165,27 @@
@Test
public void testGetBatteryInfo_basedOnUsageTrueMoreThanFifteenMinutes_usesCorrectString() {
- Estimate estimate = new Estimate(Duration.ofHours(4).toMillis(),
- true /* isBasedOnUsage */,
- 1000 /* averageDischargeTime */);
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
- mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
- BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
- mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
- true /* shortString */);
+ Estimate estimate =
+ new Estimate(
+ Duration.ofHours(4).toMillis(),
+ true /* isBasedOnUsage */,
+ 1000 /* averageDischargeTime */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mDisChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ estimate,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
+ BatteryInfo info2 =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mDisChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ estimate,
+ SystemClock.elapsedRealtime() * 1000,
+ true /* shortString */);
// Both long and short strings should not have extra text
assertThat(info.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
@@ -165,24 +197,41 @@
@Test
@Ignore
public void getBatteryInfo_MoreThanOneDay_suggestionLabelIsCorrectString() {
- Estimate estimate = new Estimate(Duration.ofDays(3).toMillis(),
- true /* isBasedOnUsage */,
- 1000 /* averageDischargeTime */);
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
- mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
+ Estimate estimate =
+ new Estimate(
+ Duration.ofDays(3).toMillis(),
+ true /* isBasedOnUsage */,
+ 1000 /* averageDischargeTime */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mDisChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ estimate,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.suggestionLabel).doesNotContain(BATTERY_RUN_OUT_PREFIX);
}
@Test
public void testGetBatteryInfo_basedOnUsageFalse_usesDefaultString() {
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
- BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
- true /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mDisChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
+ BatteryInfo info2 =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mDisChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
+ true /* shortString */);
assertThat(info.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
@@ -191,11 +240,17 @@
@Test
public void testGetBatteryInfo_charging_usesChargeTime() {
doReturn(TEST_CHARGE_TIME_REMAINING / 1000)
- .when(mBatteryUsageStats).getChargeTimeRemainingMs();
+ .when(mBatteryUsageStats)
+ .getChargeTimeRemainingMs();
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.remainingTimeUs).isEqualTo(TEST_CHARGE_TIME_REMAINING);
assertThat(info.remainingLabel.toString())
@@ -206,24 +261,33 @@
public void testGetBatteryInfo_pluggedInWithFullBattery_onlyShowBatteryLevel() {
mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 100);
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.chargeLabel).isEqualTo("100%");
}
@Test
public void testGetBatteryInfo_chargingWithDefender_updateChargeLabel() {
- doReturn(TEST_CHARGE_TIME_REMAINING)
- .when(mBatteryUsageStats)
- .getChargeTimeRemainingMs();
- mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_CHARGING_STATUS,
+ doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryUsageStats).getChargeTimeRemainingMs();
+ mChargingBatteryBroadcast.putExtra(
+ BatteryManager.EXTRA_CHARGING_STATUS,
BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE);
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.isBatteryDefender).isTrue();
assertThat(info.chargeLabel.toString()).contains(STATUS_CHARGING_PAUSED);
@@ -231,30 +295,32 @@
@Test
public void testGetBatteryInfo_getChargeTimeRemaining_updateSettingsGlobal() {
- doReturn(TEST_CHARGE_TIME_REMAINING)
- .when(mBatteryUsageStats)
- .getChargeTimeRemainingMs();
+ doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryUsageStats).getChargeTimeRemainingMs();
- BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
false /* shortString */);
- assertThat(BatteryInfo.getSettingsChargeTimeRemaining(mContext)).isEqualTo(
- TEST_CHARGE_TIME_REMAINING);
+ assertThat(BatteryInfo.getSettingsChargeTimeRemaining(mContext))
+ .isEqualTo(TEST_CHARGE_TIME_REMAINING);
}
@Test
public void testGetBatteryInfo_differentChargeTimeRemaining_updateSettingsGlobal() {
- doReturn(TEST_CHARGE_TIME_REMAINING)
- .when(mBatteryUsageStats)
- .getChargeTimeRemainingMs();
+ doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryUsageStats).getChargeTimeRemainingMs();
final long newTimeToFull = 300L;
- doReturn(newTimeToFull)
- .when(mBatteryUsageStats)
- .getChargeTimeRemainingMs();
+ doReturn(newTimeToFull).when(mBatteryUsageStats).getChargeTimeRemainingMs();
- BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ mChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
false /* shortString */);
assertThat(BatteryInfo.getSettingsChargeTimeRemaining(mContext)).isEqualTo(newTimeToFull);
@@ -263,18 +329,27 @@
@Test
public void testGetBatteryInfo_dockDefenderActive_updateChargeString() {
doReturn(TEST_CHARGE_TIME_REMAINING / 1000)
- .when(mBatteryUsageStats).getChargeTimeRemainingMs();
+ .when(mBatteryUsageStats)
+ .getChargeTimeRemainingMs();
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isExtraDefend();
- Intent intent = BatteryTestUtils.getCustomBatteryIntent(BatteryManager.BATTERY_PLUGGED_DOCK,
- 50 /* level */,
- 100 /* scale */,
- BatteryManager.BATTERY_STATUS_CHARGING)
- .putExtra(BatteryManager.EXTRA_CHARGING_STATUS,
- BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE);
+ Intent intent =
+ BatteryTestUtils.getCustomBatteryIntent(
+ BatteryManager.BATTERY_PLUGGED_DOCK,
+ 50 /* level */,
+ 100 /* scale */,
+ BatteryManager.BATTERY_STATUS_CHARGING)
+ .putExtra(
+ BatteryManager.EXTRA_CHARGING_STATUS,
+ BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE);
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, intent,
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ intent,
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.chargeLabel.toString()).contains(STATUS_CHARGING_PAUSED);
}
@@ -282,18 +357,25 @@
@Test
public void testGetBatteryInfo_dockDefenderTemporarilyBypassed_updateChargeLabel() {
doReturn(REMAINING_TIME).when(mBatteryUsageStats).getChargeTimeRemainingMs();
- mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_CHARGING_STATUS,
- BatteryManager.CHARGING_POLICY_DEFAULT);
- Settings.Global.putInt(mContext.getContentResolver(),
- BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS, 1);
+ mChargingBatteryBroadcast.putExtra(
+ BatteryManager.EXTRA_CHARGING_STATUS, BatteryManager.CHARGING_POLICY_DEFAULT);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS,
+ 1);
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext,
- BatteryTestUtils.getCustomBatteryIntent(BatteryManager.BATTERY_PLUGGED_DOCK,
- 50 /* level */,
- 100 /* scale */,
- BatteryManager.BATTERY_STATUS_CHARGING),
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ BatteryTestUtils.getCustomBatteryIntent(
+ BatteryManager.BATTERY_PLUGGED_DOCK,
+ 50 /* level */,
+ 100 /* scale */,
+ BatteryManager.BATTERY_STATUS_CHARGING),
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.chargeLabel.toString()).contains(STATUS_CHARGING_TIME);
}
@@ -301,16 +383,21 @@
@Test
public void testGetBatteryInfo_dockDefenderFutureBypass_updateChargeLabel() {
doReturn(false).when(mFeatureFactory.powerUsageFeatureProvider).isExtraDefend();
- mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_CHARGING_STATUS,
- BatteryManager.CHARGING_POLICY_DEFAULT);
+ mChargingBatteryBroadcast.putExtra(
+ BatteryManager.EXTRA_CHARGING_STATUS, BatteryManager.CHARGING_POLICY_DEFAULT);
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext,
- BatteryTestUtils.getCustomBatteryIntent(BatteryManager.BATTERY_PLUGGED_DOCK,
- 50 /* level */,
- 100 /* scale */,
- BatteryManager.BATTERY_STATUS_CHARGING),
- mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
- false /* shortString */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ BatteryTestUtils.getCustomBatteryIntent(
+ BatteryManager.BATTERY_PLUGGED_DOCK,
+ 50 /* level */,
+ 100 /* scale */,
+ BatteryManager.BATTERY_STATUS_CHARGING),
+ mBatteryUsageStats,
+ MOCK_ESTIMATE,
+ SystemClock.elapsedRealtime() * 1000,
+ false /* shortString */);
assertThat(info.chargeLabel.toString()).contains(STATUS_CHARGING_FUTURE_BYPASS);
}
@@ -318,15 +405,20 @@
// Make our battery stats return a sequence of battery events.
private void mockBatteryStatsHistory() {
// Mock out new data every time iterateBatteryStatsHistory is called.
- doAnswer(invocation -> {
- BatteryStatsHistoryIterator iterator = mock(BatteryStatsHistoryIterator.class);
- when(iterator.next()).thenReturn(
- makeHistoryIterm(1000, 99),
- makeHistoryIterm(1500, 98),
- makeHistoryIterm(2000, 97),
- null);
- return iterator;
- }).when(mBatteryUsageStats).iterateBatteryStatsHistory();
+ doAnswer(
+ invocation -> {
+ BatteryStatsHistoryIterator iterator =
+ mock(BatteryStatsHistoryIterator.class);
+ when(iterator.next())
+ .thenReturn(
+ makeHistoryIterm(1000, 99),
+ makeHistoryIterm(1500, 98),
+ makeHistoryIterm(2000, 97),
+ null);
+ return iterator;
+ })
+ .when(mBatteryUsageStats)
+ .iterateBatteryStatsHistory();
}
private BatteryStats.HistoryItem makeHistoryIterm(long time, int batteryLevel) {
@@ -373,7 +465,8 @@
pointsExpected.append(2000, 96);
pointsExpected.append(2500, 95);
pointsExpected.append(3000, 94);
- doReturn(pointsExpected).when(mFeatureFactory.powerUsageFeatureProvider)
+ doReturn(pointsExpected)
+ .when(mFeatureFactory.powerUsageFeatureProvider)
.getEnhancedBatteryPredictionCurve(any(Context.class), anyLong());
info.bindHistory(view);
@@ -390,14 +483,21 @@
} else {
doReturn(0L).when(mBatteryUsageStats).getChargeTimeRemainingMs();
}
- Estimate batteryEstimate = new Estimate(
- estimate ? 1000 : 0,
- false /* isBasedOnUsage */,
- 1000 /* averageDischargeTime */);
- BatteryInfo info = BatteryInfo.getBatteryInfo(mContext,
- charging ? mChargingBatteryBroadcast : mDisChargingBatteryBroadcast,
- mBatteryUsageStats, batteryEstimate, SystemClock.elapsedRealtime() * 1000, false);
- doReturn(enhanced).when(mFeatureFactory.powerUsageFeatureProvider)
+ Estimate batteryEstimate =
+ new Estimate(
+ estimate ? 1000 : 0,
+ false /* isBasedOnUsage */,
+ 1000 /* averageDischargeTime */);
+ BatteryInfo info =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ charging ? mChargingBatteryBroadcast : mDisChargingBatteryBroadcast,
+ mBatteryUsageStats,
+ batteryEstimate,
+ SystemClock.elapsedRealtime() * 1000,
+ false);
+ doReturn(enhanced)
+ .when(mFeatureFactory.powerUsageFeatureProvider)
.isEnhancedBatteryPredictionEnabled(mContext);
return info;
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
index 0aa702a..ec3cfcf 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
@@ -39,12 +39,9 @@
private static final int BATTERY_CRITICAL_LEVEL = 15;
private static final int BATTERY_LOW_LEVEL = 3;
- @Mock
- private ColorFilter mErrorColorFilter;
- @Mock
- private ColorFilter mAccentColorFilter;
- @Mock
- private ColorFilter mForegroundColorFilter;
+ @Mock private ColorFilter mErrorColorFilter;
+ @Mock private ColorFilter mAccentColorFilter;
+ @Mock private ColorFilter mForegroundColorFilter;
private Context mContext;
private BatteryMeterView mBatteryMeterView;
private BatteryMeterView.BatteryMeterDrawable mDrawable;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeLogUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeLogUtilsTest.java
index 87de62f..5f591eb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeLogUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeLogUtilsTest.java
@@ -57,8 +57,7 @@
BatteryOptimizeLogUtils.writeLog(mContext, Action.APPLY, "pkg1", "logs");
BatteryOptimizeLogUtils.printBatteryOptimizeHistoricalLog(mContext, mTestPrintWriter);
- assertThat(mTestStringWriter.toString()).contains(
- "pkg1\taction:APPLY\tevent:logs");
+ assertThat(mTestStringWriter.toString()).contains("pkg1\taction:APPLY\tevent:logs");
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
index f9d3108..3551eeb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
@@ -98,8 +98,7 @@
when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
.thenReturn(AppOpsManager.MODE_IGNORED);
- assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
- .isEqualTo(MODE_RESTRICTED);
+ assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()).isEqualTo(MODE_RESTRICTED);
}
@Test
@@ -108,8 +107,7 @@
when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
.thenReturn(AppOpsManager.MODE_ALLOWED);
- assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
- .isEqualTo(MODE_UNRESTRICTED);
+ assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()).isEqualTo(MODE_UNRESTRICTED);
}
@Test
@@ -118,8 +116,7 @@
when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
.thenReturn(AppOpsManager.MODE_ALLOWED);
- assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
- .isEqualTo(MODE_OPTIMIZED);
+ assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()).isEqualTo(MODE_OPTIMIZED);
}
@Test
@@ -168,7 +165,6 @@
when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
.thenReturn(AppOpsManager.MODE_IGNORED);
-
mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED, Action.UNKNOWN);
TimeUnit.SECONDS.sleep(1);
@@ -205,18 +201,19 @@
@Test
public void testGetInstalledApplications_returnEmptyArray() {
- assertTrue(BatteryOptimizeUtils.getInstalledApplications(mContext, mMockIPackageManager)
- .isEmpty());
+ assertTrue(
+ BatteryOptimizeUtils.getInstalledApplications(mContext, mMockIPackageManager)
+ .isEmpty());
}
@Test
public void testGetInstalledApplications_returnNull() throws Exception {
final UserInfo userInfo =
- new UserInfo(/*userId=*/ 0, /*userName=*/ "google", /*flag=*/ 0);
+ new UserInfo(/* userId= */ 0, /* userName= */ "google", /* flag= */ 0);
doReturn(Arrays.asList(userInfo)).when(mMockUserManager).getProfiles(anyInt());
doThrow(new RuntimeException())
- .when(mMockIPackageManager)
- .getInstalledApplications(anyLong(), anyInt());
+ .when(mMockIPackageManager)
+ .getInstalledApplications(anyLong(), anyInt());
assertNull(BatteryOptimizeUtils.getInstalledApplications(mContext, mMockIPackageManager));
}
@@ -224,7 +221,7 @@
@Test
public void testGetInstalledApplications_returnInstalledApps() throws Exception {
final UserInfo userInfo =
- new UserInfo(/*userId=*/ 0, /*userName=*/ "google", /*flag=*/ 0);
+ new UserInfo(/* userId= */ 0, /* userName= */ "google", /* flag= */ 0);
doReturn(Arrays.asList(userInfo)).when(mMockUserManager).getProfiles(anyInt());
final ApplicationInfo applicationInfo1 = new ApplicationInfo();
@@ -242,10 +239,15 @@
applicationInfo4.enabled = true;
applicationInfo4.uid = 4;
applicationInfo4.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
- doReturn(new ParceledListSlice<ApplicationInfo>(
- Arrays.asList(applicationInfo1, applicationInfo2, applicationInfo3, applicationInfo4)))
- .when(mMockIPackageManager)
- .getInstalledApplications(anyLong(), anyInt());
+ doReturn(
+ new ParceledListSlice<ApplicationInfo>(
+ Arrays.asList(
+ applicationInfo1,
+ applicationInfo2,
+ applicationInfo3,
+ applicationInfo4)))
+ .when(mMockIPackageManager)
+ .getInstalledApplications(anyLong(), anyInt());
final ArraySet<ApplicationInfo> applications =
BatteryOptimizeUtils.getInstalledApplications(mContext, mMockIPackageManager);
@@ -260,7 +262,8 @@
@Test
public void testResetAppOptimizationMode_Optimized_verifyAction() throws Exception {
runTestForResetWithMode(
- AppOpsManager.MODE_ALLOWED, /* allowListed */ false,
+ AppOpsManager.MODE_ALLOWED, /* allowListed */
+ false,
/* isSystemOrDefaultApp */ false);
verifyNoInteractions(mMockBatteryUtils);
@@ -274,7 +277,8 @@
@Test
public void testResetAppOptimizationMode_SystemOrDefault_verifyAction() throws Exception {
runTestForResetWithMode(
- AppOpsManager.MODE_ALLOWED, /* allowListed */ true,
+ AppOpsManager.MODE_ALLOWED, /* allowListed */
+ true,
/* isSystemOrDefaultApp */ true);
verifyNoInteractions(mMockBatteryUtils);
@@ -289,7 +293,8 @@
@Test
public void testResetAppOptimizationMode_Restricted_verifyAction() throws Exception {
runTestForResetWithMode(
- AppOpsManager.MODE_IGNORED, /* allowListed */ false,
+ AppOpsManager.MODE_IGNORED, /* allowListed */
+ false,
/* isSystemOrDefaultApp */ false);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
@@ -298,7 +303,8 @@
@Test
public void testResetAppOptimizationMode_Unrestricted_verifyAction() throws Exception {
runTestForResetWithMode(
- AppOpsManager.MODE_ALLOWED, /* allowListed */ true,
+ AppOpsManager.MODE_ALLOWED, /* allowListed */
+ true,
/* isSystemOrDefaultApp */ false);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
@@ -308,32 +314,28 @@
int appStandbyMode, boolean allowListed, boolean isSystemOrDefaultApp)
throws Exception {
final UserInfo userInfo =
- new UserInfo(/*userId=*/ 0, /*userName=*/ "google", /*flag=*/ 0);
+ new UserInfo(/* userId= */ 0, /* userName= */ "google", /* flag= */ 0);
doReturn(Arrays.asList(userInfo)).when(mMockUserManager).getProfiles(anyInt());
final ApplicationInfo applicationInfo = new ApplicationInfo();
applicationInfo.uid = UID;
applicationInfo.packageName = PACKAGE_NAME;
applicationInfo.enabled = true;
- doReturn(new ParceledListSlice<ApplicationInfo>(
- Arrays.asList(applicationInfo)))
+ doReturn(new ParceledListSlice<ApplicationInfo>(Arrays.asList(applicationInfo)))
.when(mMockIPackageManager)
.getInstalledApplications(anyLong(), anyInt());
doReturn(appStandbyMode)
.when(mMockAppOpsManager)
.checkOpNoThrow(anyInt(), anyInt(), anyString());
- doReturn(allowListed)
- .when(mMockBackend)
- .isAllowlisted(anyString(), anyInt());
- doReturn(isSystemOrDefaultApp)
- .when(mMockBackend)
- .isSysAllowlisted(anyString());
- doReturn(isSystemOrDefaultApp)
- .when(mMockBackend)
- .isDefaultActiveApp(anyString(), anyInt());
+ doReturn(allowListed).when(mMockBackend).isAllowlisted(anyString(), anyInt());
+ doReturn(isSystemOrDefaultApp).when(mMockBackend).isSysAllowlisted(anyString());
+ doReturn(isSystemOrDefaultApp).when(mMockBackend).isDefaultActiveApp(anyString(), anyInt());
BatteryOptimizeUtils.resetAppOptimizationMode(
- mContext, mMockIPackageManager, mMockAppOpsManager, mMockBackend,
+ mContext,
+ mMockIPackageManager,
+ mMockAppOpsManager,
+ mMockBackend,
mMockBatteryUtils);
TimeUnit.SECONDS.sleep(1);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index ddb9860..8d9a1c0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -21,11 +21,9 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.PowerManager;
import android.provider.Settings;
-import android.util.Pair;
import androidx.preference.Preference;
@@ -41,10 +39,8 @@
@RunWith(RobolectricTestRunner.class)
public class BatterySaverControllerTest {
- @Mock
- private Preference mBatterySaverPref;
- @Mock
- private PowerManager mPowerManager;
+ @Mock private Preference mBatterySaverPref;
+ @Mock private PowerManager mPowerManager;
private BatterySaverController mBatterySaverController;
private Context mContext;
@@ -58,8 +54,8 @@
ReflectionHelpers.setField(mBatterySaverController, "mPowerManager", mPowerManager);
ReflectionHelpers.setField(mBatterySaverController, "mBatterySaverPref", mBatterySaverPref);
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
+ Settings.Global.putInt(
+ mContext.getContentResolver(), Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
}
@Test
@@ -84,8 +80,8 @@
@Test
public void getSummary_batterySaverOffButScheduled_showSummaryScheduled() {
when(mPowerManager.isPowerSaveMode()).thenReturn(false);
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 15);
+ Settings.Global.putInt(
+ mContext.getContentResolver(), Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 15);
assertThat(mBatterySaverController.getSummary()).isEqualTo("Will turn on at 15%");
}
@@ -93,8 +89,8 @@
@Test
public void getSummary_batterySaverOffButScheduledZeroPercent_showSummaryOff() {
when(mPowerManager.isPowerSaveMode()).thenReturn(false);
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
+ Settings.Global.putInt(
+ mContext.getContentResolver(), Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
assertThat(mBatterySaverController.getSummary()).isEqualTo("Off");
}
@@ -107,8 +103,8 @@
Settings.Global.AUTOMATIC_POWER_SAVE_MODE,
PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC);
- assertThat(mBatterySaverController.getSummary()).
- isEqualTo("Will turn on based on your routine");
+ assertThat(mBatterySaverController.getSummary())
+ .isEqualTo("Will turn on based on your routine");
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
index e411531..e3e00ec1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
@@ -32,10 +32,8 @@
@RunWith(RobolectricTestRunner.class)
public class BatterySaverReceiverTest {
- @Mock
- private BatterySaverReceiver.BatterySaverListener mBatterySaverListener;
- @Mock
- private Context mContext;
+ @Mock private BatterySaverReceiver.BatterySaverListener mBatterySaverListener;
+ @Mock private Context mContext;
private BatterySaverReceiver mBatterySaverReceiver;
@Before
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsMigrateCheckerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsMigrateCheckerTest.java
index bab19e5..ba7e9cc 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsMigrateCheckerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsMigrateCheckerTest.java
@@ -56,18 +56,15 @@
@Config(shadows = {BatterySettingsMigrateCheckerTest.ShadowUserHandle.class})
public final class BatterySettingsMigrateCheckerTest {
- private static final Intent BOOT_COMPLETED_INTENT =
- new Intent(Intent.ACTION_BOOT_COMPLETED);
+ private static final Intent BOOT_COMPLETED_INTENT = new Intent(Intent.ACTION_BOOT_COMPLETED);
private static final int UID = 2003;
private static final String PACKAGE_NAME = "com.android.test.app";
private Context mContext;
private BatterySettingsMigrateChecker mBatterySettingsMigrateChecker;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private BatteryOptimizeUtils mBatteryOptimizeUtils;
+ @Mock private PackageManager mPackageManager;
+ @Mock private BatteryOptimizeUtils mBatteryOptimizeUtils;
@Before
public void setUp() throws Exception {
@@ -76,7 +73,8 @@
BatteryUtils.getInstance(mContext).reset();
doReturn(mContext).when(mContext).getApplicationContext();
doReturn(mPackageManager).when(mContext).getPackageManager();
- doReturn(UID).when(mPackageManager)
+ doReturn(UID)
+ .when(mPackageManager)
.getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
BatterySettingsMigrateChecker.sBatteryOptimizeUtils = mBatteryOptimizeUtils;
mBatterySettingsMigrateChecker = new BatterySettingsMigrateChecker();
@@ -150,45 +148,42 @@
}
@Test
- public void verifyBatteryOptimizeModeApps_inAllowList_resetOptimizationMode()
- throws Exception {
- doReturn(BatteryOptimizeUtils.MODE_RESTRICTED).when(mBatteryOptimizeUtils)
+ public void verifyBatteryOptimizeModeApps_inAllowList_resetOptimizationMode() throws Exception {
+ doReturn(BatteryOptimizeUtils.MODE_RESTRICTED)
+ .when(mBatteryOptimizeUtils)
.getAppOptimizationMode();
mBatterySettingsMigrateChecker.verifyBatteryOptimizeModeApps(
- mContext,
- BatteryOptimizeUtils.MODE_OPTIMIZED,
- Arrays.asList(PACKAGE_NAME));
+ mContext, BatteryOptimizeUtils.MODE_OPTIMIZED, Arrays.asList(PACKAGE_NAME));
final InOrder inOrder = inOrder(mBatteryOptimizeUtils);
inOrder.verify(mBatteryOptimizeUtils).getAppOptimizationMode();
- inOrder.verify(mBatteryOptimizeUtils).setAppUsageState(
- BatteryOptimizeUtils.MODE_OPTIMIZED,
- BatteryOptimizeHistoricalLogEntry.Action.FORCE_RESET);
+ inOrder.verify(mBatteryOptimizeUtils)
+ .setAppUsageState(
+ BatteryOptimizeUtils.MODE_OPTIMIZED,
+ BatteryOptimizeHistoricalLogEntry.Action.FORCE_RESET);
}
@Test
public void verifyBatteryOptimizeModeApps_optimizedMode_noAction() throws Exception {
- doReturn(BatteryOptimizeUtils.MODE_OPTIMIZED).when(mBatteryOptimizeUtils)
+ doReturn(BatteryOptimizeUtils.MODE_OPTIMIZED)
+ .when(mBatteryOptimizeUtils)
.getAppOptimizationMode();
mBatterySettingsMigrateChecker.verifyBatteryOptimizeModeApps(
- mContext,
- BatteryOptimizeUtils.MODE_OPTIMIZED,
- Arrays.asList(PACKAGE_NAME));
+ mContext, BatteryOptimizeUtils.MODE_OPTIMIZED, Arrays.asList(PACKAGE_NAME));
verify(mBatteryOptimizeUtils, never()).setAppUsageState(anyInt(), any());
}
@Test
public void verifyBatteryOptimizeModeApps_notInAllowList_noAction() throws Exception {
- doReturn(BatteryOptimizeUtils.MODE_RESTRICTED).when(mBatteryOptimizeUtils)
+ doReturn(BatteryOptimizeUtils.MODE_RESTRICTED)
+ .when(mBatteryOptimizeUtils)
.getAppOptimizationMode();
mBatterySettingsMigrateChecker.verifyBatteryOptimizeModeApps(
- mContext,
- BatteryOptimizeUtils.MODE_OPTIMIZED,
- new ArrayList<String>());
+ mContext, BatteryOptimizeUtils.MODE_OPTIMIZED, new ArrayList<String>());
verifyNoInteractions(mBatteryOptimizeUtils);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 2fe0cec..0d8c669 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -106,32 +106,22 @@
private static final String INFO_EXCESSIVE = "anomaly_type=4,auto_restriction=false";
private static final String INFO_WAKELOCK = "anomaly_type=1,auto_restriction=false";
- @Mock
- private BatteryStats.Uid mUid;
- @Mock
- private BatteryStats.Timer mTimer;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
- @Mock
- private BatteryConsumer mAggregateBatteryConsumer;
- @Mock
- private BatteryInfo mBatteryInfo;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private AppOpsManager mAppOpsManager;
- @Mock
- private ApplicationInfo mApplicationInfo;
+ @Mock private BatteryStats.Uid mUid;
+ @Mock private BatteryStats.Timer mTimer;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
+ @Mock private BatteryConsumer mAggregateBatteryConsumer;
+ @Mock private BatteryInfo mBatteryInfo;
+ @Mock private PackageManager mPackageManager;
+ @Mock private AppOpsManager mAppOpsManager;
+ @Mock private ApplicationInfo mApplicationInfo;
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsManager mBatteryStatsManager;
- @Mock
- private ApplicationInfo mHighApplicationInfo;
- @Mock
- private ApplicationInfo mLowApplicationInfo;
- @Mock
- private PowerAllowlistBackend mPowerAllowlistBackend;
- @Mock
- private BatteryDatabaseManager mBatteryDatabaseManager;
+
+ @Mock private ApplicationInfo mHighApplicationInfo;
+ @Mock private ApplicationInfo mLowApplicationInfo;
+ @Mock private PowerAllowlistBackend mPowerAllowlistBackend;
+ @Mock private BatteryDatabaseManager mBatteryDatabaseManager;
private AnomalyInfo mAnomalyInfo;
private BatteryUtils mBatteryUtils;
private FakeFeatureFactory mFeatureFactory;
@@ -145,16 +135,21 @@
mFeatureFactory = FakeFeatureFactory.setupForTest();
mProvider = mFeatureFactory.powerUsageFeatureProvider;
- doReturn(TIME_STATE_TOP).when(mUid).getProcessStateTime(eq(PROCESS_STATE_TOP), anyLong(),
- anyInt());
- doReturn(TIME_STATE_FOREGROUND_SERVICE).when(mUid).getProcessStateTime(
- eq(PROCESS_STATE_FOREGROUND_SERVICE), anyLong(), anyInt());
- doReturn(TIME_STATE_TOP_SLEEPING).when(mUid).getProcessStateTime(
- eq(PROCESS_STATE_TOP_SLEEPING), anyLong(), anyInt());
- doReturn(TIME_STATE_FOREGROUND).when(mUid).getProcessStateTime(eq(PROCESS_STATE_FOREGROUND),
- anyLong(), anyInt());
- doReturn(TIME_STATE_BACKGROUND).when(mUid).getProcessStateTime(eq(PROCESS_STATE_BACKGROUND),
- anyLong(), anyInt());
+ doReturn(TIME_STATE_TOP)
+ .when(mUid)
+ .getProcessStateTime(eq(PROCESS_STATE_TOP), anyLong(), anyInt());
+ doReturn(TIME_STATE_FOREGROUND_SERVICE)
+ .when(mUid)
+ .getProcessStateTime(eq(PROCESS_STATE_FOREGROUND_SERVICE), anyLong(), anyInt());
+ doReturn(TIME_STATE_TOP_SLEEPING)
+ .when(mUid)
+ .getProcessStateTime(eq(PROCESS_STATE_TOP_SLEEPING), anyLong(), anyInt());
+ doReturn(TIME_STATE_FOREGROUND)
+ .when(mUid)
+ .getProcessStateTime(eq(PROCESS_STATE_FOREGROUND), anyLong(), anyInt());
+ doReturn(TIME_STATE_BACKGROUND)
+ .when(mUid)
+ .getProcessStateTime(eq(PROCESS_STATE_BACKGROUND), anyLong(), anyInt());
when(mPackageManager.getApplicationInfo(eq(HIGH_SDK_PACKAGE), anyInt()))
.thenReturn(mHighApplicationInfo);
@@ -166,12 +161,14 @@
mContext = spy(RuntimeEnvironment.application);
doReturn(mPackageManager).when(mContext).getPackageManager();
doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
- doReturn(mBatteryStatsManager).when(mContext)
+ doReturn(mBatteryStatsManager)
+ .when(mContext)
.getSystemService(Context.BATTERY_STATS_SERVICE);
mBatteryUtils = spy(new BatteryUtils(mContext));
mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
- doReturn(0L).when(mBatteryUtils)
- .getForegroundServiceTotalTimeUs(any(BatteryStats.Uid.class), anyLong());
+ doReturn(0L)
+ .when(mBatteryUtils)
+ .getForegroundServiceTotalTimeUs(any(BatteryStats.Uid.class), anyLong());
mAnomalyInfo = new AnomalyInfo(INFO_WAKELOCK);
BatteryDatabaseManager.setUpForTest(mBatteryDatabaseManager);
@@ -180,54 +177,62 @@
@Test
public void testGetProcessTimeMs_typeForeground_timeCorrect() {
- doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils)
- .getForegroundActivityTotalTimeUs(eq(mUid), anyLong());
+ doReturn(TIME_STATE_FOREGROUND + 500)
+ .when(mBatteryUtils)
+ .getForegroundActivityTotalTimeUs(eq(mUid), anyLong());
- final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.FOREGROUND, mUid,
- BatteryStats.STATS_SINCE_CHARGED);
+ final long time =
+ mBatteryUtils.getProcessTimeMs(
+ BatteryUtils.StatusType.FOREGROUND, mUid, BatteryStats.STATS_SINCE_CHARGED);
assertThat(time).isEqualTo(TIME_EXPECTED_FOREGROUND);
}
@Test
public void testGetProcessTimeMs_typeBackground_timeCorrect() {
- final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.BACKGROUND, mUid,
- BatteryStats.STATS_SINCE_CHARGED);
+ final long time =
+ mBatteryUtils.getProcessTimeMs(
+ BatteryUtils.StatusType.BACKGROUND, mUid, BatteryStats.STATS_SINCE_CHARGED);
assertThat(time).isEqualTo(TIME_EXPECTED_BACKGROUND);
}
@Test
public void testGetProcessTimeMs_typeAll_timeCorrect() {
- doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils)
- .getForegroundActivityTotalTimeUs(eq(mUid), anyLong());
+ doReturn(TIME_STATE_FOREGROUND + 500)
+ .when(mBatteryUtils)
+ .getForegroundActivityTotalTimeUs(eq(mUid), anyLong());
- final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.ALL, mUid,
- BatteryStats.STATS_SINCE_CHARGED);
+ final long time =
+ mBatteryUtils.getProcessTimeMs(
+ BatteryUtils.StatusType.ALL, mUid, BatteryStats.STATS_SINCE_CHARGED);
assertThat(time).isEqualTo(TIME_EXPECTED_ALL);
}
@Test
public void testGetProcessTimeMs_uidNull_returnZero() {
- final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.ALL, null,
- BatteryStats.STATS_SINCE_CHARGED);
+ final long time =
+ mBatteryUtils.getProcessTimeMs(
+ BatteryUtils.StatusType.ALL, null, BatteryStats.STATS_SINCE_CHARGED);
assertThat(time).isEqualTo(0);
}
@Test
public void testCalculateBatteryPercent() {
- assertThat(mBatteryUtils.calculateBatteryPercent(BATTERY_SYSTEM_USAGE, TOTAL_BATTERY_USAGE,
- DISCHARGE_AMOUNT))
- .isWithin(PRECISION).of(PERCENT_SYSTEM_USAGE);
+ assertThat(
+ mBatteryUtils.calculateBatteryPercent(
+ BATTERY_SYSTEM_USAGE, TOTAL_BATTERY_USAGE, DISCHARGE_AMOUNT))
+ .isWithin(PRECISION)
+ .of(PERCENT_SYSTEM_USAGE);
}
@Test
public void testCalculateLastFullChargeTime() {
final long currentTimeMs = System.currentTimeMillis();
- when(mBatteryUsageStats.getStatsStartTimestamp()).thenReturn(
- currentTimeMs - TIME_SINCE_LAST_FULL_CHARGE_MS);
+ when(mBatteryUsageStats.getStatsStartTimestamp())
+ .thenReturn(currentTimeMs - TIME_SINCE_LAST_FULL_CHARGE_MS);
assertThat(mBatteryUtils.calculateLastFullChargeTime(mBatteryUsageStats, currentTimeMs))
.isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
@@ -237,49 +242,54 @@
public void testGetForegroundActivityTotalTimeMs_returnMilliseconds() {
final long rawRealtimeUs = SystemClock.elapsedRealtime() * 1000;
doReturn(mTimer).when(mUid).getForegroundActivityTimer();
- doReturn(TIME_SINCE_LAST_FULL_CHARGE_US).when(mTimer)
+ doReturn(TIME_SINCE_LAST_FULL_CHARGE_US)
+ .when(mTimer)
.getTotalTimeLocked(rawRealtimeUs, BatteryStats.STATS_SINCE_CHARGED);
- assertThat(mBatteryUtils.getForegroundActivityTotalTimeUs(mUid, rawRealtimeUs)).isEqualTo(
- TIME_SINCE_LAST_FULL_CHARGE_US);
+ assertThat(mBatteryUtils.getForegroundActivityTotalTimeUs(mUid, rawRealtimeUs))
+ .isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_US);
}
@Test
- public void testGetTargetSdkVersion_packageExist_returnSdk() throws
- PackageManager.NameNotFoundException {
- doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
- PackageManager.GET_META_DATA);
+ public void testGetTargetSdkVersion_packageExist_returnSdk()
+ throws PackageManager.NameNotFoundException {
+ doReturn(mApplicationInfo)
+ .when(mPackageManager)
+ .getApplicationInfo(PACKAGE_NAME, PackageManager.GET_META_DATA);
mApplicationInfo.targetSdkVersion = SDK_VERSION;
assertThat(mBatteryUtils.getTargetSdkVersion(PACKAGE_NAME)).isEqualTo(SDK_VERSION);
}
@Test
- public void testGetTargetSdkVersion_packageNotExist_returnSdkNull() throws
- PackageManager.NameNotFoundException {
- doThrow(new PackageManager.NameNotFoundException()).when(
- mPackageManager).getApplicationInfo(PACKAGE_NAME, PackageManager.GET_META_DATA);
+ public void testGetTargetSdkVersion_packageNotExist_returnSdkNull()
+ throws PackageManager.NameNotFoundException {
+ doThrow(new PackageManager.NameNotFoundException())
+ .when(mPackageManager)
+ .getApplicationInfo(PACKAGE_NAME, PackageManager.GET_META_DATA);
- assertThat(mBatteryUtils.getTargetSdkVersion(PACKAGE_NAME)).isEqualTo(
- BatteryUtils.SDK_NULL);
+ assertThat(mBatteryUtils.getTargetSdkVersion(PACKAGE_NAME))
+ .isEqualTo(BatteryUtils.SDK_NULL);
}
@Test
public void testBackgroundRestrictionOn_restrictionOn_returnTrue() {
- doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager).checkOpNoThrow(
- AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
+ doReturn(AppOpsManager.MODE_IGNORED)
+ .when(mAppOpsManager)
+ .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
- assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID,
- PACKAGE_NAME)).isTrue();
+ assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID, PACKAGE_NAME))
+ .isTrue();
}
@Test
public void testBackgroundRestrictionOn_restrictionOff_returnFalse() {
- doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager).checkOpNoThrow(
- AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
+ doReturn(AppOpsManager.MODE_ALLOWED)
+ .when(mAppOpsManager)
+ .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID, PACKAGE_NAME))
- .isFalse();
+ .isFalse();
}
@Test
@@ -294,13 +304,13 @@
@Test
public void testIsPreOApp_containPreOApp_ReturnTrue() {
- assertThat(
- mBatteryUtils.isPreOApp(new String[]{HIGH_SDK_PACKAGE, LOW_SDK_PACKAGE})).isTrue();
+ assertThat(mBatteryUtils.isPreOApp(new String[] {HIGH_SDK_PACKAGE, LOW_SDK_PACKAGE}))
+ .isTrue();
}
@Test
public void testIsPreOApp_emptyList_ReturnFalse() {
- assertThat(mBatteryUtils.isPreOApp(new String[]{})).isFalse();
+ assertThat(mBatteryUtils.isPreOApp(new String[] {})).isFalse();
}
@Ignore
@@ -309,10 +319,18 @@
mBatteryUtils.setForceAppStandby(UID, LOW_SDK_PACKAGE, AppOpsManager.MODE_IGNORED);
// Restrict both OP_RUN_IN_BACKGROUND and OP_RUN_ANY_IN_BACKGROUND
- verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID, LOW_SDK_PACKAGE,
- AppOpsManager.MODE_IGNORED);
- verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID, LOW_SDK_PACKAGE,
- AppOpsManager.MODE_IGNORED);
+ verify(mAppOpsManager)
+ .setMode(
+ AppOpsManager.OP_RUN_IN_BACKGROUND,
+ UID,
+ LOW_SDK_PACKAGE,
+ AppOpsManager.MODE_IGNORED);
+ verify(mAppOpsManager)
+ .setMode(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+ UID,
+ LOW_SDK_PACKAGE,
+ AppOpsManager.MODE_IGNORED);
}
@Ignore
@@ -321,42 +339,53 @@
mBatteryUtils.setForceAppStandby(UID, HIGH_SDK_PACKAGE, AppOpsManager.MODE_IGNORED);
// Don't restrict OP_RUN_IN_BACKGROUND because it is already been restricted for O app
- verify(mAppOpsManager, never()).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID,
- HIGH_SDK_PACKAGE, AppOpsManager.MODE_IGNORED);
+ verify(mAppOpsManager, never())
+ .setMode(
+ AppOpsManager.OP_RUN_IN_BACKGROUND,
+ UID,
+ HIGH_SDK_PACKAGE,
+ AppOpsManager.MODE_IGNORED);
// Restrict OP_RUN_ANY_IN_BACKGROUND
- verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID,
- HIGH_SDK_PACKAGE, AppOpsManager.MODE_IGNORED);
+ verify(mAppOpsManager)
+ .setMode(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+ UID,
+ HIGH_SDK_PACKAGE,
+ AppOpsManager.MODE_IGNORED);
}
@Test
public void testSetForceAppStandby_restrictApp_recordTime() {
mBatteryUtils.setForceAppStandby(UID, HIGH_SDK_PACKAGE, AppOpsManager.MODE_IGNORED);
- verify(mBatteryDatabaseManager).insertAction(
- eq(AnomalyDatabaseHelper.ActionType.RESTRICTION), eq(UID),
- eq(HIGH_SDK_PACKAGE), anyLong());
+ verify(mBatteryDatabaseManager)
+ .insertAction(
+ eq(AnomalyDatabaseHelper.ActionType.RESTRICTION), eq(UID),
+ eq(HIGH_SDK_PACKAGE), anyLong());
}
@Test
public void testSetForceAppStandby_unrestrictApp_deleteTime() {
mBatteryUtils.setForceAppStandby(UID, HIGH_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
- verify(mBatteryDatabaseManager).deleteAction(AnomalyDatabaseHelper.ActionType.RESTRICTION,
- UID, HIGH_SDK_PACKAGE);
+ verify(mBatteryDatabaseManager)
+ .deleteAction(AnomalyDatabaseHelper.ActionType.RESTRICTION, UID, HIGH_SDK_PACKAGE);
}
@Test
public void testIsForceAppStandbyEnabled_enabled_returnTrue() {
- when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID,
- PACKAGE_NAME)).thenReturn(AppOpsManager.MODE_IGNORED);
+ when(mAppOpsManager.checkOpNoThrow(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID, PACKAGE_NAME))
+ .thenReturn(AppOpsManager.MODE_IGNORED);
assertThat(mBatteryUtils.isForceAppStandbyEnabled(UID, PACKAGE_NAME)).isTrue();
}
@Test
public void testIsForceAppStandbyEnabled_disabled_returnFalse() {
- when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID,
- PACKAGE_NAME)).thenReturn(AppOpsManager.MODE_ALLOWED);
+ when(mAppOpsManager.checkOpNoThrow(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID, PACKAGE_NAME))
+ .thenReturn(AppOpsManager.MODE_ALLOWED);
assertThat(mBatteryUtils.isForceAppStandbyEnabled(UID, PACKAGE_NAME)).isFalse();
}
@@ -369,77 +398,85 @@
resolveInfo.activityInfo.packageName = HIGH_SDK_PACKAGE;
doReturn(resolveInfos).when(mPackageManager).queryIntentActivities(any(), anyInt());
- doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
+ doReturn(new String[] {HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
mHighApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
- assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
- mAnomalyInfo)).isTrue();
+ assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID, mAnomalyInfo))
+ .isTrue();
}
@Test
public void testShouldHideAnomaly_systemAppWithoutLauncher_returnTrue() {
doReturn(new ArrayList<>()).when(mPackageManager).queryIntentActivities(any(), anyInt());
- doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
+ doReturn(new String[] {HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
mHighApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
- assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
- mAnomalyInfo)).isTrue();
+ assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID, mAnomalyInfo))
+ .isTrue();
}
@Test
public void testShouldHideAnomaly_systemUid_returnTrue() {
final int systemUid = Process.ROOT_UID;
- doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(systemUid);
+ doReturn(new String[] {HIGH_SDK_PACKAGE})
+ .when(mPackageManager)
+ .getPackagesForUid(systemUid);
- assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, systemUid,
- mAnomalyInfo)).isTrue();
+ assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, systemUid, mAnomalyInfo))
+ .isTrue();
}
@Test
public void testShouldHideAnomaly_AppInDozeList_returnTrue() {
- doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
- doReturn(true).when(mPowerAllowlistBackend)
- .isAllowlisted(new String[]{HIGH_SDK_PACKAGE}, UID);
+ doReturn(new String[] {HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
+ doReturn(true)
+ .when(mPowerAllowlistBackend)
+ .isAllowlisted(new String[] {HIGH_SDK_PACKAGE}, UID);
- assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
- mAnomalyInfo)).isTrue();
+ assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID, mAnomalyInfo))
+ .isTrue();
}
@Test
public void testShouldHideAnomaly_normalApp_returnFalse() {
- doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
+ doReturn(new String[] {HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
- assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
- mAnomalyInfo)).isFalse();
+ assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID, mAnomalyInfo))
+ .isFalse();
}
@Test
public void testShouldHideAnomaly_excessivePriorOApp_returnFalse() {
- doReturn(new String[]{LOW_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
+ doReturn(new String[] {LOW_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
mAnomalyInfo = new AnomalyInfo(INFO_EXCESSIVE);
- assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
- mAnomalyInfo)).isFalse();
+ assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID, mAnomalyInfo))
+ .isFalse();
}
@Test
public void testShouldHideAnomaly_excessiveOApp_returnTrue() {
- doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
+ doReturn(new String[] {HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
mAnomalyInfo = new AnomalyInfo(INFO_EXCESSIVE);
- assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
- mAnomalyInfo)).isTrue();
+ assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID, mAnomalyInfo))
+ .isTrue();
}
@Test
public void clearForceAppStandby_appRestricted_clearAndReturnTrue() {
when(mBatteryUtils.getPackageUid(HIGH_SDK_PACKAGE)).thenReturn(UID);
- when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID,
- HIGH_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_IGNORED);
+ when(mAppOpsManager.checkOpNoThrow(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID, HIGH_SDK_PACKAGE))
+ .thenReturn(AppOpsManager.MODE_IGNORED);
assertThat(mBatteryUtils.clearForceAppStandby(HIGH_SDK_PACKAGE)).isTrue();
- verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID,
- HIGH_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
+ verify(mAppOpsManager)
+ .setMode(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+ UID,
+ HIGH_SDK_PACKAGE,
+ AppOpsManager.MODE_ALLOWED);
}
@Test
@@ -447,29 +484,38 @@
when(mBatteryUtils.getPackageUid(PACKAGE_NAME)).thenReturn(BatteryUtils.UID_NULL);
assertThat(mBatteryUtils.clearForceAppStandby(PACKAGE_NAME)).isFalse();
- verify(mAppOpsManager, never()).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID,
- PACKAGE_NAME, AppOpsManager.MODE_ALLOWED);
+ verify(mAppOpsManager, never())
+ .setMode(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+ UID,
+ PACKAGE_NAME,
+ AppOpsManager.MODE_ALLOWED);
}
@Test
public void clearForceAppStandby_appUnrestricted_returnFalse() {
when(mBatteryUtils.getPackageUid(PACKAGE_NAME)).thenReturn(UID);
- when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID,
- PACKAGE_NAME)).thenReturn(AppOpsManager.MODE_ALLOWED);
+ when(mAppOpsManager.checkOpNoThrow(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID, PACKAGE_NAME))
+ .thenReturn(AppOpsManager.MODE_ALLOWED);
assertThat(mBatteryUtils.clearForceAppStandby(PACKAGE_NAME)).isFalse();
- verify(mAppOpsManager, never()).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID,
- PACKAGE_NAME, AppOpsManager.MODE_ALLOWED);
+ verify(mAppOpsManager, never())
+ .setMode(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+ UID,
+ PACKAGE_NAME,
+ AppOpsManager.MODE_ALLOWED);
}
@Test
public void getBatteryInfo_providerNull_shouldNotCrash() {
when(mProvider.isEnhancedBatteryPredictionEnabled(mContext)).thenReturn(true);
when(mProvider.getEnhancedBatteryPrediction(mContext)).thenReturn(null);
- when(mContext.registerReceiver(nullable(BroadcastReceiver.class),
- any(IntentFilter.class))).thenReturn(new Intent());
+ when(mContext.registerReceiver(nullable(BroadcastReceiver.class), any(IntentFilter.class)))
+ .thenReturn(new Intent());
- //Should not crash
+ // Should not crash
assertThat(mBatteryUtils.getBatteryInfo(TAG)).isNotNull();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index 3097a70..46d2d01 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -51,10 +51,8 @@
private HighPowerDetail mFragment;
private Context mContext;
- @Mock
- private PowerAllowlistBackend mPowerAllowlistBackend;
- @Mock
- private BatteryUtils mBatteryUtils;
+ @Mock private PowerAllowlistBackend mPowerAllowlistBackend;
+ @Mock private BatteryUtils mBatteryUtils;
@Before
public void setUp() {
@@ -73,13 +71,19 @@
public void logSpecialPermissionChange() {
// Deny means app is allowlisted to opt out of power save restrictions
HighPowerDetail.logSpecialPermissionChange(true, "app", RuntimeEnvironment.application);
- verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
- eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_DENY), eq("app"));
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ any(Context.class),
+ eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_DENY),
+ eq("app"));
// Allow means app is NOT allowlisted to opt out of power save restrictions
HighPowerDetail.logSpecialPermissionChange(false, "app", RuntimeEnvironment.application);
- verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
- eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW), eq("app"));
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ any(Context.class),
+ eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW),
+ eq("app"));
}
@Test
@@ -87,15 +91,17 @@
mFragment.mIsEnabled = true;
when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE, TEST_UID)).thenReturn(false);
mFragment.onClick(null, DialogInterface.BUTTON_POSITIVE);
- verify(mBatteryUtils).setForceAppStandby(TEST_UID, TEST_PACKAGE,
- AppOpsManager.MODE_ALLOWED);
+ verify(mBatteryUtils)
+ .setForceAppStandby(TEST_UID, TEST_PACKAGE, AppOpsManager.MODE_ALLOWED);
}
@Test
public void getSummary_defaultActivePackage_returnUnavailable() {
doReturn(true).when(mPowerAllowlistBackend).isDefaultActiveApp(TEST_PACKAGE, TEST_UID);
- assertThat(HighPowerDetail.getSummary(mContext, mPowerAllowlistBackend, TEST_PACKAGE,
- TEST_UID)).isEqualTo(mContext.getString(R.string.high_power_system));
+ assertThat(
+ HighPowerDetail.getSummary(
+ mContext, mPowerAllowlistBackend, TEST_PACKAGE, TEST_UID))
+ .isEqualTo(mContext.getString(R.string.high_power_system));
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
index bfed149..6656471 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
@@ -76,8 +76,8 @@
public void testUpdateState_isSystemOrDefaultAppAndOptimizeStates_prefChecked() {
when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_OPTIMIZED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
mController.updateState(mPreference);
@@ -98,8 +98,8 @@
@Test
public void testUpdateState_isOptimizedStates_prefChecked() {
when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_OPTIMIZED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
index e6caf78..e50edec 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
@@ -72,11 +72,12 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {
- ShadowEntityHeaderController.class,
- ShadowActivityManager.class,
- com.android.settings.testutils.shadow.ShadowFragment.class,
-})
+@Config(
+ shadows = {
+ ShadowEntityHeaderController.class,
+ ShadowActivityManager.class,
+ com.android.settings.testutils.shadow.ShadowFragment.class,
+ })
public class PowerBackgroundUsageDetailTest {
private static final String APP_LABEL = "app label";
private static final String SUMMARY = "summary";
@@ -96,30 +97,19 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private FragmentActivity mActivity;
- @Mock
- private EntityHeaderController mEntityHeaderController;
- @Mock
- private BatteryOptimizeUtils mBatteryOptimizeUtils;
- @Mock
- private LayoutPreference mHeaderPreference;
- @Mock
- private ApplicationsState mState;
- @Mock
- private Bundle mBundle;
- @Mock
- private LoaderManager mLoaderManager;
- @Mock
- private ApplicationsState.AppEntry mAppEntry;
- @Mock
- private BatteryEntry mBatteryEntry;
- @Mock
- private BackupManager mBackupManager;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private AppOpsManager mAppOpsManager;
- @Mock
- private Switch mMockSwitch;
+
+ @Mock private EntityHeaderController mEntityHeaderController;
+ @Mock private BatteryOptimizeUtils mBatteryOptimizeUtils;
+ @Mock private LayoutPreference mHeaderPreference;
+ @Mock private ApplicationsState mState;
+ @Mock private Bundle mBundle;
+ @Mock private LoaderManager mLoaderManager;
+ @Mock private ApplicationsState.AppEntry mAppEntry;
+ @Mock private BatteryEntry mBatteryEntry;
+ @Mock private BackupManager mBackupManager;
+ @Mock private PackageManager mPackageManager;
+ @Mock private AppOpsManager mAppOpsManager;
+ @Mock private Switch mMockSwitch;
@Before
public void setUp() {
@@ -137,19 +127,26 @@
doReturn(mLoaderManager).when(mFragment).getLoaderManager();
ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setButtonActions(anyInt(), anyInt());
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setIcon(nullable(Drawable.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController).setIcon(nullable(
- ApplicationsState.AppEntry.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
+ .setIcon(nullable(ApplicationsState.AppEntry.class));
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setLabel(nullable(String.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setLabel(nullable(String.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setLabel(nullable(ApplicationsState.AppEntry.class));
- doReturn(mEntityHeaderController).when(mEntityHeaderController)
+ doReturn(mEntityHeaderController)
+ .when(mEntityHeaderController)
.setSummary(nullable(String.class));
when(mBatteryEntry.getUid()).thenReturn(UID);
@@ -169,13 +166,15 @@
final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
- Answer<Void> callable = invocation -> {
- mBundle = captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
- System.out.println("mBundle = " + mBundle);
- return null;
- };
- doAnswer(callable).when(mActivity).startActivityAsUser(captor.capture(),
- nullable(UserHandle.class));
+ Answer<Void> callable =
+ invocation -> {
+ mBundle = captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+ System.out.println("mBundle = " + mBundle);
+ return null;
+ };
+ doAnswer(callable)
+ .when(mActivity)
+ .startActivityAsUser(captor.capture(), nullable(UserHandle.class));
doAnswer(callable).when(mActivity).startActivity(captor.capture());
mFooterPreference = spy(new FooterPreference(mContext));
@@ -207,7 +206,9 @@
@Test
public void initHeader_HasAppEntry_BuildByAppEntry() {
- ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ ReflectionHelpers.setStaticField(
+ AppUtils.class,
+ "sInstantAppDataProvider",
new InstantAppDataProvider() {
@Override
public boolean isInstantApp(ApplicationInfo info) {
@@ -224,7 +225,9 @@
@Test
public void initHeader_HasAppEntry_InstantApp() {
- ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ ReflectionHelpers.setStaticField(
+ AppUtils.class,
+ "sInstantAppDataProvider",
new InstantAppDataProvider() {
@Override
public boolean isInstantApp(ApplicationInfo info) {
@@ -256,7 +259,7 @@
final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
mFragment.mOptimizationMode = optimizedMode;
- mFragment.onSwitchChanged(mMockSwitch, /*isChecked=*/ false);
+ mFragment.onSwitchChanged(mMockSwitch, /* isChecked= */ false);
verify(mOptimizePreference).setEnabled(false);
verify(mUnrestrictedPreference).setEnabled(false);
@@ -272,7 +275,7 @@
final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
mFragment.mOptimizationMode = restrictedMode;
- mFragment.onSwitchChanged(mMockSwitch, /*isChecked=*/ true);
+ mFragment.onSwitchChanged(mMockSwitch, /* isChecked= */ true);
verify(mOptimizePreference).setEnabled(true);
verify(mUnrestrictedPreference).setEnabled(true);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index a0b449a..0131330 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -46,8 +46,8 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
- @Mock
- private PackageManager mPackageManager;
+
+ @Mock private PackageManager mPackageManager;
private PowerUsageFeatureProviderImpl mPowerFeatureProvider;
@Before
@@ -117,16 +117,18 @@
@Test
public void testIsSmartBatterySupported_smartBatterySupported_returnTrue() {
- when(mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_smart_battery_available)).thenReturn(true);
+ when(mContext.getResources()
+ .getBoolean(com.android.internal.R.bool.config_smart_battery_available))
+ .thenReturn(true);
assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isTrue();
}
@Test
public void testIsSmartBatterySupported_smartBatteryNotSupported_returnFalse() {
- when(mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_smart_battery_available)).thenReturn(false);
+ when(mContext.getResources()
+ .getBoolean(com.android.internal.R.bool.config_smart_battery_available))
+ .thenReturn(false);
assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java
index 2449040..22d4ba3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java
@@ -46,12 +46,9 @@
private Context mContext;
private PowerUsageTimeController mPowerUsageTimeController;
- @Mock
- private PreferenceCategory mPowerUsageTimeCategory;
- @Mock
- private PowerUsageTimePreference mScreenTimePreference;
- @Mock
- private PowerUsageTimePreference mBackgroundTimePreference;
+ @Mock private PreferenceCategory mPowerUsageTimeCategory;
+ @Mock private PowerUsageTimePreference mScreenTimePreference;
+ @Mock private PowerUsageTimePreference mBackgroundTimePreference;
@Before
public void setUp() {
@@ -67,18 +64,24 @@
@Test
public void handleScreenTimeUpdated_noInfo_prefInvisible() {
- mPowerUsageTimeController.handleScreenTimeUpdated(/*slotTime=*/ null,
- /*screenOnTimeInMs=*/ 0, /*backgroundTimeInMs=*/ 0,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ /* slotTime= */ null,
+ /* screenOnTimeInMs= */ 0,
+ /* backgroundTimeInMs= */ 0,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyAllPreferencesVisible(false);
}
@Test
public void handleScreenTimeUpdated_onlySlotTime_prefInvisible() {
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- /*screenOnTimeInMs=*/ 0, /*backgroundTimeInMs=*/ 0,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ /* screenOnTimeInMs= */ 0,
+ /* backgroundTimeInMs= */ 0,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyAllPreferencesVisible(false);
}
@@ -88,9 +91,12 @@
final long screenOnTimeAMinute = 60000;
final long backgroundTimeZero = 0;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeAMinute, backgroundTimeZero,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeAMinute,
+ backgroundTimeZero,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyOnePreferenceInvisible(mBackgroundTimePreference);
verify(mScreenTimePreference).setTimeTitle("Screen time");
@@ -103,9 +109,12 @@
final long screenOnTimeZero = 0;
final long backgroundTimeTwoMinutes = 120000;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeZero, backgroundTimeTwoMinutes,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeZero,
+ backgroundTimeTwoMinutes,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyOnePreferenceInvisible(mScreenTimePreference);
verify(mBackgroundTimePreference).setTimeTitle("Background time");
@@ -118,9 +127,12 @@
final long screenOnTimeAMinute = 60000;
final long backgroundTimeTwoMinutes = 120000;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeAMinute, backgroundTimeTwoMinutes,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeAMinute,
+ backgroundTimeTwoMinutes,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeTitle("Screen time");
@@ -137,9 +149,12 @@
final long backgroundTimeTwoMinutes = 120000;
final long screenOnTimeAMinute = 60000;
- mPowerUsageTimeController.handleScreenTimeUpdated(/*slotTime=*/ null,
- screenOnTimeAMinute, backgroundTimeTwoMinutes,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ /* slotTime= */ null,
+ screenOnTimeAMinute,
+ backgroundTimeTwoMinutes,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyAllPreferencesVisible(true);
verify(mPowerUsageTimeCategory).setTitle("App usage since last full charge");
@@ -150,9 +165,12 @@
final long screenOnTimeAMinute = 60000;
final long backgroundTimeLessThanAMinute = 59999;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeAMinute, backgroundTimeLessThanAMinute,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeAMinute,
+ backgroundTimeLessThanAMinute,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeSummary("1 min");
@@ -164,9 +182,12 @@
final long screenOnTimeLessThanAMinute = 59999;
final long backgroundTimeTwoMinutes = 120000;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeLessThanAMinute, backgroundTimeTwoMinutes,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeLessThanAMinute,
+ backgroundTimeTwoMinutes,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeSummary("Less than a min");
@@ -178,9 +199,12 @@
final long screenOnTimeLessThanAMinute = 59999;
final long backgroundTimeLessThanAMinute = 59999;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeLessThanAMinute, backgroundTimeLessThanAMinute,
- /*anomalyHintPrefKey=*/ null, /*anomalyHintText=*/ null);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeLessThanAMinute,
+ backgroundTimeLessThanAMinute,
+ /* anomalyHintPrefKey= */ null,
+ /* anomalyHintText= */ null);
verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeSummary("Less than a min");
@@ -192,9 +216,12 @@
final long screenOnTimeAMinute = 60000;
final long backgroundTimeTwoMinutes = 120000;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeAMinute, backgroundTimeTwoMinutes,
- KEY_SCREEN_ON_TIME_PREF, TEST_ANOMALY_HINT_TEXT);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeAMinute,
+ backgroundTimeTwoMinutes,
+ KEY_SCREEN_ON_TIME_PREF,
+ TEST_ANOMALY_HINT_TEXT);
verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setAnomalyHint(TEST_ANOMALY_HINT_TEXT);
@@ -206,9 +233,12 @@
final long screenOnTimeAMinute = 60000;
final long backgroundTimeTwoMinutes = 120000;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeAMinute, backgroundTimeTwoMinutes,
- KEY_BACKGROUND_TIME_PREF, TEST_ANOMALY_HINT_TEXT);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeAMinute,
+ backgroundTimeTwoMinutes,
+ KEY_BACKGROUND_TIME_PREF,
+ TEST_ANOMALY_HINT_TEXT);
verifyAllPreferencesVisible(true);
verify(mScreenTimePreference, never()).setAnomalyHint(anyString());
@@ -220,9 +250,12 @@
final long screenOnTimeZero = 0;
final long backgroundTimeTwoMinutes = 120000;
- mPowerUsageTimeController.handleScreenTimeUpdated(SLOT_TIME,
- screenOnTimeZero, backgroundTimeTwoMinutes,
- KEY_SCREEN_ON_TIME_PREF, TEST_ANOMALY_HINT_TEXT);
+ mPowerUsageTimeController.handleScreenTimeUpdated(
+ SLOT_TIME,
+ screenOnTimeZero,
+ backgroundTimeTwoMinutes,
+ KEY_SCREEN_ON_TIME_PREF,
+ TEST_ANOMALY_HINT_TEXT);
verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeSummary("Less than a min");
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
index 0321483..64efb6a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -33,7 +33,6 @@
import android.content.Intent;
import android.os.UserHandle;
import android.os.UserManager;
-import android.util.Pair;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
@@ -65,12 +64,9 @@
private static final String RESTRICTED_PACKAGE_NAME = "com.android.restricted.package";
private static final int OTHER_USER_UID = UserHandle.PER_USER_RANGE + RESTRICTED_UID;
- @Mock
- private AppOpsManager mAppOpsManager;
- @Mock
- private InstrumentedPreferenceFragment mFragment;
- @Mock
- private UserManager mUserManager;
+ @Mock private AppOpsManager mAppOpsManager;
+ @Mock private InstrumentedPreferenceFragment mFragment;
+ @Mock private UserManager mUserManager;
private AppOpsManager.PackageOps mRestrictedPackageOps;
private AppOpsManager.PackageOps mAllowedPackageOps;
@@ -84,19 +80,25 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
final List<AppOpsManager.OpEntry> allowOps = new ArrayList<>();
- allowOps.add(new AppOpsManager.OpEntry(
- AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_ALLOWED,
- Collections.emptyMap()));
+ allowOps.add(
+ new AppOpsManager.OpEntry(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+ AppOpsManager.MODE_ALLOWED,
+ Collections.emptyMap()));
final List<AppOpsManager.OpEntry> restrictedOps = new ArrayList<>();
- restrictedOps.add(new AppOpsManager.OpEntry(
- AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_IGNORED,
- Collections.emptyMap()));
- mAllowedPackageOps = new AppOpsManager.PackageOps(
- ALLOWED_PACKAGE_NAME, ALLOWED_UID, allowOps);
- mRestrictedPackageOps = new AppOpsManager.PackageOps(
- RESTRICTED_PACKAGE_NAME, RESTRICTED_UID, restrictedOps);
- mOtherUserPackageOps = new AppOpsManager.PackageOps(
- RESTRICTED_PACKAGE_NAME, OTHER_USER_UID, restrictedOps);
+ restrictedOps.add(
+ new AppOpsManager.OpEntry(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+ AppOpsManager.MODE_IGNORED,
+ Collections.emptyMap()));
+ mAllowedPackageOps =
+ new AppOpsManager.PackageOps(ALLOWED_PACKAGE_NAME, ALLOWED_UID, allowOps);
+ mRestrictedPackageOps =
+ new AppOpsManager.PackageOps(
+ RESTRICTED_PACKAGE_NAME, RESTRICTED_UID, restrictedOps);
+ mOtherUserPackageOps =
+ new AppOpsManager.PackageOps(
+ RESTRICTED_PACKAGE_NAME, OTHER_USER_UID, restrictedOps);
mContext = spy(ApplicationProvider.getApplicationContext());
doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
@@ -109,8 +111,8 @@
mPreferenceScreen = spy(new PreferenceScreen(mContext, null));
when(mPreferenceScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
when(mPreferenceScreen.getContext()).thenReturn(mContext);
- when(mPreferenceScreen.findPreference(
- RestrictAppPreferenceController.KEY_RESTRICT_APP)).thenReturn(mPreference);
+ when(mPreferenceScreen.findPreference(RestrictAppPreferenceController.KEY_RESTRICT_APP))
+ .thenReturn(mPreference);
final List<UserHandle> userHandles = new ArrayList<>();
userHandles.add(new UserHandle(0));
@@ -122,8 +124,8 @@
mPackageOpsList.add(mRestrictedPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
- final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
- mFragment);
+ final RestrictAppPreferenceController controller =
+ new RestrictAppPreferenceController(mFragment);
controller.displayPreference(mPreferenceScreen);
controller.updateState(mPreference);
@@ -138,8 +140,8 @@
mPackageOpsList.add(mOtherUserPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
- final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
- mFragment);
+ final RestrictAppPreferenceController controller =
+ new RestrictAppPreferenceController(mFragment);
controller.displayPreference(mPreferenceScreen);
controller.updateState(mPreference);
@@ -154,17 +156,18 @@
mPackageOpsList.add(mOtherUserPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
- final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
- mFragment);
+ final RestrictAppPreferenceController controller =
+ new RestrictAppPreferenceController(mFragment);
controller.displayPreference(mPreferenceScreen);
controller.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 1 app");
- assertThat(controller.mAppInfos).containsExactly(
- new AppInfo.Builder()
- .setUid(RESTRICTED_UID)
- .setPackageName(RESTRICTED_PACKAGE_NAME)
- .build());
+ assertThat(controller.mAppInfos)
+ .containsExactly(
+ new AppInfo.Builder()
+ .setUid(RESTRICTED_UID)
+ .setPackageName(RESTRICTED_PACKAGE_NAME)
+ .build());
}
@Test
@@ -172,8 +175,8 @@
mPackageOpsList.add(mAllowedPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
- final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
- mFragment);
+ final RestrictAppPreferenceController controller =
+ new RestrictAppPreferenceController(mFragment);
controller.displayPreference(mPreferenceScreen);
controller.updateState(mPreference);
@@ -185,8 +188,8 @@
public void handlePreferenceTreeClick_startFragment() {
final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
- final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
- mFragment);
+ final RestrictAppPreferenceController controller =
+ new RestrictAppPreferenceController(mFragment);
controller.handlePreferenceTreeClick(mPreference);
verify(mContext).startActivity(intent.capture());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
index 2991e78..54b8808 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
@@ -72,17 +72,11 @@
private static final int UID = UserHandle.getUid(USER_ID, 234);
private static final String APP_NAME = "app";
-
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private ApplicationInfo mApplicationInfo;
- @Mock
- private IconDrawableFactory mIconDrawableFactory;
- @Mock
- private InstrumentedPreferenceFragment mFragment;
- @Mock
- private BatteryDatabaseManager mBatteryDatabaseManager;
+ @Mock private PackageManager mPackageManager;
+ @Mock private ApplicationInfo mApplicationInfo;
+ @Mock private IconDrawableFactory mIconDrawableFactory;
+ @Mock private InstrumentedPreferenceFragment mFragment;
+ @Mock private BatteryDatabaseManager mBatteryDatabaseManager;
private PreferenceManager mPreferenceManager;
private RestrictedAppDetails mRestrictedAppDetails;
private Context mContext;
@@ -96,10 +90,7 @@
mContext = spy(RuntimeEnvironment.application);
mRestrictedAppDetails = spy(new RestrictedAppDetails());
- mAppInfo = new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME)
- .setUid(UID)
- .build();
+ mAppInfo = new AppInfo.Builder().setPackageName(PACKAGE_NAME).setUid(UID).build();
mPreferenceManager = new PreferenceManager(mContext);
@@ -113,8 +104,9 @@
mRestrictedAppDetails.mRestrictedAppListGroup = spy(new PreferenceCategory(mContext));
mRestrictedAppDetails.mBatteryUtils = spy(new BatteryUtils(mContext));
mRestrictedAppDetails.mBatteryDatabaseManager = mBatteryDatabaseManager;
- doReturn(mPreferenceManager).when(
- mRestrictedAppDetails.mRestrictedAppListGroup).getPreferenceManager();
+ doReturn(mPreferenceManager)
+ .when(mRestrictedAppDetails.mRestrictedAppListGroup)
+ .getPreferenceManager();
mCheckBoxPreference = new CheckBoxPreference(mContext);
mCheckBoxPreference.setKey(mRestrictedAppDetails.getKeyFromAppInfo(mAppInfo));
@@ -122,14 +114,17 @@
@Test
public void refreshUi_displayPreference() throws Exception {
- doReturn(mApplicationInfo).when(mPackageManager)
+ doReturn(mApplicationInfo)
+ .when(mPackageManager)
.getApplicationInfoAsUser(PACKAGE_NAME, 0, USER_ID);
doReturn(APP_NAME).when(mPackageManager).getApplicationLabel(mApplicationInfo);
- doReturn(true).when(mRestrictedAppDetails.mBatteryUtils).isForceAppStandbyEnabled(UID,
- PACKAGE_NAME);
+ doReturn(true)
+ .when(mRestrictedAppDetails.mBatteryUtils)
+ .isForceAppStandbyEnabled(UID, PACKAGE_NAME);
final SparseLongArray timestampArray = new SparseLongArray();
timestampArray.put(UID, System.currentTimeMillis() - TimeUnit.HOURS.toMillis(5));
- doReturn(timestampArray).when(mBatteryDatabaseManager)
+ doReturn(timestampArray)
+ .when(mBatteryDatabaseManager)
.queryActionTime(AnomalyDatabaseHelper.ActionType.RESTRICTION);
mRestrictedAppDetails.refreshUi();
@@ -145,30 +140,32 @@
@Test
public void startRestrictedAppDetails_startWithCorrectData() {
final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
- doAnswer(invocation -> {
- // Get the intent in which it has the app info bundle
- mIntent = captor.getValue();
- return true;
- }).when(mContext).startActivity(captor.capture());
+ doAnswer(
+ invocation -> {
+ // Get the intent in which it has the app info bundle
+ mIntent = captor.getValue();
+ return true;
+ })
+ .when(mContext)
+ .startActivity(captor.capture());
- RestrictedAppDetails.startRestrictedAppDetails(mFragment,
- mRestrictedAppDetails.mAppInfos);
+ RestrictedAppDetails.startRestrictedAppDetails(mFragment, mRestrictedAppDetails.mAppInfos);
- final Bundle bundle = mIntent.getBundleExtra(
- SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+ final Bundle bundle =
+ mIntent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
// Verify the bundle has the correct info
- final List<AppInfo> appInfos = bundle.getParcelableArrayList(
- RestrictedAppDetails.EXTRA_APP_INFO_LIST);
+ final List<AppInfo> appInfos =
+ bundle.getParcelableArrayList(RestrictedAppDetails.EXTRA_APP_INFO_LIST);
assertThat(appInfos).containsExactly(mAppInfo);
}
@Test
public void createDialogFragment_toRestrict_createRestrictDialog() {
- final BatteryTipDialogFragment dialogFragment = mRestrictedAppDetails.createDialogFragment(
- mAppInfo, true);
+ final BatteryTipDialogFragment dialogFragment =
+ mRestrictedAppDetails.createDialogFragment(mAppInfo, true);
- FragmentController.setupFragment(dialogFragment, FragmentActivity.class,
- 0 /* containerViewId */, null /* bundle */);
+ FragmentController.setupFragment(
+ dialogFragment, FragmentActivity.class, 0 /* containerViewId */, null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
@@ -177,11 +174,11 @@
@Test
public void createDialogFragment_toUnrestrict_createUnrestrictDialog() {
- final BatteryTipDialogFragment dialogFragment = mRestrictedAppDetails.createDialogFragment(
- mAppInfo, false);
+ final BatteryTipDialogFragment dialogFragment =
+ mRestrictedAppDetails.createDialogFragment(mAppInfo, false);
- FragmentController.setupFragment(dialogFragment, FragmentActivity.class,
- 0 /* containerViewId */, null /* bundle */);
+ FragmentController.setupFragment(
+ dialogFragment, FragmentActivity.class, 0 /* containerViewId */, null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
@@ -190,8 +187,8 @@
@Test
public void onBatteryTipHandled_restrict_setChecked() {
- final RestrictAppTip restrictAppTip = new RestrictAppTip(BatteryTip.StateType.NEW,
- mAppInfo);
+ final RestrictAppTip restrictAppTip =
+ new RestrictAppTip(BatteryTip.StateType.NEW, mAppInfo);
mRestrictedAppDetails.mRestrictedAppListGroup.addPreference(mCheckBoxPreference);
mRestrictedAppDetails.onBatteryTipHandled(restrictAppTip);
@@ -201,8 +198,8 @@
@Test
public void onBatteryTipHandled_unrestrict_setUnchecked() {
- final UnrestrictAppTip unrestrictAppTip = new UnrestrictAppTip(BatteryTip.StateType.NEW,
- mAppInfo);
+ final UnrestrictAppTip unrestrictAppTip =
+ new UnrestrictAppTip(BatteryTip.StateType.NEW, mAppInfo);
mRestrictedAppDetails.mRestrictedAppListGroup.addPreference(mCheckBoxPreference);
mRestrictedAppDetails.onBatteryTipHandled(unrestrictAppTip);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
index 6691bd5..b03602d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
@@ -54,7 +54,8 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- doReturn(mock(DevicePolicyManager.class)).when(mContext)
+ doReturn(mock(DevicePolicyManager.class))
+ .when(mContext)
.getSystemService(Context.DEVICE_POLICY_SERVICE);
mFeatureFactory = FakeFeatureFactory.setupForTest();
@@ -99,26 +100,26 @@
public void testGetAvailabilityStatus_smartBatterySupported_returnAvailable() {
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void testGetAvailabilityStatus_smartBatteryUnSupported_returnDisabled() {
doReturn(false).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
private void putSmartBatteryValue(int value) {
- Settings.Global.putInt(mContentResolver,
- Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, value);
+ Settings.Global.putInt(
+ mContentResolver, Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, value);
}
private int getSmartBatteryValue() {
- return Settings.Global.getInt(mContentResolver,
- Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, ON);
+ return Settings.Global.getInt(
+ mContentResolver, Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, ON);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
index 7a7a384..3435987 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
@@ -50,12 +50,9 @@
private TopLevelBatteryPreferenceController mController;
private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
- @Mock
- private UsbPort mUsbPort;
- @Mock
- private UsbManager mUsbManager;
- @Mock
- private UsbPortStatus mUsbPortStatus;
+ @Mock private UsbPort mUsbPort;
+ @Mock private UsbManager mUsbManager;
+ @Mock private UsbPortStatus mUsbPortStatus;
@Before
public void setUp() {
@@ -125,8 +122,7 @@
info.discharging = false;
info.chargeLabel = "5% - charging";
- assertThat(mController.getDashboardLabel(mContext, info, true))
- .isEqualTo(info.chargeLabel);
+ assertThat(mController.getDashboardLabel(mContext, info, true)).isEqualTo(info.chargeLabel);
}
@Test
@@ -136,8 +132,9 @@
BatteryInfo info = new BatteryInfo();
assertThat(mController.getDashboardLabel(mContext, info, true))
- .isEqualTo(mContext.getString(
- com.android.settingslib.R.string.battery_info_status_not_charging));
+ .isEqualTo(
+ mContext.getString(
+ com.android.settingslib.R.string.battery_info_status_not_charging));
}
@Test
@@ -147,8 +144,7 @@
info.batteryStatus = BatteryManager.BATTERY_STATUS_NOT_CHARGING;
info.statusLabel = "expected returned label";
- assertThat(mController.getDashboardLabel(mContext, info, true))
- .isEqualTo(info.statusLabel);
+ assertThat(mController.getDashboardLabel(mContext, info, true)).isEqualTo(info.statusLabel);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
index 5489196..0c6f7da 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
@@ -88,8 +88,8 @@
public void testUpdateState_isSystemOrDefaultAppAndUnrestrictedStates_prefChecked() {
when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_UNRESTRICTED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
mController.updateState(mPreference);
@@ -100,8 +100,8 @@
public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {
when(mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()).thenReturn(false);
when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_OPTIMIZED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
mController.updateState(mPreference);
@@ -112,8 +112,8 @@
@Test
public void testUpdateState_isUnrestrictedStates_prefChecked() {
when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_UNRESTRICTED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
mController.updateState(mPreference);
@@ -124,8 +124,8 @@
@Test
public void testUpdateState_prefUnchecked() {
when(mBatteryOptimizeUtils.isOptimizeModeMutable()).thenReturn(true);
- when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(
- BatteryOptimizeUtils.MODE_OPTIMIZED);
+ when(mBatteryOptimizeUtils.getAppOptimizationMode())
+ .thenReturn(BatteryOptimizeUtils.MODE_OPTIMIZED);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
index 7398e5c..cdcb12f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
@@ -47,10 +47,8 @@
private Context mContext;
private MainSwitchPreference mPreference;
- @Mock
- private PowerManager mPowerManager;
- @Mock
- private PreferenceScreen mPreferenceScreen;
+ @Mock private PowerManager mPowerManager;
+ @Mock private PreferenceScreen mPreferenceScreen;
@Before
public void setUp() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java
index 2bb8f28..cdde8f9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java
@@ -59,10 +59,12 @@
@Test
public void testPreference_lowPowerLevelZero_percentageMode_summaryNoSchedule() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
- Settings.Global.putInt(mContext.getContentResolver(),
- Global.AUTOMATIC_POWER_SAVE_MODE, PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
+ Settings.Global.putInt(
+ mContext.getContentResolver(), Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ Global.AUTOMATIC_POWER_SAVE_MODE,
+ PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
mController.updateState(mPreference);
@@ -71,10 +73,14 @@
@Test
public void testPreference_lowPowerLevelNonZero_percentageMode_summaryPercentage() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, TRIGGER_LEVEL);
- Settings.Global.putInt(mContext.getContentResolver(),
- Global.AUTOMATIC_POWER_SAVE_MODE, PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL,
+ TRIGGER_LEVEL);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ Global.AUTOMATIC_POWER_SAVE_MODE,
+ PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarControllerTest.java
index 9de3ada..f224c8a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarControllerTest.java
@@ -34,8 +34,7 @@
private Context mContext;
private ContentResolver mResolver;
private BatterySaverScheduleSeekBarController mController;
- @Mock
- private PreferenceScreen mScreen;
+ @Mock private PreferenceScreen mScreen;
@Before
public void setUp() {
@@ -83,7 +82,9 @@
@Test
public void updateSeekBar_routineMode_hasCorrectProperties() {
- Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+ Settings.Global.putInt(
+ mResolver,
+ Global.AUTOMATIC_POWER_SAVE_MODE,
PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC);
mController.updateSeekBar();
@@ -95,7 +96,9 @@
@Test
public void updateSeekBar_percentageMode_hasCorrectProperties() {
final CharSequence expectedTitle = "10%";
- Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+ Settings.Global.putInt(
+ mResolver,
+ Global.AUTOMATIC_POWER_SAVE_MODE,
PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
setTriggerLevel(10);
@@ -108,7 +111,9 @@
@Test
public void updateSeekBar_noneMode_hasCorrectProperties() {
- Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+ Settings.Global.putInt(
+ mResolver,
+ Global.AUTOMATIC_POWER_SAVE_MODE,
PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
setTriggerLevel(0);
@@ -120,7 +125,9 @@
@Test
public void addToScreen_addsToEnd() {
- Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+ Settings.Global.putInt(
+ mResolver,
+ Global.AUTOMATIC_POWER_SAVE_MODE,
PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
setTriggerLevel(15);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettingsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettingsTest.java
index dc9cac4..2138e64 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettingsTest.java
@@ -1,6 +1,7 @@
package com.android.settings.fuelgauge.batterysaver;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -90,18 +91,25 @@
}
private void setSchedule(int scheduleType, int schedulePercentage) {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.AUTOMATIC_POWER_SAVE_MODE, scheduleType);
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, schedulePercentage);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ Settings.Global.AUTOMATIC_POWER_SAVE_MODE,
+ scheduleType);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL,
+ schedulePercentage);
}
private void verifySchedule(String scheduleTypeKey, int schedulePercentage) {
waitAWhile();
- verify(mMetricsFeatureProvider).action(SettingsEnums.FUELGAUGE_BATTERY_SAVER,
- SettingsEnums.FIELD_BATTERY_SAVER_SCHEDULE_TYPE,
- SettingsEnums.FIELD_BATTERY_SAVER_PERCENTAGE_VALUE,
- scheduleTypeKey, schedulePercentage);
+ verify(mMetricsFeatureProvider)
+ .action(
+ SettingsEnums.FUELGAUGE_BATTERY_SAVER,
+ SettingsEnums.FIELD_BATTERY_SAVER_SCHEDULE_TYPE,
+ SettingsEnums.FIELD_BATTERY_SAVER_PERCENTAGE_VALUE,
+ scheduleTypeKey,
+ schedulePercentage);
}
private void waitAWhile() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettingsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettingsTest.java
index c858902..84af4e1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettingsTest.java
@@ -34,13 +34,13 @@
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {
- com.android.settings.testutils.shadow.ShadowFragment.class,
-})
+@Config(
+ shadows = {
+ com.android.settings.testutils.shadow.ShadowFragment.class,
+ })
public class BatterySaverSettingsTest {
BatterySaverSettings mFragment;
- @Mock
- PreferenceScreen mScreen;
+ @Mock PreferenceScreen mScreen;
@Before
public void setUp() {
@@ -50,7 +50,6 @@
doReturn(mScreen).when(mFragment).getPreferenceScreen();
}
-
@Test
public void setupFooter_linkAddedWhenAppropriate() {
doReturn("").when(mFragment).getText(anyInt());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
index 4c276ba..22c59b0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
@@ -63,16 +63,15 @@
private Context mContext;
private JobScheduler mJobScheduler;
- @Mock
- private JobParameters mParams;
+ @Mock private JobParameters mParams;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mJobScheduler = spy(new JobSchedulerImpl(mContext,
- IJobScheduler.Stub.asInterface(new Binder())));
+ mJobScheduler =
+ spy(new JobSchedulerImpl(mContext, IJobScheduler.Stub.asInterface(new Binder())));
when(mContext.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
}
@@ -108,25 +107,31 @@
@Ignore
public void onStartJob_cleanUpDataBefore30days() {
final BatteryDatabaseManager databaseManager = BatteryDatabaseManager.getInstance(mContext);
- final AnomalyCleanupJobService service = spy(Robolectric.setupService(
- AnomalyCleanupJobService.class));
+ final AnomalyCleanupJobService service =
+ spy(Robolectric.setupService(AnomalyCleanupJobService.class));
doNothing().when(service).jobFinished(any(), anyBoolean());
// Insert two records, one is current and the other one is 31 days before
- databaseManager.insertAnomaly(UID, PACKAGE_NAME, ANOMALY_TYPE,
- AnomalyDatabaseHelper.State.NEW, TIMESTAMP_NOW);
- databaseManager.insertAnomaly(UID, PACKAGE_NAME_OLD, ANOMALY_TYPE,
- AnomalyDatabaseHelper.State.NEW, TIMESTAMP_31_DAYS_BEFORE);
+ databaseManager.insertAnomaly(
+ UID, PACKAGE_NAME, ANOMALY_TYPE, AnomalyDatabaseHelper.State.NEW, TIMESTAMP_NOW);
+ databaseManager.insertAnomaly(
+ UID,
+ PACKAGE_NAME_OLD,
+ ANOMALY_TYPE,
+ AnomalyDatabaseHelper.State.NEW,
+ TIMESTAMP_31_DAYS_BEFORE);
service.onStartJob(mParams);
// In database, it only contains the current record
- final List<AppInfo> appInfos = databaseManager.queryAllAnomalies(0,
- AnomalyDatabaseHelper.State.NEW);
- assertThat(appInfos).containsExactly(new AppInfo.Builder()
- .setUid(UID)
- .setPackageName(PACKAGE_NAME)
- .addAnomalyType(ANOMALY_TYPE)
- .build());
+ final List<AppInfo> appInfos =
+ databaseManager.queryAllAnomalies(0, AnomalyDatabaseHelper.State.NEW);
+ assertThat(appInfos)
+ .containsExactly(
+ new AppInfo.Builder()
+ .setUid(UID)
+ .setPackageName(PACKAGE_NAME)
+ .addAnomalyType(ANOMALY_TYPE)
+ .build());
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java
index 3807be6..345b8a1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java
@@ -57,8 +57,7 @@
private static final int ANOMALY_CONFIG_VERSION = 1;
private static final String ANOMALY_CONFIG = "X64s";
- @Mock
- private StatsManager mStatsManager;
+ @Mock private StatsManager mStatsManager;
private Context mContext;
private JobScheduler mJobScheduler;
@@ -69,14 +68,16 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mJobScheduler = spy(new JobSchedulerImpl(mContext,
- IJobScheduler.Stub.asInterface(new Binder())));
+ mJobScheduler =
+ spy(new JobSchedulerImpl(mContext, IJobScheduler.Stub.asInterface(new Binder())));
when(mContext.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
mJobService = spy(new AnomalyConfigJobService());
- doReturn(application.getSharedPreferences(AnomalyConfigJobService.PREF_DB,
- Context.MODE_PRIVATE)).when(mJobService).getSharedPreferences(anyString(),
- anyInt());
+ doReturn(
+ application.getSharedPreferences(
+ AnomalyConfigJobService.PREF_DB, Context.MODE_PRIVATE))
+ .when(mJobService)
+ .getSharedPreferences(anyString(), anyInt());
doReturn(application.getContentResolver()).when(mJobService).getContentResolver();
}
@@ -105,11 +106,13 @@
@Test
public void checkAnomalyConfig_newConfigExist_removeOldConfig()
- throws StatsManager.StatsUnavailableException{
- Settings.Global.putInt(application.getContentResolver(),
- Settings.Global.ANOMALY_CONFIG_VERSION, ANOMALY_CONFIG_VERSION);
- Settings.Global.putString(application.getContentResolver(), Settings.Global.ANOMALY_CONFIG,
- ANOMALY_CONFIG);
+ throws StatsManager.StatsUnavailableException {
+ Settings.Global.putInt(
+ application.getContentResolver(),
+ Settings.Global.ANOMALY_CONFIG_VERSION,
+ ANOMALY_CONFIG_VERSION);
+ Settings.Global.putString(
+ application.getContentResolver(), Settings.Global.ANOMALY_CONFIG, ANOMALY_CONFIG);
mJobService.checkAnomalyConfig(mStatsManager);
@@ -118,11 +121,13 @@
@Test
public void checkAnomalyConfig_newConfigExist_uploadNewConfig()
- throws StatsManager.StatsUnavailableException{
- Settings.Global.putInt(application.getContentResolver(),
- Settings.Global.ANOMALY_CONFIG_VERSION, ANOMALY_CONFIG_VERSION);
- Settings.Global.putString(application.getContentResolver(), Settings.Global.ANOMALY_CONFIG,
- ANOMALY_CONFIG);
+ throws StatsManager.StatsUnavailableException {
+ Settings.Global.putInt(
+ application.getContentResolver(),
+ Settings.Global.ANOMALY_CONFIG_VERSION,
+ ANOMALY_CONFIG_VERSION);
+ Settings.Global.putString(
+ application.getContentResolver(), Settings.Global.ANOMALY_CONFIG, ANOMALY_CONFIG);
mJobService.checkAnomalyConfig(mStatsManager);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index 1c37d31..a67e5d3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -86,20 +86,13 @@
"anomaly_type=6,auto_restriction=false";
private static final int ANOMALY_TYPE = 6;
private static final long VERSION_CODE = 15;
- @Mock
- private UserManager mUserManager;
- @Mock
- private BatteryDatabaseManager mBatteryDatabaseManager;
- @Mock
- private BatteryUtils mBatteryUtils;
- @Mock
- private PowerAllowlistBackend mPowerAllowlistBackend;
- @Mock
- private StatsDimensionsValue mStatsDimensionsValue;
- @Mock
- private JobParameters mJobParameters;
- @Mock
- private JobWorkItem mJobWorkItem;
+ @Mock private UserManager mUserManager;
+ @Mock private BatteryDatabaseManager mBatteryDatabaseManager;
+ @Mock private BatteryUtils mBatteryUtils;
+ @Mock private PowerAllowlistBackend mPowerAllowlistBackend;
+ @Mock private StatsDimensionsValue mStatsDimensionsValue;
+ @Mock private JobParameters mJobParameters;
+ @Mock private JobWorkItem mJobWorkItem;
private BatteryTipPolicy mPolicy;
private Bundle mBundle;
@@ -113,8 +106,8 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mJobScheduler = spy(new JobSchedulerImpl(mContext,
- IJobScheduler.Stub.asInterface(new Binder())));
+ mJobScheduler =
+ spy(new JobSchedulerImpl(mContext, IJobScheduler.Stub.asInterface(new Binder())));
when(mContext.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
mPolicy = new BatteryTipPolicy(mContext);
@@ -146,17 +139,24 @@
@Test
public void saveAnomalyToDatabase_systemAllowlisted_doNotSave() {
doReturn(UID).when(mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
- doReturn(true).when(mPowerAllowlistBackend)
+ doReturn(true)
+ .when(mPowerAllowlistBackend)
.isAllowlisted(any(String[].class), any(Integer.class));
- mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
- mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
- mPowerAllowlistBackend, mContext.getContentResolver(),
+ mAnomalyDetectionJobService.saveAnomalyToDatabase(
+ mContext,
+ mUserManager,
+ mBatteryDatabaseManager,
+ mBatteryUtils,
+ mPolicy,
+ mPowerAllowlistBackend,
+ mContext.getContentResolver(),
mFeatureFactory.powerUsageFeatureProvider,
- mFeatureFactory.metricsFeatureProvider, mBundle);
+ mFeatureFactory.metricsFeatureProvider,
+ mBundle);
- verify(mBatteryDatabaseManager, never()).insertAnomaly(anyInt(), anyString(), anyInt(),
- anyInt(), anyLong());
+ verify(mBatteryDatabaseManager, never())
+ .insertAnomaly(anyInt(), anyString(), anyInt(), anyInt(), anyLong());
}
@Test
@@ -166,53 +166,76 @@
mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
- doReturn(Process.FIRST_APPLICATION_UID).when(
- mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
+ doReturn(Process.FIRST_APPLICATION_UID)
+ .when(mAnomalyDetectionJobService)
+ .extractUidFromStatsDimensionsValue(any());
doReturn(true).when(mBatteryUtils).shouldHideAnomaly(any(), anyInt(), any());
- mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
- mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
- mPowerAllowlistBackend, mContext.getContentResolver(),
+ mAnomalyDetectionJobService.saveAnomalyToDatabase(
+ mContext,
+ mUserManager,
+ mBatteryDatabaseManager,
+ mBatteryUtils,
+ mPolicy,
+ mPowerAllowlistBackend,
+ mContext.getContentResolver(),
mFeatureFactory.powerUsageFeatureProvider,
- mFeatureFactory.metricsFeatureProvider, mBundle);
+ mFeatureFactory.metricsFeatureProvider,
+ mBundle);
- verify(mBatteryDatabaseManager, never()).insertAnomaly(anyInt(), anyString(), anyInt(),
- anyInt(), anyLong());
- verify(mFeatureFactory.metricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_ANOMALY_IGNORED,
- SettingsEnums.PAGE_UNKNOWN,
- SYSTEM_PACKAGE + "/" + VERSION_CODE,
- ANOMALY_TYPE);
+ verify(mBatteryDatabaseManager, never())
+ .insertAnomaly(anyInt(), anyString(), anyInt(), anyInt(), anyLong());
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_ANOMALY_IGNORED,
+ SettingsEnums.PAGE_UNKNOWN,
+ SYSTEM_PACKAGE + "/" + VERSION_CODE,
+ ANOMALY_TYPE);
}
@Test
public void saveAnomalyToDatabase_systemUid_doNotSave() {
- doReturn(Process.SYSTEM_UID).when(
- mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
+ doReturn(Process.SYSTEM_UID)
+ .when(mAnomalyDetectionJobService)
+ .extractUidFromStatsDimensionsValue(any());
- mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
- mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
- mPowerAllowlistBackend, mContext.getContentResolver(),
- mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
+ mAnomalyDetectionJobService.saveAnomalyToDatabase(
+ mContext,
+ mUserManager,
+ mBatteryDatabaseManager,
+ mBatteryUtils,
+ mPolicy,
+ mPowerAllowlistBackend,
+ mContext.getContentResolver(),
+ mFeatureFactory.powerUsageFeatureProvider,
+ mFeatureFactory.metricsFeatureProvider,
mBundle);
- verify(mBatteryDatabaseManager, never()).insertAnomaly(anyInt(), anyString(), anyInt(),
- anyInt(), anyLong());
+ verify(mBatteryDatabaseManager, never())
+ .insertAnomaly(anyInt(), anyString(), anyInt(), anyInt(), anyLong());
}
@Test
public void saveAnomalyToDatabase_uidNull_doNotSave() {
- doReturn(AnomalyDetectionJobService.UID_NULL).when(
- mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
+ doReturn(AnomalyDetectionJobService.UID_NULL)
+ .when(mAnomalyDetectionJobService)
+ .extractUidFromStatsDimensionsValue(any());
- mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
- mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
- mPowerAllowlistBackend, mContext.getContentResolver(),
- mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
+ mAnomalyDetectionJobService.saveAnomalyToDatabase(
+ mContext,
+ mUserManager,
+ mBatteryDatabaseManager,
+ mBatteryUtils,
+ mPolicy,
+ mPowerAllowlistBackend,
+ mContext.getContentResolver(),
+ mFeatureFactory.powerUsageFeatureProvider,
+ mFeatureFactory.metricsFeatureProvider,
mBundle);
- verify(mBatteryDatabaseManager, never()).insertAnomaly(anyInt(), anyString(), anyInt(),
- anyInt(), anyLong());
+ verify(mBatteryDatabaseManager, never())
+ .insertAnomaly(anyInt(), anyString(), anyInt(), anyInt(), anyLong());
}
@Test
@@ -222,22 +245,36 @@
mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
- doReturn(Process.FIRST_APPLICATION_UID).when(
- mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
+ doReturn(Process.FIRST_APPLICATION_UID)
+ .when(mAnomalyDetectionJobService)
+ .extractUidFromStatsDimensionsValue(any());
- mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
- mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
- mPowerAllowlistBackend, mContext.getContentResolver(),
- mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
+ mAnomalyDetectionJobService.saveAnomalyToDatabase(
+ mContext,
+ mUserManager,
+ mBatteryDatabaseManager,
+ mBatteryUtils,
+ mPolicy,
+ mPowerAllowlistBackend,
+ mContext.getContentResolver(),
+ mFeatureFactory.powerUsageFeatureProvider,
+ mFeatureFactory.metricsFeatureProvider,
mBundle);
- verify(mBatteryDatabaseManager).insertAnomaly(anyInt(), anyString(), eq(6),
- eq(AnomalyDatabaseHelper.State.AUTO_HANDLED), anyLong());
- verify(mFeatureFactory.metricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED,
- SettingsEnums.PAGE_UNKNOWN,
- SYSTEM_PACKAGE + "/" + VERSION_CODE,
- ANOMALY_TYPE);
+ verify(mBatteryDatabaseManager)
+ .insertAnomaly(
+ anyInt(),
+ anyString(),
+ eq(6),
+ eq(AnomalyDatabaseHelper.State.AUTO_HANDLED),
+ anyLong());
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED,
+ SettingsEnums.PAGE_UNKNOWN,
+ SYSTEM_PACKAGE + "/" + VERSION_CODE,
+ ANOMALY_TYPE);
}
@Test
@@ -247,22 +284,36 @@
mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
- doReturn(Process.FIRST_APPLICATION_UID).when(
- mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
+ doReturn(Process.FIRST_APPLICATION_UID)
+ .when(mAnomalyDetectionJobService)
+ .extractUidFromStatsDimensionsValue(any());
- mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
- mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
- mPowerAllowlistBackend, mContext.getContentResolver(),
- mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
+ mAnomalyDetectionJobService.saveAnomalyToDatabase(
+ mContext,
+ mUserManager,
+ mBatteryDatabaseManager,
+ mBatteryUtils,
+ mPolicy,
+ mPowerAllowlistBackend,
+ mContext.getContentResolver(),
+ mFeatureFactory.powerUsageFeatureProvider,
+ mFeatureFactory.metricsFeatureProvider,
mBundle);
- verify(mBatteryDatabaseManager).insertAnomaly(anyInt(), anyString(), eq(6),
- eq(AnomalyDatabaseHelper.State.NEW), anyLong());
- verify(mFeatureFactory.metricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED,
- SettingsEnums.PAGE_UNKNOWN,
- SYSTEM_PACKAGE + "/" + VERSION_CODE,
- ANOMALY_TYPE);
+ verify(mBatteryDatabaseManager)
+ .insertAnomaly(
+ anyInt(),
+ anyString(),
+ eq(6),
+ eq(AnomalyDatabaseHelper.State.NEW),
+ anyLong());
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED,
+ SettingsEnums.PAGE_UNKNOWN,
+ SYSTEM_PACKAGE + "/" + VERSION_CODE,
+ ANOMALY_TYPE);
}
@Test
@@ -280,8 +331,8 @@
statsDimensionsValues.add(intValue);
when(tupleValue.getTupleValueList()).thenReturn(statsDimensionsValues);
- assertThat(mAnomalyDetectionJobService.extractUidFromStatsDimensionsValue(
- tupleValue)).isEqualTo(UID);
+ assertThat(mAnomalyDetectionJobService.extractUidFromStatsDimensionsValue(tupleValue))
+ .isEqualTo(UID);
}
@Test
@@ -292,8 +343,8 @@
when(floatValue.getField()).thenReturn(AnomalyDetectionJobService.STATSD_UID_FILED);
when(floatValue.getFloatValue()).thenReturn(0f);
- assertThat(mAnomalyDetectionJobService.extractUidFromStatsDimensionsValue(
- floatValue)).isEqualTo(AnomalyDetectionJobService.UID_NULL);
+ assertThat(mAnomalyDetectionJobService.extractUidFromStatsDimensionsValue(floatValue))
+ .isEqualTo(AnomalyDetectionJobService.UID_NULL);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
index 58bc061..f080574 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
@@ -39,7 +38,6 @@
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settingslib.fuelgauge.EstimateKt;
import org.junit.After;
import org.junit.Before;
@@ -98,20 +96,21 @@
mPackageManager.setApplicationIcon(PACKAGE_NAME, new ColorDrawable());
List<AppInfo> highUsageTips = new ArrayList<>();
- mAppInfo = new AppInfo.Builder()
- .setScreenOnTimeMs(SCREEN_TIME_MS)
- .setPackageName(PACKAGE_NAME)
- .build();
+ mAppInfo =
+ new AppInfo.Builder()
+ .setScreenOnTimeMs(SCREEN_TIME_MS)
+ .setPackageName(PACKAGE_NAME)
+ .build();
highUsageTips.add(mAppInfo);
mHighUsageTip = new HighUsageTip(SCREEN_TIME_MS, highUsageTips);
final List<AppInfo> restrictApps = new ArrayList<>();
restrictApps.add(mAppInfo);
- mRestrictedOneAppTip = new RestrictAppTip(BatteryTip.StateType.NEW,
- new ArrayList<>(restrictApps));
+ mRestrictedOneAppTip =
+ new RestrictAppTip(BatteryTip.StateType.NEW, new ArrayList<>(restrictApps));
restrictApps.add(mAppInfo);
- mRestrictTwoAppsTip = new RestrictAppTip(BatteryTip.StateType.NEW,
- new ArrayList<>(restrictApps));
+ mRestrictTwoAppsTip =
+ new RestrictAppTip(BatteryTip.StateType.NEW, new ArrayList<>(restrictApps));
mUnrestrictAppTip = new UnrestrictAppTip(BatteryTip.StateType.NEW, mAppInfo);
mDefenderTip = new BatteryDefenderTip(BatteryTip.StateType.NEW, false /* isPluggedIn */);
@@ -128,24 +127,30 @@
mDialogFragment = BatteryTipDialogFragment.newInstance(mHighUsageTip, METRICS_KEY);
- FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
- 0 /* containerViewId */, null /* bundle */);
+ FragmentController.setupFragment(
+ mDialogFragment,
+ FragmentActivity.class,
+ 0 /* containerViewId */,
+ null /* bundle */);
Robolectric.getForegroundThreadScheduler().advanceToLastPostedRunnable();
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
- assertThat(shadowDialog.getMessage()).isEqualTo(
- mContext.getString(R.string.battery_tip_dialog_message, 1));
+ assertThat(shadowDialog.getMessage())
+ .isEqualTo(mContext.getString(R.string.battery_tip_dialog_message, 1));
}
@Test
public void testOnCreateDialog_restrictOneAppTip_fireRestrictOneAppDialog() {
mDialogFragment = BatteryTipDialogFragment.newInstance(mRestrictedOneAppTip, METRICS_KEY);
- FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
- 0 /* containerViewId */, null /* bundle */);
+ FragmentController.setupFragment(
+ mDialogFragment,
+ FragmentActivity.class,
+ 0 /* containerViewId */,
+ null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
@@ -163,9 +168,11 @@
mDialogFragment = BatteryTipDialogFragment.newInstance(mRestrictTwoAppsTip, METRICS_KEY);
-
- FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
- 0 /* containerViewId */, null /* bundle */);
+ FragmentController.setupFragment(
+ mDialogFragment,
+ FragmentActivity.class,
+ 0 /* containerViewId */,
+ null /* bundle */);
Robolectric.getForegroundThreadScheduler().advanceToLastPostedRunnable();
@@ -189,13 +196,16 @@
for (int i = 0; i < 6; i++) {
appInfos.add(mAppInfo);
}
- final RestrictAppTip restrictSixAppsTip = new RestrictAppTip(BatteryTip.StateType.NEW,
- appInfos);
+ final RestrictAppTip restrictSixAppsTip =
+ new RestrictAppTip(BatteryTip.StateType.NEW, appInfos);
mDialogFragment = BatteryTipDialogFragment.newInstance(restrictSixAppsTip, METRICS_KEY);
- FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
- 0 /* containerViewId */, null /* bundle */);
+ FragmentController.setupFragment(
+ mDialogFragment,
+ FragmentActivity.class,
+ 0 /* containerViewId */,
+ null /* bundle */);
Robolectric.getForegroundThreadScheduler().advanceToLastPostedRunnable();
@@ -215,8 +225,11 @@
mDialogFragment = BatteryTipDialogFragment.newInstance(mUnrestrictAppTip, METRICS_KEY);
ShadowUtils.setApplicationLabel(PACKAGE_NAME, DISPLAY_NAME);
- FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
- 0 /* containerViewId */, null /* bundle */);
+ FragmentController.setupFragment(
+ mDialogFragment,
+ FragmentActivity.class,
+ 0 /* containerViewId */,
+ null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
index e13dcc0..5613c4e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -50,21 +50,20 @@
public class BatteryTipLoaderTest {
private static final int[] TIP_ORDER = {
- BatteryTip.TipType.LOW_BATTERY,
- BatteryTip.TipType.BATTERY_DEFENDER,
- BatteryTip.TipType.DOCK_DEFENDER,
- BatteryTip.TipType.INCOMPATIBLE_CHARGER,
- BatteryTip.TipType.HIGH_DEVICE_USAGE};
+ BatteryTip.TipType.LOW_BATTERY,
+ BatteryTip.TipType.BATTERY_DEFENDER,
+ BatteryTip.TipType.DOCK_DEFENDER,
+ BatteryTip.TipType.INCOMPATIBLE_CHARGER,
+ BatteryTip.TipType.HIGH_DEVICE_USAGE
+ };
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryUsageStats mBatteryUsageStats;
- @Mock
- private PowerManager mPowerManager;
- @Mock
- private Intent mIntent;
- @Mock
- private BatteryUtils mBatteryUtils;
- @Mock
- private BatteryInfo mBatteryInfo;
+
+ @Mock private PowerManager mPowerManager;
+ @Mock private Intent mIntent;
+ @Mock private BatteryUtils mBatteryUtils;
+ @Mock private BatteryInfo mBatteryInfo;
private Context mContext;
private BatteryTipLoader mBatteryTipLoader;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
index 1c1d2cc..eeedccc 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
@@ -15,8 +15,7 @@
*/
package com.android.settings.fuelgauge.batterytip;
-import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType
- .SMART_BATTERY_MANAGER;
+import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType.SMART_BATTERY_MANAGER;
import static com.google.common.truth.Truth.assertThat;
@@ -31,8 +30,6 @@
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -58,16 +55,11 @@
private static final String KEY_TIP = "key_battery_tip";
private static final long AVERAGE_TIME_MS = DateUtils.HOUR_IN_MILLIS;
- @Mock
- private BatteryTipPreferenceController.BatteryTipListener mBatteryTipListener;
- @Mock
- private PreferenceScreen mPreferenceScreen;
- @Mock
- private BatteryTip mBatteryTip;
- @Mock
- private SettingsActivity mSettingsActivity;
- @Mock
- private InstrumentedPreferenceFragment mFragment;
+ @Mock private BatteryTipPreferenceController.BatteryTipListener mBatteryTipListener;
+ @Mock private PreferenceScreen mPreferenceScreen;
+ @Mock private BatteryTip mBatteryTip;
+ @Mock private SettingsActivity mSettingsActivity;
+ @Mock private InstrumentedPreferenceFragment mFragment;
private Context mContext;
private CardPreference mCardPreference;
@@ -147,13 +139,13 @@
@Test
public void getAvailabilityStatus_returnAvailableUnsearchable() {
- assertThat(mBatteryTipPreferenceController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+ assertThat(mBatteryTipPreferenceController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
}
private BatteryTipPreferenceController buildBatteryTipPreferenceController() {
- final BatteryTipPreferenceController controller = new BatteryTipPreferenceController(
- mContext, KEY_PREF);
+ final BatteryTipPreferenceController controller =
+ new BatteryTipPreferenceController(mContext, KEY_PREF);
controller.setActivity(mSettingsActivity);
controller.setFragment(mFragment);
controller.setBatteryTipListener(mBatteryTipListener);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
index e4f286d..82a850e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
@@ -45,10 +45,8 @@
@RunWith(RobolectricTestRunner.class)
public class BatteryTipUtilsTest {
- @Mock
- private SettingsActivity mSettingsActivity;
- @Mock
- private InstrumentedPreferenceFragment mFragment;
+ @Mock private SettingsActivity mSettingsActivity;
+ @Mock private InstrumentedPreferenceFragment mFragment;
private RestrictAppTip mRestrictAppTip;
private LowBatteryTip mLowBatteryTip;
private BatteryDefenderTip mBatteryDefenderTip;
@@ -61,42 +59,49 @@
when(mSettingsActivity.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
mRestrictAppTip = spy(new RestrictAppTip(BatteryTip.StateType.NEW, new ArrayList<>()));
- mLowBatteryTip = spy(
- new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */));
- mBatteryDefenderTip = spy(new BatteryDefenderTip(BatteryTip.StateType.NEW,
- false /* isPluggedIn */));
+ mLowBatteryTip =
+ spy(new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */));
+ mBatteryDefenderTip =
+ spy(new BatteryDefenderTip(BatteryTip.StateType.NEW, false /* isPluggedIn */));
}
@Test
public void testGetActionForBatteryTip_typeRestrictStateNew_returnActionRestrict() {
when(mRestrictAppTip.getState()).thenReturn(BatteryTip.StateType.NEW);
- assertThat(BatteryTipUtils.getActionForBatteryTip(mRestrictAppTip, mSettingsActivity,
- mFragment)).isInstanceOf(RestrictAppAction.class);
+ assertThat(
+ BatteryTipUtils.getActionForBatteryTip(
+ mRestrictAppTip, mSettingsActivity, mFragment))
+ .isInstanceOf(RestrictAppAction.class);
}
@Test
public void testGetActionForBatteryTip_typeRestrictStateHandled_returnActionOpen() {
when(mRestrictAppTip.getState()).thenReturn(BatteryTip.StateType.HANDLED);
- assertThat(BatteryTipUtils.getActionForBatteryTip(mRestrictAppTip, mSettingsActivity,
- mFragment)).isInstanceOf(OpenRestrictAppFragmentAction.class);
+ assertThat(
+ BatteryTipUtils.getActionForBatteryTip(
+ mRestrictAppTip, mSettingsActivity, mFragment))
+ .isInstanceOf(OpenRestrictAppFragmentAction.class);
}
@Test
public void testGetActionForBatteryTip_typeLowBatteryStateNew_returnActionOpen() {
when(mLowBatteryTip.getState()).thenReturn(BatteryTip.StateType.NEW);
- assertThat(BatteryTipUtils.getActionForBatteryTip(mLowBatteryTip, mSettingsActivity,
- mFragment)).isInstanceOf(OpenBatterySaverAction.class);
+ assertThat(
+ BatteryTipUtils.getActionForBatteryTip(
+ mLowBatteryTip, mSettingsActivity, mFragment))
+ .isInstanceOf(OpenBatterySaverAction.class);
}
@Test
- public void
- testGetActionForBatteryTip_typeBatteryDefenderStateNew_returnNullAction() {
+ public void testGetActionForBatteryTip_typeBatteryDefenderStateNew_returnNullAction() {
when(mBatteryDefenderTip.getState()).thenReturn(BatteryTip.StateType.NEW);
- assertThat(BatteryTipUtils.getActionForBatteryTip(mBatteryDefenderTip, mSettingsActivity,
- mFragment)).isNull();
+ assertThat(
+ BatteryTipUtils.getActionForBatteryTip(
+ mBatteryDefenderTip, mSettingsActivity, mFragment))
+ .isNull();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
index a0e205d..0310225 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
@@ -24,9 +24,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
import java.time.Duration;
-import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class HighUsageDataParserTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java
index 71202df..e5ada76 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java
@@ -39,10 +39,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.List;
-import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class OpenRestrictAppFragmentActionTest {
@@ -53,10 +53,8 @@
private static final int ANOMALY_BT = 1;
private static final int METRICS_KEY = 1;
- @Mock
- private InstrumentedPreferenceFragment mFragment;
- @Mock
- private BatteryDatabaseManager mBatteryDatabaseManager;
+ @Mock private InstrumentedPreferenceFragment mFragment;
+ @Mock private BatteryDatabaseManager mBatteryDatabaseManager;
private OpenRestrictAppFragmentAction mAction;
private FakeFeatureFactory mFeatureFactory;
private Context mContext;
@@ -67,19 +65,22 @@
MockitoAnnotations.initMocks(this);
mContext = ApplicationProvider.getApplicationContext();
mAppInfos = new ArrayList<>();
- mAppInfos.add(new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME_1)
- .addAnomalyType(ANOMALY_BT)
- .build());
- mAppInfos.add(new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME_2)
- .addAnomalyType(ANOMALY_WAKEUP)
- .build());
+ mAppInfos.add(
+ new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME_1)
+ .addAnomalyType(ANOMALY_BT)
+ .build());
+ mAppInfos.add(
+ new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME_2)
+ .addAnomalyType(ANOMALY_WAKEUP)
+ .build());
mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFragment.getContext()).thenReturn(mContext);
- mAction = new OpenRestrictAppFragmentAction(mFragment,
- new RestrictAppTip(BatteryTip.StateType.HANDLED, mAppInfos));
+ mAction =
+ new OpenRestrictAppFragmentAction(
+ mFragment, new RestrictAppTip(BatteryTip.StateType.HANDLED, mAppInfos));
mAction.mBatteryDatabaseManager = mBatteryDatabaseManager;
}
@@ -93,9 +94,12 @@
public void testHandlePositiveAction() {
mAction.handlePositiveAction(METRICS_KEY);
- verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
- MetricsProto.MetricsEvent.ACTION_TIP_OPEN_APP_RESTRICTION_PAGE, METRICS_KEY);
- verify(mBatteryDatabaseManager).updateAnomalies(mAppInfos,
- AnomalyDatabaseHelper.State.HANDLED);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ MetricsProto.MetricsEvent.ACTION_TIP_OPEN_APP_RESTRICTION_PAGE,
+ METRICS_KEY);
+ verify(mBatteryDatabaseManager)
+ .updateAnomalies(mAppInfos, AnomalyDatabaseHelper.State.HANDLED);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
index 121348a..19e3442 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
@@ -52,8 +52,7 @@
private static final int ANOMALY_BT = 1;
private static final int METRICS_KEY = 1;
- @Mock
- private BatteryUtils mBatteryUtils;
+ @Mock private BatteryUtils mBatteryUtils;
private RestrictAppAction mRestrictAppAction;
private FakeFeatureFactory mFeatureFactory;
@@ -62,20 +61,20 @@
MockitoAnnotations.initMocks(this);
final List<AppInfo> mAppInfos = new ArrayList<>();
- mAppInfos.add(new AppInfo.Builder()
- .setUid(UID_1)
- .setPackageName(PACKAGE_NAME_1)
- .build());
- mAppInfos.add(new AppInfo.Builder()
- .setUid(UID_2)
- .setPackageName(PACKAGE_NAME_2)
- .addAnomalyType(ANOMALY_BT)
- .addAnomalyType(ANOMALY_WAKEUP)
- .build());
+ mAppInfos.add(new AppInfo.Builder().setUid(UID_1).setPackageName(PACKAGE_NAME_1).build());
+ mAppInfos.add(
+ new AppInfo.Builder()
+ .setUid(UID_2)
+ .setPackageName(PACKAGE_NAME_2)
+ .addAnomalyType(ANOMALY_BT)
+ .addAnomalyType(ANOMALY_WAKEUP)
+ .build());
mFeatureFactory = FakeFeatureFactory.setupForTest();
- mRestrictAppAction = new RestrictAppAction(RuntimeEnvironment.application,
- new RestrictAppTip(BatteryTip.StateType.NEW, mAppInfos));
+ mRestrictAppAction =
+ new RestrictAppAction(
+ RuntimeEnvironment.application,
+ new RestrictAppTip(BatteryTip.StateType.NEW, mAppInfos));
mRestrictAppAction.mBatteryUtils = mBatteryUtils;
}
@@ -89,17 +88,28 @@
public void testHandlePositiveAction() {
mRestrictAppAction.handlePositiveAction(METRICS_KEY);
- verify(mBatteryUtils)
- .setForceAppStandby(UID_1, PACKAGE_NAME_1, AppOpsManager.MODE_IGNORED);
- verify(mBatteryUtils)
- .setForceAppStandby(UID_2, PACKAGE_NAME_2, AppOpsManager.MODE_IGNORED);
- verify(mFeatureFactory.metricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP, METRICS_KEY, PACKAGE_NAME_1, 0);
- verify(mFeatureFactory.metricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP, METRICS_KEY, PACKAGE_NAME_2,
- ANOMALY_WAKEUP);
- verify(mFeatureFactory.metricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP, METRICS_KEY, PACKAGE_NAME_2,
- ANOMALY_BT);
+ verify(mBatteryUtils).setForceAppStandby(UID_1, PACKAGE_NAME_1, AppOpsManager.MODE_IGNORED);
+ verify(mBatteryUtils).setForceAppStandby(UID_2, PACKAGE_NAME_2, AppOpsManager.MODE_IGNORED);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP,
+ METRICS_KEY,
+ PACKAGE_NAME_1,
+ 0);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP,
+ METRICS_KEY,
+ PACKAGE_NAME_2,
+ ANOMALY_WAKEUP);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP,
+ METRICS_KEY,
+ PACKAGE_NAME_2,
+ ANOMALY_BT);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
index 1ef9a8a..0f4a043 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
@@ -44,8 +44,7 @@
private static final String PACKAGE_NAME_1 = "com.android.app1";
private static final int METRICS_KEY = 1;
- @Mock
- private BatteryUtils mBatteryUtils;
+ @Mock private BatteryUtils mBatteryUtils;
private UnrestrictAppAction mUnrestrictAppAction;
private FakeFeatureFactory mFeatureFactory;
@@ -53,14 +52,14 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- final AppInfo appInfo = new AppInfo.Builder()
- .setUid(UID_1)
- .setPackageName(PACKAGE_NAME_1)
- .build();
+ final AppInfo appInfo =
+ new AppInfo.Builder().setUid(UID_1).setPackageName(PACKAGE_NAME_1).build();
mFeatureFactory = FakeFeatureFactory.setupForTest();
- mUnrestrictAppAction = new UnrestrictAppAction(RuntimeEnvironment.application,
- new UnrestrictAppTip(BatteryTip.StateType.NEW, appInfo));
+ mUnrestrictAppAction =
+ new UnrestrictAppAction(
+ RuntimeEnvironment.application,
+ new UnrestrictAppTip(BatteryTip.StateType.NEW, appInfo));
mUnrestrictAppAction.mBatteryUtils = mBatteryUtils;
}
@@ -73,13 +72,13 @@
public void testHandlePositiveAction() {
mUnrestrictAppAction.handlePositiveAction(METRICS_KEY);
- verify(mBatteryUtils)
- .setForceAppStandby(UID_1, PACKAGE_NAME_1, AppOpsManager.MODE_ALLOWED);
- verify(mFeatureFactory.metricsFeatureProvider).action(
- SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP,
- METRICS_KEY,
- PACKAGE_NAME_1,
- 0);
+ verify(mBatteryUtils).setForceAppStandby(UID_1, PACKAGE_NAME_1, AppOpsManager.MODE_ALLOWED);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP,
+ METRICS_KEY,
+ PACKAGE_NAME_1,
+ 0);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
index 64d5d04..0a63ba2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
@@ -38,8 +38,7 @@
@RunWith(RobolectricTestRunner.class)
public class BatteryDefenderDetectorTest {
- @Mock
- private BatteryInfo mBatteryInfo;
+ @Mock private BatteryInfo mBatteryInfo;
private BatteryDefenderDetector mBatteryDefenderDetector;
private Context mContext;
@@ -53,8 +52,7 @@
mContext = ApplicationProvider.getApplicationContext();
- mBatteryDefenderDetector = new BatteryDefenderDetector(
- mBatteryInfo, mContext);
+ mBatteryDefenderDetector = new BatteryDefenderDetector(mBatteryInfo, mContext);
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/DockDefenderDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/DockDefenderDetectorTest.java
index bd2c5d1..b90733d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/DockDefenderDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/DockDefenderDetectorTest.java
@@ -59,25 +59,35 @@
mBatteryInfo = new BatteryInfo();
mBatteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_DOCK;
mDockDefenderDetector = new DockDefenderDetector(mBatteryInfo, mContext);
- Intent intent = BatteryTestUtils.getCustomBatteryIntent(BatteryManager.BATTERY_PLUGGED_DOCK,
- 50 /* level */, 100 /* scale */, BatteryManager.BATTERY_STATUS_CHARGING);
- doReturn(intent).when(mContext).registerReceiver(eq(null),
- refEq(new IntentFilter(Intent.ACTION_BATTERY_CHANGED)));
+ Intent intent =
+ BatteryTestUtils.getCustomBatteryIntent(
+ BatteryManager.BATTERY_PLUGGED_DOCK,
+ 50 /* level */,
+ 100 /* scale */,
+ BatteryManager.BATTERY_STATUS_CHARGING);
+ doReturn(intent)
+ .when(mContext)
+ .registerReceiver(eq(null), refEq(new IntentFilter(Intent.ACTION_BATTERY_CHANGED)));
- Settings.Global.putInt(mContext.getContentResolver(),
- BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS, 0);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS,
+ 0);
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
}
@Test
public void testDetect_dockDefenderTemporarilyBypassed() {
- Settings.Global.putInt(mContext.getContentResolver(),
- BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS, 1);
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ BatteryUtils.SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS,
+ 1);
BatteryTip batteryTip = mDockDefenderDetector.detect();
assertTrue(batteryTip instanceof DockDefenderTip);
- assertEquals(((DockDefenderTip) batteryTip).getMode(),
+ assertEquals(
+ ((DockDefenderTip) batteryTip).getMode(),
BatteryUtils.DockDefenderMode.TEMPORARILY_BYPASSED);
}
@@ -89,8 +99,8 @@
BatteryTip batteryTip = mDockDefenderDetector.detect();
assertTrue(batteryTip instanceof DockDefenderTip);
- assertEquals(((DockDefenderTip) batteryTip).getMode(),
- BatteryUtils.DockDefenderMode.ACTIVE);
+ assertEquals(
+ ((DockDefenderTip) batteryTip).getMode(), BatteryUtils.DockDefenderMode.ACTIVE);
}
@Test
@@ -101,7 +111,8 @@
BatteryTip batteryTip = mDockDefenderDetector.detect();
assertTrue(batteryTip instanceof DockDefenderTip);
- assertEquals(((DockDefenderTip) batteryTip).getMode(),
+ assertEquals(
+ ((DockDefenderTip) batteryTip).getMode(),
BatteryUtils.DockDefenderMode.FUTURE_BYPASS);
}
@@ -113,8 +124,8 @@
BatteryTip batteryTip = mDockDefenderDetector.detect();
assertTrue(batteryTip instanceof DockDefenderTip);
- assertEquals(((DockDefenderTip) batteryTip).getMode(),
- BatteryUtils.DockDefenderMode.DISABLED);
+ assertEquals(
+ ((DockDefenderTip) batteryTip).getMode(), BatteryUtils.DockDefenderMode.DISABLED);
}
@Test
@@ -124,8 +135,8 @@
BatteryTip batteryTip = mDockDefenderDetector.detect();
assertTrue(batteryTip instanceof DockDefenderTip);
- assertEquals(((DockDefenderTip) batteryTip).getMode(),
- BatteryUtils.DockDefenderMode.DISABLED);
+ assertEquals(
+ ((DockDefenderTip) batteryTip).getMode(), BatteryUtils.DockDefenderMode.DISABLED);
}
@Test
@@ -136,7 +147,7 @@
BatteryTip batteryTip = mDockDefenderDetector.detect();
assertTrue(batteryTip instanceof DockDefenderTip);
- assertEquals(((DockDefenderTip) batteryTip).getMode(),
- BatteryUtils.DockDefenderMode.DISABLED);
+ assertEquals(
+ ((DockDefenderTip) batteryTip).getMode(), BatteryUtils.DockDefenderMode.DISABLED);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
index c125876..b9f9ed2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
@@ -62,18 +62,12 @@
private static final double POWER_LOW = 10000;
private Context mContext;
- @Mock
- private UidBatteryConsumer mHighBatteryConsumer;
- @Mock
- private UidBatteryConsumer mLowBatteryConsumer;
- @Mock
- private UidBatteryConsumer mSystemBatteryConsumer;
- @Mock
- private HighUsageDataParser mDataParser;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
- @Mock
- private BatteryStatsManager mBatteryStatsManager;
+ @Mock private UidBatteryConsumer mHighBatteryConsumer;
+ @Mock private UidBatteryConsumer mLowBatteryConsumer;
+ @Mock private UidBatteryConsumer mSystemBatteryConsumer;
+ @Mock private HighUsageDataParser mDataParser;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
+ @Mock private BatteryStatsManager mBatteryStatsManager;
private AppInfo mHighAppInfo;
private AppInfo mLowAppInfo;
@@ -94,11 +88,17 @@
when(mBatteryStatsManager.getBatteryUsageStats(any(BatteryUsageStatsQuery.class)))
.thenReturn(mBatteryUsageStats);
- mContext.sendStickyBroadcast(new Intent(Intent.ACTION_BATTERY_CHANGED)
- .putExtra(BatteryManager.EXTRA_PLUGGED, 0));
+ mContext.sendStickyBroadcast(
+ new Intent(Intent.ACTION_BATTERY_CHANGED)
+ .putExtra(BatteryManager.EXTRA_PLUGGED, 0));
- mHighUsageDetector = spy(new HighUsageDetector(mContext, mPolicy, mBatteryUsageStats,
- mBatteryUtils.getBatteryInfo(TAG)));
+ mHighUsageDetector =
+ spy(
+ new HighUsageDetector(
+ mContext,
+ mPolicy,
+ mBatteryUsageStats,
+ mBatteryUtils.getBatteryInfo(TAG)));
mHighUsageDetector.mBatteryUtils = mBatteryUtils;
mHighUsageDetector.mDataParser = mDataParser;
doNothing().when(mHighUsageDetector).parseBatteryData();
@@ -111,12 +111,8 @@
when(mBatteryUsageStats.getDischargePercentage()).thenReturn(100);
when(mBatteryUsageStats.getConsumedPower()).thenReturn(POWER_HIGH + POWER_LOW);
- mHighAppInfo = new AppInfo.Builder()
- .setUid(UID_HIGH)
- .build();
- mLowAppInfo = new AppInfo.Builder()
- .setUid(UID_LOW)
- .build();
+ mHighAppInfo = new AppInfo.Builder().setUid(UID_HIGH).build();
+ mLowAppInfo = new AppInfo.Builder().setUid(UID_LOW).build();
ArrayList<UidBatteryConsumer> consumers = new ArrayList<>();
consumers.add(mSystemBatteryConsumer);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/IncompatibleChargerDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/IncompatibleChargerDetectorTest.java
index 9ababe7..3f65a67 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/IncompatibleChargerDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/IncompatibleChargerDetectorTest.java
@@ -81,6 +81,6 @@
when(mUsbPort.getStatus()).thenReturn(mUsbPortStatus);
when(mUsbPort.supportsComplianceWarnings()).thenReturn(true);
when(mUsbPortStatus.isConnected()).thenReturn(true);
- when(mUsbPortStatus.getComplianceWarnings()).thenReturn(new int[]{1});
+ when(mUsbPortStatus.getComplianceWarnings()).thenReturn(new int[] {1});
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
index c9e201b..8e3de7c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
@@ -40,8 +40,7 @@
@RunWith(RobolectricTestRunner.class)
public class LowBatteryDetectorTest {
- @Mock
- private BatteryInfo mBatteryInfo;
+ @Mock private BatteryInfo mBatteryInfo;
private BatteryTipPolicy mPolicy;
private LowBatteryDetector mLowBatteryDetector;
private Context mContext;
@@ -55,15 +54,16 @@
ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", true);
mBatteryInfo.discharging = true;
- mLowBatteryDetector = new LowBatteryDetector(mContext, mPolicy, mBatteryInfo,
- false /* isPowerSaveMode */);
+ mLowBatteryDetector =
+ new LowBatteryDetector(
+ mContext, mPolicy, mBatteryInfo, false /* isPowerSaveMode */);
}
@Test
public void testDetect_disabledByPolicy_tipInvisible() {
ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", false);
- mLowBatteryDetector = new LowBatteryDetector(mContext, mPolicy, mBatteryInfo,
- true /* isPowerSaveMode */);
+ mLowBatteryDetector =
+ new LowBatteryDetector(mContext, mPolicy, mBatteryInfo, true /* isPowerSaveMode */);
assertThat(mLowBatteryDetector.detect().isVisible()).isFalse();
}
@@ -84,8 +84,8 @@
@Test
public void testDetect_batterySaverOn_tipInvisible() {
- mLowBatteryDetector = new LowBatteryDetector(mContext, mPolicy, mBatteryInfo,
- true /* isPowerSaveMode */);
+ mLowBatteryDetector =
+ new LowBatteryDetector(mContext, mPolicy, mBatteryInfo, true /* isPowerSaveMode */);
assertThat(mLowBatteryDetector.detect().getState())
.isEqualTo(BatteryTip.StateType.INVISIBLE);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
index d40f5b8..bd207ee 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
@@ -22,7 +22,6 @@
import android.content.ContentResolver;
import android.content.Context;
-import android.os.PowerManager;
import android.provider.Settings;
import com.android.settings.fuelgauge.BatteryInfo;
@@ -49,8 +48,7 @@
private SmartBatteryDetector mSmartBatteryDetector;
private BatteryTipPolicy mPolicy;
- @Mock
- private BatteryInfo mBatteryInfo;
+ @Mock private BatteryInfo mBatteryInfo;
@Before
public void setUp() {
@@ -59,8 +57,13 @@
mContext = RuntimeEnvironment.application;
mContentResolver = mContext.getContentResolver();
mPolicy = spy(new BatteryTipPolicy(mContext));
- mSmartBatteryDetector = new SmartBatteryDetector(mContext, mPolicy, mBatteryInfo,
- mContentResolver, false /* isPowerSaveMode */);
+ mSmartBatteryDetector =
+ new SmartBatteryDetector(
+ mContext,
+ mPolicy,
+ mBatteryInfo,
+ mContentResolver,
+ false /* isPowerSaveMode */);
}
@Test
@@ -72,8 +75,8 @@
@Test
public void testDetect_smartBatteryOff_tipVisible() {
- Settings.Global.putInt(mContentResolver,
- Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, 0);
+ Settings.Global.putInt(
+ mContentResolver, Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, 0);
mBatteryInfo.batteryLevel = EXPECTED_BATTERY_LEVEL;
assertThat(mSmartBatteryDetector.detect().isVisible()).isTrue();
@@ -81,30 +84,40 @@
@Test
public void testDetect_batterySaverOn_tipInvisible() {
- Settings.Global.putInt(mContentResolver,
- Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, 0);
+ Settings.Global.putInt(
+ mContentResolver, Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, 0);
mBatteryInfo.batteryLevel = EXPECTED_BATTERY_LEVEL;
- mSmartBatteryDetector = new SmartBatteryDetector(mContext, mPolicy, mBatteryInfo,
- mContentResolver, true /* isPowerSaveMode */);
+ mSmartBatteryDetector =
+ new SmartBatteryDetector(
+ mContext,
+ mPolicy,
+ mBatteryInfo,
+ mContentResolver,
+ true /* isPowerSaveMode */);
assertThat(mSmartBatteryDetector.detect().isVisible()).isFalse();
}
@Test
public void testDetect_unexpectedBatteryLevel_tipInvisible() {
- Settings.Global.putInt(mContentResolver,
- Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, 0);
+ Settings.Global.putInt(
+ mContentResolver, Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, 0);
mBatteryInfo.batteryLevel = UNEXPECTED_BATTERY_LEVEL;
- mSmartBatteryDetector = new SmartBatteryDetector(mContext, mPolicy, mBatteryInfo,
- mContentResolver, true /* isPowerSaveMode */);
+ mSmartBatteryDetector =
+ new SmartBatteryDetector(
+ mContext,
+ mPolicy,
+ mBatteryInfo,
+ mContentResolver,
+ true /* isPowerSaveMode */);
assertThat(mSmartBatteryDetector.detect().isVisible()).isFalse();
}
@Test
public void testDetect_smartBatteryOn_tipInvisible() {
- Settings.Global.putInt(mContentResolver,
- Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, 1);
+ Settings.Global.putInt(
+ mContentResolver, Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, 1);
mBatteryInfo.batteryLevel = EXPECTED_BATTERY_LEVEL;
assertThat(mSmartBatteryDetector.detect().isVisible()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
index eee2df3..f8a4f28 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
@@ -17,9 +17,7 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -63,8 +61,8 @@
mFeatureFactory = FakeFeatureFactory.setupForTest();
mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
mContext = RuntimeEnvironment.application;
- mBatteryDefenderTip = new BatteryDefenderTip(BatteryTip.StateType.NEW,
- false /* isPluggedIn */);
+ mBatteryDefenderTip =
+ new BatteryDefenderTip(BatteryTip.StateType.NEW, false /* isPluggedIn */);
when(mPreference.getContext()).thenReturn(mContext);
when(mCardPreference.getContext()).thenReturn(mContext);
@@ -93,8 +91,8 @@
mBatteryDefenderTip.updateState(mBatteryTip);
mBatteryDefenderTip.log(mContext, mMetricsFeatureProvider);
- verify(mMetricsFeatureProvider).action(mContext,
- SettingsEnums.ACTION_BATTERY_DEFENDER_TIP, mBatteryTip.mState);
+ verify(mMetricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_BATTERY_DEFENDER_TIP, mBatteryTip.mState);
}
@Test
@@ -131,8 +129,8 @@
@Test
public void updatePreference_whenCharging_setPrimaryButtonVisibleToBeTrue() {
- mBatteryDefenderTip = new BatteryDefenderTip(BatteryTip.StateType.NEW,
- true /* isPluggedIn */);
+ mBatteryDefenderTip =
+ new BatteryDefenderTip(BatteryTip.StateType.NEW, true /* isPluggedIn */);
mBatteryDefenderTip.updatePreference(mCardPreference);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
index ecac4f9..45fdc1f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
@@ -45,8 +45,7 @@
private static final String TITLE = "title";
private static final String SUMMARY = "summary";
- @DrawableRes
- private static final int ICON_ID = R.drawable.ic_fingerprint;
+ @DrawableRes private static final int ICON_ID = R.drawable.ic_fingerprint;
private Context mContext;
private TestBatteryTip mBatteryTip;
@@ -86,8 +85,10 @@
@Test
public void updatePreference_resetLayoutState() {
mContext.setTheme(R.style.Theme_Settings);
- PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
- View.inflate(mContext, R.layout.card_preference_layout, /* parent= */ null));
+ PreferenceViewHolder holder =
+ PreferenceViewHolder.createInstanceForTests(
+ View.inflate(
+ mContext, R.layout.card_preference_layout, /* parent= */ null));
CardPreference cardPreference = new CardPreference(mContext);
cardPreference.onBindViewHolder(holder);
cardPreference.setPrimaryButtonVisible(true);
@@ -113,9 +114,7 @@
assertThat(mBatteryTip.toString()).isEqualTo("type=6 state=0");
}
- /**
- * Used to test the non abstract methods in {@link TestBatteryTip}
- */
+ /** Used to test the non abstract methods in {@link TestBatteryTip} */
public static class TestBatteryTip extends BatteryTip {
TestBatteryTip() {
super(TipType.SUMMARY, StateType.NEW, true);
@@ -150,14 +149,15 @@
// do nothing
}
- public final Parcelable.Creator CREATOR = new Parcelable.Creator() {
- public BatteryTip createFromParcel(Parcel in) {
- return new TestBatteryTip(in);
- }
+ public final Parcelable.Creator CREATOR =
+ new Parcelable.Creator() {
+ public BatteryTip createFromParcel(Parcel in) {
+ return new TestBatteryTip(in);
+ }
- public BatteryTip[] newArray(int size) {
- return new TestBatteryTip[size];
- }
- };
+ public BatteryTip[] newArray(int size) {
+ return new TestBatteryTip[size];
+ }
+ };
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/DockDefenderTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/DockDefenderTipTest.java
index e897a1c..6d6c2e0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/DockDefenderTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/DockDefenderTipTest.java
@@ -54,10 +54,8 @@
private FakeFeatureFactory mFeatureFactory;
private MetricsFeatureProvider mMetricsFeatureProvider;
- @Mock
- private Preference mPreference;
- @Mock
- private CardPreference mCardPreference;
+ @Mock private Preference mPreference;
+ @Mock private CardPreference mCardPreference;
@Before
public void setUp() {
@@ -67,14 +65,18 @@
mFeatureFactory = FakeFeatureFactory.setupForTest();
mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
- mDockDefenderTipFutureBypass = new DockDefenderTip(BatteryTip.StateType.NEW,
- BatteryUtils.DockDefenderMode.FUTURE_BYPASS);
- mDockDefenderTipActive = new DockDefenderTip(BatteryTip.StateType.NEW,
- BatteryUtils.DockDefenderMode.ACTIVE);
- mDockDefenderTipTemporarilyBypassed = new DockDefenderTip(BatteryTip.StateType.NEW,
- BatteryUtils.DockDefenderMode.TEMPORARILY_BYPASSED);
- mDockDefenderTipDisabled = new DockDefenderTip(BatteryTip.StateType.INVISIBLE,
- BatteryUtils.DockDefenderMode.DISABLED);
+ mDockDefenderTipFutureBypass =
+ new DockDefenderTip(
+ BatteryTip.StateType.NEW, BatteryUtils.DockDefenderMode.FUTURE_BYPASS);
+ mDockDefenderTipActive =
+ new DockDefenderTip(BatteryTip.StateType.NEW, BatteryUtils.DockDefenderMode.ACTIVE);
+ mDockDefenderTipTemporarilyBypassed =
+ new DockDefenderTip(
+ BatteryTip.StateType.NEW,
+ BatteryUtils.DockDefenderMode.TEMPORARILY_BYPASSED);
+ mDockDefenderTipDisabled =
+ new DockDefenderTip(
+ BatteryTip.StateType.INVISIBLE, BatteryUtils.DockDefenderMode.DISABLED);
doReturn(mContext).when(mPreference).getContext();
doReturn(mContext).when(mCardPreference).getContext();
@@ -82,69 +84,78 @@
@Test
public void testGetTitle() {
- assertThat(mDockDefenderTipFutureBypass.getTitle(mContext).toString()).isEqualTo(
- mContext.getString(R.string.battery_tip_dock_defender_future_bypass_title));
- assertThat(mDockDefenderTipActive.getTitle(mContext).toString()).isEqualTo(
- mContext.getString(R.string.battery_tip_dock_defender_active_title));
- assertThat(mDockDefenderTipTemporarilyBypassed.getTitle(mContext).toString()).isEqualTo(
- mContext.getString(R.string.battery_tip_dock_defender_temporarily_bypassed_title));
+ assertThat(mDockDefenderTipFutureBypass.getTitle(mContext).toString())
+ .isEqualTo(
+ mContext.getString(R.string.battery_tip_dock_defender_future_bypass_title));
+ assertThat(mDockDefenderTipActive.getTitle(mContext).toString())
+ .isEqualTo(mContext.getString(R.string.battery_tip_dock_defender_active_title));
+ assertThat(mDockDefenderTipTemporarilyBypassed.getTitle(mContext).toString())
+ .isEqualTo(
+ mContext.getString(
+ R.string.battery_tip_dock_defender_temporarily_bypassed_title));
assertThat(mDockDefenderTipDisabled.getTitle(mContext)).isNull();
}
@Test
public void testGetSummary() {
- assertThat(mDockDefenderTipFutureBypass.getSummary(mContext).toString()).isEqualTo(
- mContext.getString(R.string.battery_tip_dock_defender_future_bypass_summary));
- assertThat(mDockDefenderTipActive.getSummary(mContext).toString()).isEqualTo(
- mContext.getString(R.string.battery_tip_dock_defender_active_summary));
- assertThat(mDockDefenderTipTemporarilyBypassed.getSummary(mContext).toString()).isEqualTo(
- mContext.getString(
- R.string.battery_tip_dock_defender_temporarily_bypassed_summary));
+ assertThat(mDockDefenderTipFutureBypass.getSummary(mContext).toString())
+ .isEqualTo(
+ mContext.getString(
+ R.string.battery_tip_dock_defender_future_bypass_summary));
+ assertThat(mDockDefenderTipActive.getSummary(mContext).toString())
+ .isEqualTo(mContext.getString(R.string.battery_tip_dock_defender_active_summary));
+ assertThat(mDockDefenderTipTemporarilyBypassed.getSummary(mContext).toString())
+ .isEqualTo(
+ mContext.getString(
+ R.string.battery_tip_dock_defender_temporarily_bypassed_summary));
assertThat(mDockDefenderTipDisabled.getSummary(mContext)).isNull();
}
@Test
public void testGetIconId_dockDefenderActive_getProtectedIcon() {
- assertThat(mDockDefenderTipActive.getIconId()).isEqualTo(
- R.drawable.ic_battery_status_protected_24dp);
+ assertThat(mDockDefenderTipActive.getIconId())
+ .isEqualTo(R.drawable.ic_battery_status_protected_24dp);
}
@Test
public void testGetIconId_dockDefenderNotActive_getUntriggeredIcon() {
- assertThat(mDockDefenderTipFutureBypass.getIconId()).isEqualTo(
- R.drawable.ic_battery_dock_defender_untriggered_24dp);
- assertThat(mDockDefenderTipTemporarilyBypassed.getIconId()).isEqualTo(
- R.drawable.ic_battery_dock_defender_untriggered_24dp);
- assertThat(mDockDefenderTipDisabled.getIconId()).isEqualTo(
- R.drawable.ic_battery_dock_defender_untriggered_24dp);
+ assertThat(mDockDefenderTipFutureBypass.getIconId())
+ .isEqualTo(R.drawable.ic_battery_dock_defender_untriggered_24dp);
+ assertThat(mDockDefenderTipTemporarilyBypassed.getIconId())
+ .isEqualTo(R.drawable.ic_battery_dock_defender_untriggered_24dp);
+ assertThat(mDockDefenderTipDisabled.getIconId())
+ .isEqualTo(R.drawable.ic_battery_dock_defender_untriggered_24dp);
}
@Test
public void testUpdateState() {
mDockDefenderTipTemporarilyBypassed.updateState(mDockDefenderTipDisabled);
- assertThat(mDockDefenderTipTemporarilyBypassed.getState()).isEqualTo(
- BatteryTip.StateType.INVISIBLE);
- assertThat(mDockDefenderTipTemporarilyBypassed.getMode()).isEqualTo(
- BatteryUtils.DockDefenderMode.DISABLED);
+ assertThat(mDockDefenderTipTemporarilyBypassed.getState())
+ .isEqualTo(BatteryTip.StateType.INVISIBLE);
+ assertThat(mDockDefenderTipTemporarilyBypassed.getMode())
+ .isEqualTo(BatteryUtils.DockDefenderMode.DISABLED);
}
@Test
public void testLog() {
mDockDefenderTipActive.log(mContext, mMetricsFeatureProvider);
- verify(mMetricsFeatureProvider).action(mContext, SettingsEnums.ACTION_DOCK_DEFENDER_TIP,
- mDockDefenderTipActive.getState());
+ verify(mMetricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_DOCK_DEFENDER_TIP,
+ mDockDefenderTipActive.getState());
}
-
@Test
public void testUpdatePreference_dockDefenderTipFutureBypass() {
mDockDefenderTipFutureBypass.updatePreference(mCardPreference);
verify(mCardPreference).setPrimaryButtonVisible(true);
- verify(mCardPreference).setPrimaryButtonText(
- mContext.getString(R.string.battery_tip_charge_to_full_button));
+ verify(mCardPreference)
+ .setPrimaryButtonText(
+ mContext.getString(R.string.battery_tip_charge_to_full_button));
verifySecondaryButton();
}
@@ -153,8 +164,9 @@
mDockDefenderTipActive.updatePreference(mCardPreference);
verify(mCardPreference).setPrimaryButtonVisible(true);
- verify(mCardPreference).setPrimaryButtonText(
- mContext.getString(R.string.battery_tip_charge_to_full_button));
+ verify(mCardPreference)
+ .setPrimaryButtonText(
+ mContext.getString(R.string.battery_tip_charge_to_full_button));
verifySecondaryButton();
}
@@ -170,8 +182,10 @@
private void verifySecondaryButton() {
verify(mCardPreference).setSecondaryButtonText(mContext.getString(R.string.learn_more));
verify(mCardPreference).setSecondaryButtonVisible(true);
- verify(mCardPreference).setSecondaryButtonContentDescription(mContext.getString(
- R.string.battery_tip_limited_temporarily_sec_button_content_description));
+ final String expectedContent =
+ mContext.getString(
+ R.string.battery_tip_limited_temporarily_sec_button_content_description);
+ verify(mCardPreference).setSecondaryButtonContentDescription(expectedContent);
}
@Test
@@ -182,9 +196,11 @@
}
private String getLastErrorLog() {
- return ShadowLog.getLogsForTag(DockDefenderTip.class.getSimpleName()).stream().filter(
- log -> log.type == Log.ERROR).reduce((first, second) -> second).orElse(
- createErrorLog("No Error Log")).msg;
+ return ShadowLog.getLogsForTag(DockDefenderTip.class.getSimpleName()).stream()
+ .filter(log -> log.type == Log.ERROR)
+ .reduce((first, second) -> second)
+ .orElse(createErrorLog("No Error Log"))
+ .msg;
}
private ShadowLog.LogItem createErrorLog(String msg) {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
index 71a8062..0484a82 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
@@ -45,8 +45,7 @@
private static final long SCREEN_TIME = 30 * DateUtils.MINUTE_IN_MILLIS;
private static final long LAST_FULL_CHARGE_TIME = 20 * DateUtils.MINUTE_IN_MILLIS;
- @Mock
- private MetricsFeatureProvider mMetricsFeatureProvider;
+ @Mock private MetricsFeatureProvider mMetricsFeatureProvider;
private Context mContext;
private HighUsageTip mBatteryTip;
private List<AppInfo> mUsageAppList;
@@ -57,10 +56,11 @@
mContext = RuntimeEnvironment.application;
mUsageAppList = new ArrayList<>();
- mUsageAppList.add(new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME)
- .setScreenOnTimeMs(SCREEN_TIME)
- .build());
+ mUsageAppList.add(
+ new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME)
+ .setScreenOnTimeMs(SCREEN_TIME)
+ .build());
mBatteryTip = new HighUsageTip(LAST_FULL_CHARGE_TIME, mUsageAppList);
}
@@ -86,19 +86,25 @@
@Test
public void toString_containsAppData() {
- assertThat(mBatteryTip.toString()).isEqualTo(
- "type=2 state=0 { packageName=com.android.app,anomalyTypes={},screenTime=1800000 "
- + "}");
+ assertThat(mBatteryTip.toString())
+ .isEqualTo(
+ "type=2 state=0 {"
+ + " packageName=com.android.app,anomalyTypes={},screenTime=1800000 }");
}
@Test
public void testLog_logAppInfo() {
mBatteryTip.log(mContext, mMetricsFeatureProvider);
- verify(mMetricsFeatureProvider).action(mContext,
- MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP, BatteryTip.StateType.NEW);
+ verify(mMetricsFeatureProvider)
+ .action(
+ mContext,
+ MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP,
+ BatteryTip.StateType.NEW);
- verify(mMetricsFeatureProvider).action(mContext,
- MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP_LIST,
- PACKAGE_NAME);
+ verify(mMetricsFeatureProvider)
+ .action(
+ mContext,
+ MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP_LIST,
+ PACKAGE_NAME);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
index 9f6e4e3..1d7ab66 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
@@ -17,16 +17,11 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.content.Intent;
import android.util.Log;
import androidx.preference.Preference;
@@ -72,20 +67,19 @@
@Test
public void getTitle_showTitle() {
- assertThat(mIncompatibleChargerTip.getTitle(mContext)).isEqualTo(
- mContext.getString(R.string.battery_tip_incompatible_charging_title));
+ assertThat(mIncompatibleChargerTip.getTitle(mContext))
+ .isEqualTo(mContext.getString(R.string.battery_tip_incompatible_charging_title));
}
@Test
public void getSummary_showSummary() {
- assertThat(mIncompatibleChargerTip.getSummary(mContext)).isEqualTo(
- mContext.getString(R.string.battery_tip_incompatible_charging_message));
+ assertThat(mIncompatibleChargerTip.getSummary(mContext))
+ .isEqualTo(mContext.getString(R.string.battery_tip_incompatible_charging_message));
}
@Test
public void getIcon_showIcon() {
- assertThat(mIncompatibleChargerTip.getIconId())
- .isEqualTo(R.drawable.ic_battery_charger);
+ assertThat(mIncompatibleChargerTip.getIconId()).isEqualTo(R.drawable.ic_battery_charger);
}
@Test
@@ -93,8 +87,11 @@
mIncompatibleChargerTip.updateState(mBatteryTip);
mIncompatibleChargerTip.log(mContext, mMetricsFeatureProvider);
- verify(mMetricsFeatureProvider).action(mContext,
- SettingsEnums.ACTION_INCOMPATIBLE_CHARGING_TIP, mBatteryTip.mState);
+ verify(mMetricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_INCOMPATIBLE_CHARGING_TIP,
+ mBatteryTip.mState);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
index 3f42231..69edef7 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
@@ -37,8 +37,7 @@
@RunWith(RobolectricTestRunner.class)
public class LowBatteryTipTest {
- @Mock
- private MetricsFeatureProvider mMetricsFeatureProvider;
+ @Mock private MetricsFeatureProvider mMetricsFeatureProvider;
private Context mContext;
private LowBatteryTip mLowBatteryTip;
@@ -58,25 +57,25 @@
final LowBatteryTip parcelTip = new LowBatteryTip(parcel);
assertThat(parcelTip.isPowerSaveModeOn()).isFalse();
- assertThat(parcelTip.getSummary(mContext)).isEqualTo(
- mContext.getString(R.string.battery_tip_low_battery_summary));
+ assertThat(parcelTip.getSummary(mContext))
+ .isEqualTo(mContext.getString(R.string.battery_tip_low_battery_summary));
}
@Test
public void updateState_stateNew_showExpectedInformation() {
mLowBatteryTip.mState = BatteryTip.StateType.NEW;
- assertThat(mLowBatteryTip.getTitle(mContext)).isEqualTo(
- mContext.getString(R.string.battery_tip_low_battery_title));
- assertThat(mLowBatteryTip.getSummary(mContext)).isEqualTo(
- mContext.getString(R.string.battery_tip_low_battery_summary));
+ assertThat(mLowBatteryTip.getTitle(mContext))
+ .isEqualTo(mContext.getString(R.string.battery_tip_low_battery_title));
+ assertThat(mLowBatteryTip.getSummary(mContext))
+ .isEqualTo(mContext.getString(R.string.battery_tip_low_battery_summary));
assertThat(mLowBatteryTip.getIconId()).isEqualTo(R.drawable.ic_battery_saver_accent_24dp);
}
@Test
public void updateState_powerSaveModeOn_notShowTipItem() {
- final LowBatteryTip tip = new LowBatteryTip(
- BatteryTip.StateType.NEW, true /* powerSaveModeOn */);
+ final LowBatteryTip tip =
+ new LowBatteryTip(BatteryTip.StateType.NEW, true /* powerSaveModeOn */);
tip.updateState(tip);
@@ -87,7 +86,10 @@
public void log_lowBatteryActionWithCorrectState() {
mLowBatteryTip.log(mContext, mMetricsFeatureProvider);
- verify(mMetricsFeatureProvider).action(mContext,
- MetricsProto.MetricsEvent.ACTION_LOW_BATTERY_TIP, BatteryTip.StateType.NEW);
+ verify(mMetricsFeatureProvider)
+ .action(
+ mContext,
+ MetricsProto.MetricsEvent.ACTION_LOW_BATTERY_TIP,
+ BatteryTip.StateType.NEW);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
index bb70077..c4bc3bc 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
@@ -65,12 +65,9 @@
private List<AppInfo> mUsageAppList;
private AppInfo mAppInfo;
private AppInfo mUninstallAppInfo;
- @Mock
- private ApplicationInfo mApplicationInfo;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private MetricsFeatureProvider mMetricsFeatureProvider;
+ @Mock private ApplicationInfo mApplicationInfo;
+ @Mock private PackageManager mPackageManager;
+ @Mock private MetricsFeatureProvider mMetricsFeatureProvider;
@Before
public void setUp() throws Exception {
@@ -79,28 +76,35 @@
mContext = spy(RuntimeEnvironment.application);
doReturn(mContext).when(mContext).getApplicationContext();
doReturn(mPackageManager).when(mContext).getPackageManager();
- doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
- PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.MATCH_ANY_USER);
- doThrow(new PackageManager.NameNotFoundException()).when(mPackageManager)
- .getApplicationInfo(UNINSTALL_PACKAGE_NAME,
+ doReturn(mApplicationInfo)
+ .when(mPackageManager)
+ .getApplicationInfo(
+ PACKAGE_NAME,
+ PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.MATCH_ANY_USER);
+ doThrow(new PackageManager.NameNotFoundException())
+ .when(mPackageManager)
+ .getApplicationInfo(
+ UNINSTALL_PACKAGE_NAME,
PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.MATCH_ANY_USER);
doReturn(DISPLAY_NAME).when(mApplicationInfo).loadLabel(mPackageManager);
- mAppInfo = new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME)
- .addAnomalyType(ANOMALY_WAKEUP)
- .addAnomalyType(ANOMALY_WAKELOCK)
- .build();
- mUninstallAppInfo = new AppInfo.Builder()
- .setPackageName(UNINSTALL_PACKAGE_NAME)
- .addAnomalyType(ANOMALY_WAKEUP)
- .build();
+ mAppInfo =
+ new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME)
+ .addAnomalyType(ANOMALY_WAKEUP)
+ .addAnomalyType(ANOMALY_WAKELOCK)
+ .build();
+ mUninstallAppInfo =
+ new AppInfo.Builder()
+ .setPackageName(UNINSTALL_PACKAGE_NAME)
+ .addAnomalyType(ANOMALY_WAKEUP)
+ .build();
mUsageAppList = new ArrayList<>();
mUsageAppList.add(mAppInfo);
mNewBatteryTip = new RestrictAppTip(BatteryTip.StateType.NEW, mUsageAppList);
mHandledBatteryTip = new RestrictAppTip(BatteryTip.StateType.HANDLED, mUsageAppList);
- mInvisibleBatteryTip = new RestrictAppTip(BatteryTip.StateType.INVISIBLE,
- new ArrayList<>());
+ mInvisibleBatteryTip =
+ new RestrictAppTip(BatteryTip.StateType.INVISIBLE, new ArrayList<>());
}
@After
@@ -149,8 +153,9 @@
@Test
public void getSummary_oneAppHandled_showHandledSummary() {
assertThat(mHandledBatteryTip.getSummary(mContext).toString())
- .isEqualTo(StringUtil.getIcuPluralsString(mContext, 1,
- R.string.battery_tip_restrict_handled_summary));
+ .isEqualTo(
+ StringUtil.getIcuPluralsString(
+ mContext, 1, R.string.battery_tip_restrict_handled_summary));
}
@Test
@@ -158,8 +163,9 @@
mUsageAppList.add(new AppInfo.Builder().build());
mHandledBatteryTip = new RestrictAppTip(BatteryTip.StateType.HANDLED, mUsageAppList);
assertThat(mHandledBatteryTip.getSummary(mContext))
- .isEqualTo(StringUtil.getIcuPluralsString(mContext, 2,
- R.string.battery_tip_restrict_handled_summary));
+ .isEqualTo(
+ StringUtil.getIcuPluralsString(
+ mContext, 2, R.string.battery_tip_restrict_handled_summary));
}
@Test
@@ -217,35 +223,47 @@
@Test
public void toString_containsAppData() {
- assertThat(mNewBatteryTip.toString()).isEqualTo(
- "type=1 state=0 { packageName=com.android.app,anomalyTypes={0, 1},screenTime=0 }");
+ assertThat(mNewBatteryTip.toString())
+ .isEqualTo(
+ "type=1 state=0 { packageName=com.android.app,anomalyTypes={0,"
+ + " 1},screenTime=0 }");
}
@Test
public void testLog_stateNew_logAppInfo() {
mNewBatteryTip.log(mContext, mMetricsFeatureProvider);
- verify(mMetricsFeatureProvider).action(mContext,
- MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP, BatteryTip.StateType.NEW);
- verify(mMetricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP_LIST,
- SettingsEnums.PAGE_UNKNOWN,
- PACKAGE_NAME,
- ANOMALY_WAKEUP);
- verify(mMetricsFeatureProvider).action(SettingsEnums.PAGE_UNKNOWN,
- MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP_LIST,
- SettingsEnums.PAGE_UNKNOWN,
- PACKAGE_NAME,
- ANOMALY_WAKELOCK);
+ verify(mMetricsFeatureProvider)
+ .action(
+ mContext,
+ MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP,
+ BatteryTip.StateType.NEW);
+ verify(mMetricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP_LIST,
+ SettingsEnums.PAGE_UNKNOWN,
+ PACKAGE_NAME,
+ ANOMALY_WAKEUP);
+ verify(mMetricsFeatureProvider)
+ .action(
+ SettingsEnums.PAGE_UNKNOWN,
+ MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP_LIST,
+ SettingsEnums.PAGE_UNKNOWN,
+ PACKAGE_NAME,
+ ANOMALY_WAKELOCK);
}
@Test
public void testLog_stateHandled_doNotLogAppInfo() {
mHandledBatteryTip.log(mContext, mMetricsFeatureProvider);
- verify(mMetricsFeatureProvider).action(mContext,
- MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP, BatteryTip.StateType.HANDLED);
- verify(mMetricsFeatureProvider, never()).action(
- anyInt(), anyInt(), anyInt(), anyString(), anyInt());
+ verify(mMetricsFeatureProvider)
+ .action(
+ mContext,
+ MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP,
+ BatteryTip.StateType.HANDLED);
+ verify(mMetricsFeatureProvider, never())
+ .action(anyInt(), anyInt(), anyInt(), anyString(), anyInt());
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java
index 7da6a4f..36cb319 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java
@@ -33,8 +33,7 @@
@RunWith(RobolectricTestRunner.class)
public class SmartBatteryTipTest {
- @Mock
- private MetricsFeatureProvider mMetricsFeatureProvider;
+ @Mock private MetricsFeatureProvider mMetricsFeatureProvider;
private Context mContext;
private SmartBatteryTip mSmartBatteryTip;
@@ -50,7 +49,10 @@
public void testLog() {
mSmartBatteryTip.log(mContext, mMetricsFeatureProvider);
- verify(mMetricsFeatureProvider).action(mContext,
- MetricsProto.MetricsEvent.ACTION_SMART_BATTERY_TIP, BatteryTip.StateType.NEW);
+ verify(mMetricsFeatureProvider)
+ .action(
+ mContext,
+ MetricsProto.MetricsEvent.ACTION_SMART_BATTERY_TIP,
+ BatteryTip.StateType.NEW);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/AnomalyEventWrapperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/AnomalyEventWrapperTest.java
index 60e0af0..0d4d671 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/AnomalyEventWrapperTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/AnomalyEventWrapperTest.java
@@ -45,19 +45,18 @@
@Test
public void getDismissRecordKey_returnExpectedResult() {
- mAnomalyEventWrapper = new AnomalyEventWrapper(mContext,
- BatteryTestUtils.createAdaptiveBrightnessAnomalyEvent());
- assertThat(mAnomalyEventWrapper.getDismissRecordKey())
- .isEqualTo("KEY_BRIGHTNESS");
+ mAnomalyEventWrapper =
+ new AnomalyEventWrapper(
+ mContext, BatteryTestUtils.createAdaptiveBrightnessAnomalyEvent());
+ assertThat(mAnomalyEventWrapper.getDismissRecordKey()).isEqualTo("KEY_BRIGHTNESS");
- mAnomalyEventWrapper = new AnomalyEventWrapper(mContext,
- BatteryTestUtils.createScreenTimeoutAnomalyEvent());
- assertThat(mAnomalyEventWrapper.getDismissRecordKey())
- .isEqualTo("KEY_SCREEN_TIMEOUT");
+ mAnomalyEventWrapper =
+ new AnomalyEventWrapper(
+ mContext, BatteryTestUtils.createScreenTimeoutAnomalyEvent());
+ assertThat(mAnomalyEventWrapper.getDismissRecordKey()).isEqualTo("KEY_SCREEN_TIMEOUT");
- mAnomalyEventWrapper = new AnomalyEventWrapper(mContext,
- BatteryTestUtils.createAppAnomalyEvent());
- assertThat(mAnomalyEventWrapper.getDismissRecordKey())
- .isEqualTo("KEY_APP_1");
+ mAnomalyEventWrapper =
+ new AnomalyEventWrapper(mContext, BatteryTestUtils.createAppAnomalyEvent());
+ assertThat(mAnomalyEventWrapper.getDismissRecordKey()).isEqualTo("KEY_APP_1");
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
index 275ab34..bbb022e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
@@ -66,22 +66,14 @@
@RunWith(RobolectricTestRunner.class)
public final class BatteryChartPreferenceControllerTest {
- @Mock
- private Intent mIntent;
- @Mock
- private UserManager mUserManager;
- @Mock
- private SettingsActivity mSettingsActivity;
- @Mock
- private TextView mChartSummaryTextView;
- @Mock
- private BatteryChartView mDailyChartView;
- @Mock
- private BatteryChartView mHourlyChartView;
- @Mock
- private ViewPropertyAnimator mViewPropertyAnimator;
- @Mock
- private LinearLayout.LayoutParams mLayoutParams;
+ @Mock private Intent mIntent;
+ @Mock private UserManager mUserManager;
+ @Mock private SettingsActivity mSettingsActivity;
+ @Mock private TextView mChartSummaryTextView;
+ @Mock private BatteryChartView mDailyChartView;
+ @Mock private BatteryChartView mHourlyChartView;
+ @Mock private ViewPropertyAnimator mViewPropertyAnimator;
+ @Mock private LinearLayout.LayoutParams mLayoutParams;
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
@@ -97,11 +89,9 @@
mFeatureFactory = FakeFeatureFactory.setupForTest();
mContext = spy(RuntimeEnvironment.application);
doReturn(mContext).when(mContext).getApplicationContext();
- doReturn(mUserManager)
- .when(mContext)
- .getSystemService(UserManager.class);
+ doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(true).when(mUserManager).isUserUnlocked(anyInt());
- doReturn(new int[]{0}).when(mUserManager).getProfileIdsWithDisabled(anyInt());
+ doReturn(new int[] {0}).when(mUserManager).getProfileIdsWithDisabled(anyInt());
final Resources resources = spy(mContext.getResources());
resources.getConfiguration().setLocales(new LocaleList(new Locale("en_US")));
doReturn(resources).when(mContext).getResources();
@@ -122,7 +112,7 @@
// Adds fake testing data.
BatteryDiffEntry.sResourceCache.put(
"fakeBatteryDiffEntryKey",
- new BatteryEntry.NameAndIcon("fakeName", /*icon=*/ null, /*iconId=*/ 1));
+ new BatteryEntry.NameAndIcon("fakeName", /* icon= */ null, /* iconId= */ 1));
}
@Test
@@ -156,15 +146,18 @@
verify(mDailyChartView, atLeastOnce()).setVisibility(View.GONE);
// Ignore fast refresh ui from the data processor callback.
verify(mHourlyChartView, atLeast(0)).setViewModel(null);
- verify(mHourlyChartView, atLeastOnce()).setViewModel(new BatteryChartViewModel(
- List.of(100, 99, 97, 95, 66),
- List.of(1619247660000L /* 7:01 AM */,
- 1619251200000L /* 8 AM */,
- 1619258400000L /* 10 AM */,
- 1619265600000L /* 12 PM */,
- 1619265720000L /* now (12:02 PM) */),
- BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
- mBatteryChartPreferenceController.mHourlyChartLabelTextGenerator));
+ verify(mHourlyChartView, atLeastOnce())
+ .setViewModel(
+ new BatteryChartViewModel(
+ List.of(100, 99, 97, 95, 66),
+ List.of(
+ 1619247660000L /* 7:01 AM */,
+ 1619251200000L /* 8 AM */,
+ 1619258400000L /* 10 AM */,
+ 1619265600000L /* 12 PM */,
+ 1619265720000L /* now (12:02 PM) */),
+ BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
+ mBatteryChartPreferenceController.mHourlyChartLabelTextGenerator));
}
@Test
@@ -173,15 +166,17 @@
reset(mHourlyChartView);
setupHourlyChartViewAnimationMock();
- BatteryChartViewModel expectedDailyViewModel = new BatteryChartViewModel(
- List.of(100, 83, 59, 66),
- // "Sat", "Sun", "Mon", "Mon"
- List.of(1619247660000L /* Sat */,
- 1619308800000L /* Sun */,
- 1619395200000L /* Mon */,
- 1619460120000L /* Mon */),
- BatteryChartViewModel.AxisLabelPosition.CENTER_OF_TRAPEZOIDS,
- mBatteryChartPreferenceController.mDailyChartLabelTextGenerator);
+ BatteryChartViewModel expectedDailyViewModel =
+ new BatteryChartViewModel(
+ List.of(100, 83, 59, 66),
+ // "Sat", "Sun", "Mon", "Mon"
+ List.of(
+ 1619247660000L /* Sat */,
+ 1619308800000L /* Sun */,
+ 1619395200000L /* Mon */,
+ 1619460120000L /* Mon */),
+ BatteryChartViewModel.AxisLabelPosition.CENTER_OF_TRAPEZOIDS,
+ mBatteryChartPreferenceController.mDailyChartLabelTextGenerator);
mBatteryChartPreferenceController.onBatteryLevelDataUpdate(createBatteryLevelData(60));
@@ -202,20 +197,23 @@
expectedDailyViewModel.setSelectedIndex(0);
verify(mDailyChartView).setViewModel(expectedDailyViewModel);
- verify(mHourlyChartView).setViewModel(new BatteryChartViewModel(
- List.of(100, 99, 97, 95, 93, 91, 89, 87, 85, 83),
- List.of(1619247660000L /* 7:01 AM */,
- 1619251200000L /* 8 AM */,
- 1619258400000L /* 10 AM */,
- 1619265600000L /* 12 PM */,
- 1619272800000L /* 2 PM */,
- 1619280000000L /* 4 PM */,
- 1619287200000L /* 6 PM */,
- 1619294400000L /* 8 PM */,
- 1619301600000L /* 10 PM */,
- 1619308800000L /* 12 AM */),
- BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
- mBatteryChartPreferenceController.mHourlyChartLabelTextGenerator));
+ verify(mHourlyChartView)
+ .setViewModel(
+ new BatteryChartViewModel(
+ List.of(100, 99, 97, 95, 93, 91, 89, 87, 85, 83),
+ List.of(
+ 1619247660000L /* 7:01 AM */,
+ 1619251200000L /* 8 AM */,
+ 1619258400000L /* 10 AM */,
+ 1619265600000L /* 12 PM */,
+ 1619272800000L /* 2 PM */,
+ 1619280000000L /* 4 PM */,
+ 1619287200000L /* 6 PM */,
+ 1619294400000L /* 8 PM */,
+ 1619301600000L /* 10 PM */,
+ 1619308800000L /* 12 AM */),
+ BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
+ mBatteryChartPreferenceController.mHourlyChartLabelTextGenerator));
reset(mDailyChartView);
reset(mHourlyChartView);
@@ -228,23 +226,25 @@
verify(mViewPropertyAnimator, atLeastOnce()).alpha(1f);
expectedDailyViewModel.setSelectedIndex(1);
verify(mDailyChartView).setViewModel(expectedDailyViewModel);
- BatteryChartViewModel expectedHourlyViewModel = new BatteryChartViewModel(
- List.of(83, 81, 79, 77, 75, 73, 71, 69, 67, 65, 63, 61, 59),
- List.of(1619308800000L /* 12 AM */,
- 1619316000000L /* 2 AM */,
- 1619323200000L /* 4 AM */,
- 1619330400000L /* 6 AM */,
- 1619337600000L /* 8 AM */,
- 1619344800000L /* 10 AM */,
- 1619352000000L /* 12 PM */,
- 1619359200000L /* 2 PM */,
- 1619366400000L /* 4 PM */,
- 1619373600000L /* 6 PM */,
- 1619380800000L /* 8 PM */,
- 1619388000000L /* 10 PM */,
- 1619395200000L /* 12 AM */),
- BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
- mBatteryChartPreferenceController.mHourlyChartLabelTextGenerator);
+ BatteryChartViewModel expectedHourlyViewModel =
+ new BatteryChartViewModel(
+ List.of(83, 81, 79, 77, 75, 73, 71, 69, 67, 65, 63, 61, 59),
+ List.of(
+ 1619308800000L /* 12 AM */,
+ 1619316000000L /* 2 AM */,
+ 1619323200000L /* 4 AM */,
+ 1619330400000L /* 6 AM */,
+ 1619337600000L /* 8 AM */,
+ 1619344800000L /* 10 AM */,
+ 1619352000000L /* 12 PM */,
+ 1619359200000L /* 2 PM */,
+ 1619366400000L /* 4 PM */,
+ 1619373600000L /* 6 PM */,
+ 1619380800000L /* 8 PM */,
+ 1619388000000L /* 10 PM */,
+ 1619395200000L /* 12 AM */),
+ BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
+ mBatteryChartPreferenceController.mHourlyChartLabelTextGenerator);
expectedHourlyViewModel.setSelectedIndex(6);
verify(mHourlyChartView).setViewModel(expectedHourlyViewModel);
@@ -259,22 +259,24 @@
verify(mViewPropertyAnimator, atLeastOnce()).alpha(1f);
expectedDailyViewModel.setSelectedIndex(2);
verify(mDailyChartView).setViewModel(expectedDailyViewModel);
- verify(mHourlyChartView).setViewModel(new BatteryChartViewModel(
- List.of(59, 57, 55, 53, 51, 49, 47, 45, 43, 41, 66),
- List.of(1619395200000L /* 12 AM */,
- 1619402400000L /* 2 AM */,
- 1619409600000L /* 4 AM */,
- 1619416800000L /* 6 AM */,
- 1619424000000L /* 8 AM */,
- 1619431200000L /* 10 AM */,
- 1619438400000L /* 12 PM */,
- 1619445600000L /* 2 PM */,
- 1619452800000L /* 4 PM */,
- 1619460000000L /* 6 PM */,
- 1619460120000L /* now (6:02 PM) */),
- BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
- mBatteryChartPreferenceController.mHourlyChartLabelTextGenerator));
-
+ verify(mHourlyChartView)
+ .setViewModel(
+ new BatteryChartViewModel(
+ List.of(59, 57, 55, 53, 51, 49, 47, 45, 43, 41, 66),
+ List.of(
+ 1619395200000L /* 12 AM */,
+ 1619402400000L /* 2 AM */,
+ 1619409600000L /* 4 AM */,
+ 1619416800000L /* 6 AM */,
+ 1619424000000L /* 8 AM */,
+ 1619431200000L /* 10 AM */,
+ 1619438400000L /* 12 PM */,
+ 1619445600000L /* 2 PM */,
+ 1619452800000L /* 4 PM */,
+ 1619460000000L /* 6 PM */,
+ 1619460120000L /* now (6:02 PM) */),
+ BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
+ mBatteryChartPreferenceController.mHourlyChartLabelTextGenerator));
}
@Test
@@ -408,8 +410,8 @@
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = 2;
- assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(
- "10 AM - 12 PM");
+ assertThat(mBatteryChartPreferenceController.getSlotInformation())
+ .isEqualTo("10 AM - 12 PM");
}
@Test
@@ -418,8 +420,8 @@
mBatteryChartPreferenceController.mDailyChartIndex = 1;
mBatteryChartPreferenceController.mHourlyChartIndex = 8;
- assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(
- "Sunday 4 PM - 6 PM");
+ assertThat(mBatteryChartPreferenceController.getSlotInformation())
+ .isEqualTo("Sunday 4 PM - 6 PM");
}
@Test
@@ -428,8 +430,8 @@
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = 0;
- assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(
- "7:01 AM - 8 AM");
+ assertThat(mBatteryChartPreferenceController.getSlotInformation())
+ .isEqualTo("7:01 AM - 8 AM");
}
@Test
@@ -438,8 +440,7 @@
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = 3;
- assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(
- "12 PM - now");
+ assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo("12 PM - now");
}
@Test
@@ -448,8 +449,8 @@
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = 0;
- assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(
- "7:01 AM - now");
+ assertThat(mBatteryChartPreferenceController.getSlotInformation())
+ .isEqualTo("7:01 AM - now");
}
@Test
@@ -508,7 +509,7 @@
private BatteryChartPreferenceController createController() {
final BatteryChartPreferenceController controller =
new BatteryChartPreferenceController(
- mContext, /*lifecycle=*/ null, mSettingsActivity);
+ mContext, /* lifecycle= */ null, mSettingsActivity);
controller.mPrefContext = mContext;
return controller;
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewTest.java
index 5213199..4263bad 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewTest.java
@@ -45,8 +45,7 @@
private FakeFeatureFactory mFeatureFactory;
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
- @Mock
- private View mMockView;
+ @Mock private View mMockView;
@Before
public void setUp() {
@@ -54,17 +53,19 @@
mFeatureFactory = FakeFeatureFactory.setupForTest();
mPowerUsageFeatureProvider = mFeatureFactory.powerUsageFeatureProvider;
mContext = spy(RuntimeEnvironment.application);
- mContext.getResources().getConfiguration().setLocales(
- new LocaleList(new Locale("en_US")));
+ mContext.getResources().getConfiguration().setLocales(new LocaleList(new Locale("en_US")));
mBatteryChartView = new BatteryChartView(mContext);
}
@Test
public void onClick_invokesCallback() {
final int originalSelectedIndex = 2;
- BatteryChartViewModel batteryChartViewModel = new BatteryChartViewModel(
- List.of(90, 80, 70, 60), List.of(0L, 0L, 0L, 0L),
- BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS, null);
+ BatteryChartViewModel batteryChartViewModel =
+ new BatteryChartViewModel(
+ List.of(90, 80, 70, 60),
+ List.of(0L, 0L, 0L, 0L),
+ BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS,
+ null);
batteryChartViewModel.setSelectedIndex(originalSelectedIndex);
mBatteryChartView.setViewModel(batteryChartViewModel);
for (int i = 0; i < mBatteryChartView.mTrapezoidSlots.length; i++) {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffDataTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffDataTest.java
index 04d601f..ffe3c44 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffDataTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffDataTest.java
@@ -149,16 +149,12 @@
createBatteryDiffEntry(mContext, /* consumePower= */ 28.5, /* key= */ "APP_1"));
batteryDiffEntries.add(
createBatteryDiffEntry(
- mContext,
- /* consumePower= */ 20,
- BatteryDiffEntry.UNINSTALLED_APPS_KEY));
+ mContext, /* consumePower= */ 20, BatteryDiffEntry.UNINSTALLED_APPS_KEY));
batteryDiffEntries.add(
createBatteryDiffEntry(mContext, /* consumePower= */ 3, /* key= */ "APP_2"));
batteryDiffEntries.add(
createBatteryDiffEntry(
- mContext,
- /* consumePower= */ 28.5,
- BatteryDiffEntry.SYSTEM_APPS_KEY));
+ mContext, /* consumePower= */ 28.5, BatteryDiffEntry.SYSTEM_APPS_KEY));
batteryDiffEntries.add(
createBatteryDiffEntry(mContext, /* consumePower= */ 20, /* key= */ "APP_3"));
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
index bbba294..d8b733c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
@@ -64,7 +64,6 @@
private static final String UNINSTALLED_PACKAGE_NAME = "com.android.testing.uninstalled";
private static final String UID_ZERO_PACKAGE_NAME = "com.android.testing.uid.zero";
-
private Context mContext;
@Mock private ApplicationInfo mMockAppInfo;
@@ -451,7 +450,6 @@
assertThat(entry.isUninstalledEntry()).isFalse();
assertThat(BatteryDiffEntry.sPackageNameAndUidCache.containsKey(PACKAGE_NAME)).isTrue();
assertThat(BatteryDiffEntry.sPackageNameAndUidCache.get(PACKAGE_NAME)).isEqualTo(UID);
-
}
@Test
@@ -602,7 +600,7 @@
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
doReturn(drawable).when(mMockPackageManager).getDefaultActivityIcon();
doReturn(null).when(mMockPackageManager).getApplicationInfo("com.a.b.c", 0);
- doReturn(new String[]{"com.a.b.c"}).when(mMockPackageManager).getPackagesForUid(1001);
+ doReturn(new String[] {"com.a.b.c"}).when(mMockPackageManager).getPackagesForUid(1001);
return createBatteryDiffEntry(10, batteryHistEntry);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
index e9606da..83b4458 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
@@ -61,18 +61,15 @@
private static final String HIGH_DRAIN_PACKAGE = "com.android.test.screen";
private static final String ANDROID_PACKAGE = "android";
- @Rule
- public MockitoRule mocks = MockitoJUnit.rule();
+ @Rule public MockitoRule mocks = MockitoJUnit.rule();
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mMockContext;
+
private Context mContext;
- @Mock
- private PackageManager mMockPackageManager;
- @Mock
- private UserManager mMockUserManager;
- @Mock
- private UidBatteryConsumer mUidBatteryConsumer;
+ @Mock private PackageManager mMockPackageManager;
+ @Mock private UserManager mMockUserManager;
+ @Mock private UidBatteryConsumer mUidBatteryConsumer;
@Before
public void stubContextToReturnMockPackageManager() {
@@ -83,23 +80,27 @@
@Before
public void stubPackageManagerToReturnAppPackageAndName() throws NameNotFoundException {
when(mMockPackageManager.getApplicationInfo(anyString(), eq(0) /* no flags */))
- .thenAnswer(invocation -> {
- ApplicationInfo info = new ApplicationInfo();
- info.packageName = invocation.getArgument(0);
- return info;
- });
+ .thenAnswer(
+ invocation -> {
+ ApplicationInfo info = new ApplicationInfo();
+ info.packageName = invocation.getArgument(0);
+ return info;
+ });
when(mMockPackageManager.getApplicationLabel(any(ApplicationInfo.class)))
- .thenAnswer(invocation -> LABEL_PREFIX
- + ((ApplicationInfo) invocation.getArgument(0)).packageName);
+ .thenAnswer(
+ invocation ->
+ LABEL_PREFIX
+ + ((ApplicationInfo) invocation.getArgument(0))
+ .packageName);
}
- private BatteryEntry createBatteryEntryForApp(String[] packages, String packageName,
- String highDrainPackage) {
+ private BatteryEntry createBatteryEntryForApp(
+ String[] packages, String packageName, String highDrainPackage) {
UidBatteryConsumer consumer = mock(UidBatteryConsumer.class);
when(consumer.getUid()).thenReturn(APP_UID);
when(consumer.getPackageWithHighestDrain()).thenReturn(highDrainPackage);
- return new BatteryEntry(mMockContext, mMockUserManager,
- consumer, false, APP_UID, packages, packageName);
+ return new BatteryEntry(
+ mMockContext, mMockUserManager, consumer, false, APP_UID, packages, packageName);
}
private BatteryEntry createAggregateBatteryEntry(int powerComponentId) {
@@ -122,14 +123,13 @@
private BatteryEntry createUserBatteryConsumer(int userId) {
UserBatteryConsumer consumer = mock(UserBatteryConsumer.class);
when(consumer.getUserId()).thenReturn(userId);
- return new BatteryEntry(mMockContext, mMockUserManager,
- consumer, false, 0, null, null);
+ return new BatteryEntry(mMockContext, mMockUserManager, consumer, false, 0, null, null);
}
@Test
public void batteryEntryForApp_shouldSetDefaultPackageNameAndLabel() throws Exception {
- BatteryEntry entry = createBatteryEntryForApp(null, APP_DEFAULT_PACKAGE_NAME,
- HIGH_DRAIN_PACKAGE);
+ BatteryEntry entry =
+ createBatteryEntryForApp(null, APP_DEFAULT_PACKAGE_NAME, HIGH_DRAIN_PACKAGE);
assertThat(entry.getDefaultPackageName()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + APP_DEFAULT_PACKAGE_NAME);
@@ -157,20 +157,24 @@
@Test
public void batteryEntryForApp_shouldSetHighestDrainPackage_whenMultiplePackagesFoundForUid() {
- BatteryEntry entry = createBatteryEntryForApp(
- new String[]{APP_DEFAULT_PACKAGE_NAME, "package2", "package3"}, null,
- HIGH_DRAIN_PACKAGE);
+ BatteryEntry entry =
+ createBatteryEntryForApp(
+ new String[] {APP_DEFAULT_PACKAGE_NAME, "package2", "package3"},
+ null,
+ HIGH_DRAIN_PACKAGE);
assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + HIGH_DRAIN_PACKAGE);
}
@Test
public void batteryEntryForAOD_containCorrectInfo() {
- final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application,
- BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY,
- /* devicePowerMah= */ 200,
- /* usageDurationMs= */ 1000,
- /* isHidden= */ false);
+ final BatteryEntry entry =
+ new BatteryEntry(
+ RuntimeEnvironment.application,
+ BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY,
+ /* devicePowerMah= */ 200,
+ /* usageDurationMs= */ 1000,
+ /* isHidden= */ false);
assertThat(entry.mIconId).isEqualTo(R.drawable.ic_settings_aod);
assertThat(entry.mName).isEqualTo("Ambient display");
@@ -178,10 +182,12 @@
@Test
public void batteryEntryForCustomComponent_containCorrectInfo() {
- final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application,
- BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 42,
- /* powerComponentName= */ "ABC",
- /* devicePowerMah= */ 200);
+ final BatteryEntry entry =
+ new BatteryEntry(
+ RuntimeEnvironment.application,
+ BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 42,
+ /* powerComponentName= */ "ABC",
+ /* devicePowerMah= */ 200);
assertThat(entry.mIconId).isEqualTo(R.drawable.ic_power_system);
assertThat(entry.mName).isEqualTo("ABC");
@@ -192,19 +198,28 @@
when(mUidBatteryConsumer.getTimeInStateMs(UidBatteryConsumer.STATE_FOREGROUND))
.thenReturn(100L);
- final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application,
- mMockUserManager, mUidBatteryConsumer, false, 0, null, null);
+ final BatteryEntry entry =
+ new BatteryEntry(
+ RuntimeEnvironment.application,
+ mMockUserManager,
+ mUidBatteryConsumer,
+ false,
+ 0,
+ null,
+ null);
assertThat(entry.getTimeInForegroundMs()).isEqualTo(100L);
}
@Test
public void getTimeInForegroundMs_aggregateBatteryConsumer() {
- final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application,
- BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
- /* devicePowerMah= */ 10,
- /* usageDurationMs= */ 100,
- /* isHidden= */ false);
+ final BatteryEntry entry =
+ new BatteryEntry(
+ RuntimeEnvironment.application,
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ /* devicePowerMah= */ 10,
+ /* usageDurationMs= */ 100,
+ /* isHidden= */ false);
assertThat(entry.getTimeInForegroundMs()).isEqualTo(100L);
}
@@ -214,19 +229,28 @@
when(mUidBatteryConsumer.getTimeInStateMs(UidBatteryConsumer.STATE_BACKGROUND))
.thenReturn(100L);
- final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application,
- mMockUserManager, mUidBatteryConsumer, false, 0, null, null);
+ final BatteryEntry entry =
+ new BatteryEntry(
+ RuntimeEnvironment.application,
+ mMockUserManager,
+ mUidBatteryConsumer,
+ false,
+ 0,
+ null,
+ null);
assertThat(entry.getTimeInBackgroundMs()).isEqualTo(100L);
}
@Test
public void getTimeInBackgroundMs_systemConsumer() {
- final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application,
- BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
- /* devicePowerMah= */ 100,
- /* usageDurationMs= */ 1000,
- /* isHidden= */ false);
+ final BatteryEntry entry =
+ new BatteryEntry(
+ RuntimeEnvironment.application,
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ /* devicePowerMah= */ 100,
+ /* usageDurationMs= */ 1000,
+ /* isHidden= */ false);
assertThat(entry.getTimeInBackgroundMs()).isEqualTo(0);
}
@@ -241,16 +265,17 @@
@Test
public void getKey_AggregateBatteryConsumer_returnComponentId() {
- final BatteryEntry entry = createAggregateBatteryEntry(
- BatteryConsumer.POWER_COMPONENT_BLUETOOTH);
+ final BatteryEntry entry =
+ createAggregateBatteryEntry(BatteryConsumer.POWER_COMPONENT_BLUETOOTH);
final String key = entry.getKey();
assertThat(key).isEqualTo("S|2");
}
@Test
public void getKey_CustomAggregateBatteryConsumer_returnComponentId() {
- final BatteryEntry entry = createCustomAggregateBatteryEntry(
- BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 42);
+ final BatteryEntry entry =
+ createCustomAggregateBatteryEntry(
+ BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 42);
final String key = entry.getKey();
assertThat(key).isEqualTo("S|1042");
}
@@ -269,19 +294,18 @@
doReturn(mMockUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(null).when(mMockUserManager).getUserInfo(userId);
- final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUserId(
- mContext, userId);
- assertThat(nameAndIcon.mName).isEqualTo(getString(
- R.string.running_process_item_removed_user_label));
+ final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUserId(mContext, userId);
+ assertThat(nameAndIcon.mName)
+ .isEqualTo(getString(R.string.running_process_item_removed_user_label));
assertThat(nameAndIcon.mIcon).isNull();
}
@Test
public void getNameAndIconFromUid_rerturnExpectedName() {
- final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid(
- mContext, /* name */ null, /* uid */ 0);
- assertThat(nameAndIcon.mName).isEqualTo(
- getString(com.android.settingslib.R.string.process_kernel_label));
+ final NameAndIcon nameAndIcon =
+ BatteryEntry.getNameAndIconFromUid(mContext, /* name */ null, /* uid */ 0);
+ assertThat(nameAndIcon.mName)
+ .isEqualTo(getString(com.android.settingslib.R.string.process_kernel_label));
assertNameAndIcon("mediaserver", R.string.process_mediaserver_label);
assertNameAndIcon("dex2oat32", R.string.process_dex2oat_label);
@@ -291,63 +315,75 @@
@Test
public void getNameAndIconFromUid_tetheringUid_rerturnExpectedName() {
- final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid(
- mContext, /* name */ null, /* uid */ BatteryUtils.UID_TETHERING);
+ final NameAndIcon nameAndIcon =
+ BatteryEntry.getNameAndIconFromUid(
+ mContext, /* name */ null, /* uid */ BatteryUtils.UID_TETHERING);
assertThat(nameAndIcon.mName).isEqualTo(getString(R.string.process_network_tethering));
}
@Test
public void getNameAndIconFromUid_removedAppsUid_rerturnExpectedName() {
- final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid(
- mContext, /* name */ null, /* uid */ BatteryUtils.UID_REMOVED_APPS);
+ final NameAndIcon nameAndIcon =
+ BatteryEntry.getNameAndIconFromUid(
+ mContext, /* name */ null, /* uid */ BatteryUtils.UID_REMOVED_APPS);
assertThat(nameAndIcon.mName).isEqualTo(getString(R.string.process_removed_apps));
}
@Test
public void getNameAndIconFromPowerComponent_rerturnExpectedNameAndIcon() {
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_SCREEN,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_SCREEN,
R.string.power_screen,
R.drawable.ic_settings_display);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_CPU,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_CPU,
R.string.power_cpu,
R.drawable.ic_settings_cpu);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
R.string.power_bluetooth,
R.drawable.ic_settings_bluetooth);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_CAMERA,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_CAMERA,
R.string.power_camera,
R.drawable.ic_settings_camera);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_FLASHLIGHT,
R.string.power_flashlight,
R.drawable.ic_settings_flashlight);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO,
R.string.power_cell,
R.drawable.ic_settings_cellular);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_GNSS,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_GNSS,
R.string.power_gps,
R.drawable.ic_settings_gps);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_WIFI,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_WIFI,
R.string.power_wifi,
R.drawable.ic_settings_wireless_no_theme);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_PHONE,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_PHONE,
R.string.power_phone,
R.drawable.ic_settings_voice_calls);
- assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY,
+ assertNameAndIcon(
+ BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY,
R.string.ambient_display_screen_title,
R.drawable.ic_settings_aod);
}
private void assertNameAndIcon(String name, int stringId) {
- final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid(
- mContext, name, /* uid */ 1000);
+ final NameAndIcon nameAndIcon =
+ BatteryEntry.getNameAndIconFromUid(mContext, name, /* uid */ 1000);
assertThat(nameAndIcon.mName).isEqualTo(getString(stringId));
}
private void assertNameAndIcon(int powerComponentId, int stringId, int iconId) {
- final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromPowerComponent(
- mContext, powerComponentId);
+ final NameAndIcon nameAndIcon =
+ BatteryEntry.getNameAndIconFromPowerComponent(mContext, powerComponentId);
assertThat(nameAndIcon.mName).isEqualTo(getString(stringId));
assertThat(nameAndIcon.mIconId).isEqualTo(iconId);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntryTest.java
index 609f2fc..02800f7 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntryTest.java
@@ -41,10 +41,8 @@
@RunWith(RobolectricTestRunner.class)
public final class BatteryHistEntryTest {
- @Mock
- private BatteryEntry mMockBatteryEntry;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
+ @Mock private BatteryEntry mMockBatteryEntry;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
@Before
public void setUp() {
@@ -75,17 +73,17 @@
ConvertUtils.convertBatteryEntryToContentValues(
mMockBatteryEntry,
mBatteryUsageStats,
- /*batteryLevel=*/ 12,
- /*batteryStatus=*/ BatteryManager.BATTERY_STATUS_FULL,
- /*batteryHealth=*/ BatteryManager.BATTERY_HEALTH_COLD,
- /*bootTimestamp=*/ 101L,
- /*timestamp=*/ 10001L,
- /*isFullChargeStart=*/ false);
+ /* batteryLevel= */ 12,
+ /* batteryStatus= */ BatteryManager.BATTERY_STATUS_FULL,
+ /* batteryHealth= */ BatteryManager.BATTERY_HEALTH_COLD,
+ /* bootTimestamp= */ 101L,
+ /* timestamp= */ 10001L,
+ /* isFullChargeStart= */ false);
assertBatteryHistEntry(
new BatteryHistEntry(values),
- /*drainType=*/ expectedType,
- /*percentOfTotal=*/ mMockBatteryEntry.mPercent);
+ /* drainType= */ expectedType,
+ /* percentOfTotal= */ mMockBatteryEntry.mPercent);
}
@Test
@@ -98,25 +96,25 @@
public void testConstructor_cursor_returnsExpectedResult() {
assertBatteryHistEntry(
createBatteryHistEntry(
- /*bootTimestamp=*/ 101L,
- /*timestamp=*/ 10001L,
- /*totalPower=*/ 5.1,
- /*consumePower=*/ 1.1,
- /*foregroundUsageConsumePower=*/ 1.2,
- /*foregroundServiceUsageConsumePower=*/ 1.3,
- /*backgroundUsageConsumePower=*/ 1.4,
- /*cachedUsageConsumePower=*/ 1.5,
- /*foregroundUsageTimeInMs=*/ 1234L,
- /*backgroundUsageTimeInMs=*/ 5689L,
- /*batteryLevel=*/ 12),
- /*drainType=*/ 3,
- /*percentOfTotal=*/ 0.3);
+ /* bootTimestamp= */ 101L,
+ /* timestamp= */ 10001L,
+ /* totalPower= */ 5.1,
+ /* consumePower= */ 1.1,
+ /* foregroundUsageConsumePower= */ 1.2,
+ /* foregroundServiceUsageConsumePower= */ 1.3,
+ /* backgroundUsageConsumePower= */ 1.4,
+ /* cachedUsageConsumePower= */ 1.5,
+ /* foregroundUsageTimeInMs= */ 1234L,
+ /* backgroundUsageTimeInMs= */ 5689L,
+ /* batteryLevel= */ 12),
+ /* drainType= */ 3,
+ /* percentOfTotal= */ 0.3);
}
@Test
public void testGetKey_consumerUidType_returnExpectedString() {
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
values.put(BatteryHistEntry.KEY_UID, 3);
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
@@ -125,8 +123,8 @@
@Test
public void testGetKey_consumerUserType_returnExpectedString() {
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_USER_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_USER_BATTERY);
values.put(BatteryHistEntry.KEY_USER_ID, 2);
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
@@ -135,14 +133,12 @@
@Test
public void testGetKey_consumerSystemType_returnExpectedString() {
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
- .setDrainType(1)
- .build();
- values.put(BatteryHistEntry.KEY_BATTERY_INFORMATION,
+ BatteryInformation.newBuilder().setDrainType(1).build();
+ values.put(
+ BatteryHistEntry.KEY_BATTERY_INFORMATION,
ConvertUtils.convertBatteryInformationToString(batteryInformation));
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
@@ -151,32 +147,51 @@
@Test
public void testIsAppEntry_returnExpectedResult() {
- assertThat(isUidConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY).mConsumerType)).isFalse();
- assertThat(isUidConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_USER_BATTERY).mConsumerType)).isFalse();
- assertThat(isUidConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).mConsumerType)).isTrue();
+ assertThat(
+ isUidConsumer(
+ createEntry(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY)
+ .mConsumerType))
+ .isFalse();
+ assertThat(
+ isUidConsumer(
+ createEntry(ConvertUtils.CONSUMER_TYPE_USER_BATTERY).mConsumerType))
+ .isFalse();
+ assertThat(isUidConsumer(createEntry(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).mConsumerType))
+ .isTrue();
}
@Test
public void testIsUserEntry_returnExpectedResult() {
- assertThat(isUserConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY).mConsumerType)).isFalse();
- assertThat(isUserConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_USER_BATTERY).mConsumerType)).isTrue();
- assertThat(isUserConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).mConsumerType)).isFalse();
+ assertThat(
+ isUserConsumer(
+ createEntry(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY)
+ .mConsumerType))
+ .isFalse();
+ assertThat(
+ isUserConsumer(
+ createEntry(ConvertUtils.CONSUMER_TYPE_USER_BATTERY).mConsumerType))
+ .isTrue();
+ assertThat(
+ isUserConsumer(
+ createEntry(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).mConsumerType))
+ .isFalse();
}
@Test
public void testIsSystemEntry_returnExpectedResult() {
- assertThat(isSystemConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY).mConsumerType)).isTrue();
- assertThat(isSystemConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_USER_BATTERY).mConsumerType)).isFalse();
- assertThat(isSystemConsumer(
- createEntry(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).mConsumerType)).isFalse();
+ assertThat(
+ isSystemConsumer(
+ createEntry(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY)
+ .mConsumerType))
+ .isTrue();
+ assertThat(
+ isSystemConsumer(
+ createEntry(ConvertUtils.CONSUMER_TYPE_USER_BATTERY).mConsumerType))
+ .isFalse();
+ assertThat(
+ isSystemConsumer(
+ createEntry(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).mConsumerType))
+ .isFalse();
}
@Test
@@ -185,52 +200,52 @@
final long upperTimestamp = 300L;
final long lowerTimestamp = 100L;
final double ratio = 0.5;
- final BatteryHistEntry lowerHistEntry = createBatteryHistEntry(
- /*bootTimestamp=*/ 1000L,
- lowerTimestamp,
- /*totalPower=*/ 50,
- /*consumePower=*/ 10,
- /*foregroundUsageConsumePower=*/ 1,
- /*foregroundServiceUsageConsumePower=*/ 2,
- /*backgroundUsageConsumePower=*/ 3,
- /*cachedUsageConsumePower=*/ 4,
- /*foregroundUsageTimeInMs=*/ 100,
- /*backgroundUsageTimeInMs=*/ 200,
- /*batteryLevel=*/ 90);
- final BatteryHistEntry upperHistEntry = createBatteryHistEntry(
- /*bootTimestamp=*/ 1200L,
- upperTimestamp,
- /*totalPower=*/ 80,
- /*consumePower=*/ 20,
- /*foregroundUsageConsumePower=*/ 4,
- /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 6,
- /*cachedUsageConsumePower=*/ 5,
- /*foregroundUsageTimeInMs=*/ 200,
- /*backgroundUsageTimeInMs=*/ 300,
- /*batteryLevel=*/ 80);
+ final BatteryHistEntry lowerHistEntry =
+ createBatteryHistEntry(
+ /* bootTimestamp= */ 1000L,
+ lowerTimestamp,
+ /* totalPower= */ 50,
+ /* consumePower= */ 10,
+ /* foregroundUsageConsumePower= */ 1,
+ /* foregroundServiceUsageConsumePower= */ 2,
+ /* backgroundUsageConsumePower= */ 3,
+ /* cachedUsageConsumePower= */ 4,
+ /* foregroundUsageTimeInMs= */ 100,
+ /* backgroundUsageTimeInMs= */ 200,
+ /* batteryLevel= */ 90);
+ final BatteryHistEntry upperHistEntry =
+ createBatteryHistEntry(
+ /* bootTimestamp= */ 1200L,
+ upperTimestamp,
+ /* totalPower= */ 80,
+ /* consumePower= */ 20,
+ /* foregroundUsageConsumePower= */ 4,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 6,
+ /* cachedUsageConsumePower= */ 5,
+ /* foregroundUsageTimeInMs= */ 200,
+ /* backgroundUsageTimeInMs= */ 300,
+ /* batteryLevel= */ 80);
final BatteryHistEntry newEntry =
BatteryHistEntry.interpolate(
- slotTimestamp,
- upperTimestamp,
- ratio,
- lowerHistEntry,
- upperHistEntry);
+ slotTimestamp, upperTimestamp, ratio, lowerHistEntry, upperHistEntry);
assertBatteryHistEntry(
- newEntry, 3, upperHistEntry.mPercentOfTotal,
- /*bootTimestamp=*/ 1200 - 100,
- /*timestamp=*/ slotTimestamp,
- /*totalPower=*/ 50 + 0.5 * (80 - 50),
- /*consumePower=*/ 10 + 0.5 * (20 - 10),
- /*foregroundUsageConsumePower=*/ 1 + 0.5 * (4 - 1),
- /*foregroundServiceUsageConsumePower=*/ 2 + 0.5 * (5 - 2),
- /*backgroundUsageConsumePower=*/ 3 + 0.5 * (6 - 3),
- /*cachedUsageConsumePower=*/ 4 + 0.5 * (5 - 4),
- /*foregroundUsageTimeInMs=*/ Math.round(100 + 0.5 * (200 - 100)),
- /*backgroundUsageTimeInMs=*/ Math.round(200 + 0.5 * (300 - 200)),
- /*batteryLevel=*/ (int) Math.round(90 + 0.5 * (80 - 90)));
+ newEntry,
+ 3,
+ upperHistEntry.mPercentOfTotal,
+ /* bootTimestamp= */ 1200 - 100,
+ /* timestamp= */ slotTimestamp,
+ /* totalPower= */ 50 + 0.5 * (80 - 50),
+ /* consumePower= */ 10 + 0.5 * (20 - 10),
+ /* foregroundUsageConsumePower= */ 1 + 0.5 * (4 - 1),
+ /* foregroundServiceUsageConsumePower= */ 2 + 0.5 * (5 - 2),
+ /* backgroundUsageConsumePower= */ 3 + 0.5 * (6 - 3),
+ /* cachedUsageConsumePower= */ 4 + 0.5 * (5 - 4),
+ /* foregroundUsageTimeInMs= */ Math.round(100 + 0.5 * (200 - 100)),
+ /* backgroundUsageTimeInMs= */ Math.round(200 + 0.5 * (300 - 200)),
+ /* batteryLevel= */ (int) Math.round(90 + 0.5 * (80 - 90)));
}
@Test
@@ -238,40 +253,43 @@
final long slotTimestamp = 200L;
final long upperTimestamp = 300L;
final double ratio = 0.5;
- final BatteryHistEntry upperHistEntry = createBatteryHistEntry(
- /*bootTimestamp=*/ 1200L,
- upperTimestamp,
- /*totalPower=*/ 80,
- /*consumePower=*/ 20,
- /*foregroundUsageConsumePower=*/ 4,
- /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 6,
- /*cachedUsageConsumePower=*/ 5,
- /*foregroundUsageTimeInMs=*/ 200,
- /*backgroundUsageTimeInMs=*/ 300,
- /*batteryLevel=*/ 80);
+ final BatteryHistEntry upperHistEntry =
+ createBatteryHistEntry(
+ /* bootTimestamp= */ 1200L,
+ upperTimestamp,
+ /* totalPower= */ 80,
+ /* consumePower= */ 20,
+ /* foregroundUsageConsumePower= */ 4,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 6,
+ /* cachedUsageConsumePower= */ 5,
+ /* foregroundUsageTimeInMs= */ 200,
+ /* backgroundUsageTimeInMs= */ 300,
+ /* batteryLevel= */ 80);
final BatteryHistEntry newEntry =
BatteryHistEntry.interpolate(
slotTimestamp,
upperTimestamp,
ratio,
- /*lowerHistEntry=*/ null,
+ /* lowerHistEntry= */ null,
upperHistEntry);
assertBatteryHistEntry(
- newEntry, 3, upperHistEntry.mPercentOfTotal,
- /*bootTimestamp=*/ 1200 - 100,
- /*timestamp=*/ slotTimestamp,
- /*totalPower=*/ 0.5 * 80,
- /*consumePower=*/ 0.5 * 20,
- /*foregroundUsageConsumePower=*/ 0.5 * 4,
- /*foregroundServiceUsageConsumePower=*/ 0.5 * 5,
- /*backgroundUsageConsumePower=*/ 0.5 * 6,
- /*cachedUsageConsumePower=*/ 0.5 * 5,
- /*foregroundUsageTimeInMs=*/ Math.round(0.5 * 200),
- /*backgroundUsageTimeInMs=*/ Math.round(0.5 * 300),
- /*batteryLevel=*/ upperHistEntry.mBatteryLevel);
+ newEntry,
+ 3,
+ upperHistEntry.mPercentOfTotal,
+ /* bootTimestamp= */ 1200 - 100,
+ /* timestamp= */ slotTimestamp,
+ /* totalPower= */ 0.5 * 80,
+ /* consumePower= */ 0.5 * 20,
+ /* foregroundUsageConsumePower= */ 0.5 * 4,
+ /* foregroundServiceUsageConsumePower= */ 0.5 * 5,
+ /* backgroundUsageConsumePower= */ 0.5 * 6,
+ /* cachedUsageConsumePower= */ 0.5 * 5,
+ /* foregroundUsageTimeInMs= */ Math.round(0.5 * 200),
+ /* backgroundUsageTimeInMs= */ Math.round(0.5 * 300),
+ /* batteryLevel= */ upperHistEntry.mBatteryLevel);
}
private static BatteryHistEntry createEntry(int consumerType) {
@@ -280,26 +298,27 @@
private static ContentValues getContentValuesWithType(int consumerType) {
final ContentValues values = new ContentValues();
- values.put(BatteryHistEntry.KEY_CONSUMER_TYPE,
- Integer.valueOf(consumerType));
+ values.put(BatteryHistEntry.KEY_CONSUMER_TYPE, Integer.valueOf(consumerType));
return values;
}
private void assertBatteryHistEntry(
BatteryHistEntry entry, int drainType, double percentOfTotal) {
assertBatteryHistEntry(
- entry, drainType, percentOfTotal,
- /*bootTimestamp=*/ 101L,
- /*timestamp=*/ 10001L,
- /*totalPower=*/ 5.1,
- /*consumePower=*/ 1.1,
- /*foregroundUsageConsumePower=*/ 1.2,
- /*foregroundServiceUsageConsumePower=*/ 1.3,
- /*backgroundUsageConsumePower=*/ 1.4,
- /*cachedUsageConsumePower=*/ 1.5,
- /*foregroundUsageTimeInMs=*/ 1234L,
- /*backgroundUsageTimeInMs=*/ 5689L,
- /*batteryLevel=*/ 12);
+ entry,
+ drainType,
+ percentOfTotal,
+ /* bootTimestamp= */ 101L,
+ /* timestamp= */ 10001L,
+ /* totalPower= */ 5.1,
+ /* consumePower= */ 1.1,
+ /* foregroundUsageConsumePower= */ 1.2,
+ /* foregroundServiceUsageConsumePower= */ 1.3,
+ /* backgroundUsageConsumePower= */ 1.4,
+ /* cachedUsageConsumePower= */ 1.5,
+ /* foregroundUsageTimeInMs= */ 1234L,
+ /* backgroundUsageTimeInMs= */ 5689L,
+ /* batteryLevel= */ 12);
}
private void assertBatteryHistEntry(
@@ -321,8 +340,7 @@
assertThat(entry.mUid).isEqualTo(1001);
assertThat(entry.mUserId).isEqualTo(UserHandle.getUserId(1001));
assertThat(entry.mAppLabel).isEqualTo("Settings");
- assertThat(entry.mPackageName)
- .isEqualTo("com.google.android.settings.battery");
+ assertThat(entry.mPackageName).isEqualTo("com.google.android.settings.battery");
assertThat(entry.mIsHidden).isTrue();
assertThat(entry.mBootTimestamp).isEqualTo(bootTimestamp);
assertThat(entry.mTimestamp).isEqualTo(timestamp);
@@ -338,13 +356,10 @@
assertThat(entry.mForegroundUsageTimeInMs).isEqualTo(foregroundUsageTimeInMs);
assertThat(entry.mBackgroundUsageTimeInMs).isEqualTo(backgroundUsageTimeInMs);
assertThat(entry.mDrainType).isEqualTo(drainType);
- assertThat(entry.mConsumerType)
- .isEqualTo(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+ assertThat(entry.mConsumerType).isEqualTo(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
assertThat(entry.mBatteryLevel).isEqualTo(batteryLevel);
- assertThat(entry.mBatteryStatus)
- .isEqualTo(BatteryManager.BATTERY_STATUS_FULL);
- assertThat(entry.mBatteryHealth)
- .isEqualTo(BatteryManager.BATTERY_HEALTH_COLD);
+ assertThat(entry.mBatteryStatus).isEqualTo(BatteryManager.BATTERY_STATUS_FULL);
+ assertThat(entry.mBatteryHealth).isEqualTo(BatteryManager.BATTERY_HEALTH_COLD);
}
private BatteryHistEntry createBatteryHistEntry(
@@ -359,24 +374,24 @@
long foregroundUsageTimeInMs,
long backgroundUsageTimeInMs,
int batteryLevel) {
- final MatrixCursor cursor = new MatrixCursor(
- new String[]{
- BatteryHistEntry.KEY_UID,
- BatteryHistEntry.KEY_USER_ID,
- BatteryHistEntry.KEY_PACKAGE_NAME,
- BatteryHistEntry.KEY_TIMESTAMP,
- BatteryHistEntry.KEY_CONSUMER_TYPE,
- BatteryHistEntry.KEY_BATTERY_INFORMATION});
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ BatteryHistEntry.KEY_UID,
+ BatteryHistEntry.KEY_USER_ID,
+ BatteryHistEntry.KEY_PACKAGE_NAME,
+ BatteryHistEntry.KEY_TIMESTAMP,
+ BatteryHistEntry.KEY_CONSUMER_TYPE,
+ BatteryHistEntry.KEY_BATTERY_INFORMATION
+ });
DeviceBatteryState deviceBatteryState =
- DeviceBatteryState
- .newBuilder()
+ DeviceBatteryState.newBuilder()
.setBatteryLevel(batteryLevel)
.setBatteryStatus(BatteryManager.BATTERY_STATUS_FULL)
.setBatteryHealth(BatteryManager.BATTERY_HEALTH_COLD)
.build();
BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
+ BatteryInformation.newBuilder()
.setDeviceBatteryState(deviceBatteryState)
.setIsHidden(true)
.setBootTimestamp(bootTimestamp)
@@ -394,13 +409,14 @@
.setBackgroundUsageTimeInMs(backgroundUsageTimeInMs)
.build();
cursor.addRow(
- new Object[]{
- Long.valueOf(1001),
- Long.valueOf(UserHandle.getUserId(1001)),
- "com.google.android.settings.battery",
- Long.valueOf(timestamp),
- Integer.valueOf(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY),
- ConvertUtils.convertBatteryInformationToString(batteryInformation)});
+ new Object[] {
+ Long.valueOf(1001),
+ Long.valueOf(UserHandle.getUserId(1001)),
+ "com.google.android.settings.battery",
+ Long.valueOf(timestamp),
+ Integer.valueOf(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY),
+ ConvertUtils.convertBatteryInformationToString(batteryInformation)
+ });
cursor.moveToFirst();
return new BatteryHistEntry(cursor);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreferenceTest.java
index 9155c66..26fff37 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistoryPreferenceTest.java
@@ -38,14 +38,10 @@
@RunWith(RobolectricTestRunner.class)
public class BatteryHistoryPreferenceTest {
- @Mock
- private PreferenceViewHolder mViewHolder;
- @Mock
- private TextView mTextView;
- @Mock
- private BatteryChartView mDailyChartView;
- @Mock
- private BatteryChartView mHourlyChartView;
+ @Mock private PreferenceViewHolder mViewHolder;
+ @Mock private TextView mTextView;
+ @Mock private BatteryChartView mDailyChartView;
+ @Mock private BatteryChartView mHourlyChartView;
private BatteryHistoryPreference mBatteryHistoryPreference;
@Before
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryLevelDataTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryLevelDataTest.java
index 7dc4eab..712df9d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryLevelDataTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryLevelDataTest.java
@@ -42,129 +42,143 @@
@Test
public void getDailyTimestamps_allDataInOneHour_returnExpectedList() {
// Timezone GMT+8
- final List<Long> timestamps = List.of(
- 1640970006000L, // 2022-01-01 01:00:06
- 1640973608000L // 2022-01-01 01:00:08
- );
+ final List<Long> timestamps =
+ List.of(
+ 1640970006000L, // 2022-01-01 01:00:06
+ 1640973608000L // 2022-01-01 01:00:08
+ );
- final List<Long> expectedTimestamps = List.of(
- 1640970006000L, // 2022-01-01 01:00:06
- 1640973608000L // 2022-01-01 01:00:08
- );
+ final List<Long> expectedTimestamps =
+ List.of(
+ 1640970006000L, // 2022-01-01 01:00:06
+ 1640973608000L // 2022-01-01 01:00:08
+ );
assertThat(BatteryLevelData.getDailyTimestamps(timestamps)).isEqualTo(expectedTimestamps);
}
@Test
public void getDailyTimestamps_OneHourDataPerDay_returnExpectedList() {
// Timezone GMT+8
- final List<Long> timestamps = List.of(
- 1641049200000L, // 2022-01-01 23:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- 1641056400000L // 2022-01-02 01:00:00
- );
+ final List<Long> timestamps =
+ List.of(
+ 1641049200000L, // 2022-01-01 23:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641056400000L // 2022-01-02 01:00:00
+ );
- final List<Long> expectedTimestamps = List.of(
- 1641049200000L, // 2022-01-01 23:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- 1641056400000L // 2022-01-02 01:00:00
- );
+ final List<Long> expectedTimestamps =
+ List.of(
+ 1641049200000L, // 2022-01-01 23:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641056400000L // 2022-01-02 01:00:00
+ );
assertThat(BatteryLevelData.getDailyTimestamps(timestamps)).isEqualTo(expectedTimestamps);
}
@Test
public void getDailyTimestamps_OneDayData_returnExpectedList() {
// Timezone GMT+8
- final List<Long> timestamps = List.of(
- 1640966400000L, // 2022-01-01 00:00:00
- 1640970000000L, // 2022-01-01 01:00:00
- 1640973600000L, // 2022-01-01 02:00:00
- 1640977200000L, // 2022-01-01 03:00:00
- 1640980800000L // 2022-01-01 04:00:00
- );
+ final List<Long> timestamps =
+ List.of(
+ 1640966400000L, // 2022-01-01 00:00:00
+ 1640970000000L, // 2022-01-01 01:00:00
+ 1640973600000L, // 2022-01-01 02:00:00
+ 1640977200000L, // 2022-01-01 03:00:00
+ 1640980800000L // 2022-01-01 04:00:00
+ );
- final List<Long> expectedTimestamps = List.of(
- 1640966400000L, // 2022-01-01 00:00:00
- 1640980800000L // 2022-01-01 04:00:00
- );
+ final List<Long> expectedTimestamps =
+ List.of(
+ 1640966400000L, // 2022-01-01 00:00:00
+ 1640980800000L // 2022-01-01 04:00:00
+ );
assertThat(BatteryLevelData.getDailyTimestamps(timestamps)).isEqualTo(expectedTimestamps);
}
@Test
public void getDailyTimestamps_MultipleDaysData_returnExpectedList() {
// Timezone GMT+8
- final List<Long> timestamps = List.of(
- 1641045600000L, // 2022-01-01 22:00:00
- 1641060000000L, // 2022-01-02 02:00:00
- 1641160800000L, // 2022-01-03 06:00:00
- 1641232800000L // 2022-01-04 02:00:00
- );
+ final List<Long> timestamps =
+ List.of(
+ 1641045600000L, // 2022-01-01 22:00:00
+ 1641060000000L, // 2022-01-02 02:00:00
+ 1641160800000L, // 2022-01-03 06:00:00
+ 1641232800000L // 2022-01-04 02:00:00
+ );
- final List<Long> expectedTimestamps = List.of(
- 1641045600000L, // 2022-01-01 22:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- 1641139200000L, // 2022-01-03 00:00:00
- 1641225600000L, // 2022-01-04 00:00:00
- 1641232800000L // 2022-01-04 02:00:00
- );
+ final List<Long> expectedTimestamps =
+ List.of(
+ 1641045600000L, // 2022-01-01 22:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641139200000L, // 2022-01-03 00:00:00
+ 1641225600000L, // 2022-01-04 00:00:00
+ 1641232800000L // 2022-01-04 02:00:00
+ );
assertThat(BatteryLevelData.getDailyTimestamps(timestamps)).isEqualTo(expectedTimestamps);
}
@Test
public void getDailyTimestamps_FirstDayOneHourData_returnExpectedList() {
// Timezone GMT+8
- final List<Long> timestamps = List.of(
- 1641049200000L, // 2022-01-01 23:00:00
- 1641060000000L, // 2022-01-02 02:00:00
- 1641160800000L, // 2022-01-03 06:00:00
- 1641254400000L // 2022-01-04 08:00:00
- );
+ final List<Long> timestamps =
+ List.of(
+ 1641049200000L, // 2022-01-01 23:00:00
+ 1641060000000L, // 2022-01-02 02:00:00
+ 1641160800000L, // 2022-01-03 06:00:00
+ 1641254400000L // 2022-01-04 08:00:00
+ );
- final List<Long> expectedTimestamps = List.of(
- 1641049200000L, // 2022-01-01 23:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- 1641139200000L, // 2022-01-03 00:00:00
- 1641225600000L, // 2022-01-04 00:00:00
- 1641254400000L // 2022-01-04 08:00:00
- );
+ final List<Long> expectedTimestamps =
+ List.of(
+ 1641049200000L, // 2022-01-01 23:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641139200000L, // 2022-01-03 00:00:00
+ 1641225600000L, // 2022-01-04 00:00:00
+ 1641254400000L // 2022-01-04 08:00:00
+ );
assertThat(BatteryLevelData.getDailyTimestamps(timestamps)).isEqualTo(expectedTimestamps);
}
@Test
public void getDailyTimestamps_LastDayNoData_returnExpectedList() {
// Timezone GMT+8
- final List<Long> timestamps = List.of(
- 1640988000000L, // 2022-01-01 06:00:00
- 1641060000000L, // 2022-01-02 02:00:00
- 1641160800000L, // 2022-01-03 06:00:00
- 1641225600000L // 2022-01-04 00:00:00
- );
+ final List<Long> timestamps =
+ List.of(
+ 1640988000000L, // 2022-01-01 06:00:00
+ 1641060000000L, // 2022-01-02 02:00:00
+ 1641160800000L, // 2022-01-03 06:00:00
+ 1641225600000L // 2022-01-04 00:00:00
+ );
- final List<Long> expectedTimestamps = List.of(
- 1640988000000L, // 2022-01-01 06:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- 1641139200000L, // 2022-01-03 00:00:00
- 1641225600000L // 2022-01-04 00:00:00
- );
+ final List<Long> expectedTimestamps =
+ List.of(
+ 1640988000000L, // 2022-01-01 06:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641139200000L, // 2022-01-03 00:00:00
+ 1641225600000L // 2022-01-04 00:00:00
+ );
assertThat(BatteryLevelData.getDailyTimestamps(timestamps)).isEqualTo(expectedTimestamps);
}
@Test
public void getDailyTimestamps_LastDayOneHourData_returnExpectedList() {
// Timezone GMT+8
- final List<Long> timestamps = List.of(
- 1640988000000L, // 2022-01-01 06:00:00
- 1641060000000L, // 2022-01-02 02:00:00
- 1641160800000L, // 2022-01-03 06:00:00
- 1641229200000L // 2022-01-04 01:00:00
- );
+ final List<Long> timestamps =
+ List.of(
+ 1640988000000L, // 2022-01-01 06:00:00
+ 1641060000000L, // 2022-01-02 02:00:00
+ 1641160800000L, // 2022-01-03 06:00:00
+ 1641229200000L // 2022-01-04 01:00:00
+ );
- final List<Long> expectedTimestamps = List.of(
- 1640988000000L, // 2022-01-01 06:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- 1641139200000L, // 2022-01-03 00:00:00
- 1641225600000L, // 2022-01-04 00:00:00
- 1641229200000L // 2022-01-04 01:00:00
- );
+ final List<Long> expectedTimestamps =
+ List.of(
+ 1640988000000L, // 2022-01-01 06:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641139200000L, // 2022-01-03 00:00:00
+ 1641225600000L, // 2022-01-04 00:00:00
+ 1641229200000L // 2022-01-04 01:00:00
+ );
assertThat(BatteryLevelData.getDailyTimestamps(timestamps)).isEqualTo(expectedTimestamps);
}
@@ -172,21 +186,26 @@
public void combine_normalFlow_returnExpectedResult() {
final BatteryLevelData batteryLevelData =
new BatteryLevelData(Map.of(1691596800000L, 90, 1691604000000L, 80));
- final List<BatteryEvent> batteryLevelRecordEvents = List.of(
- BatteryEvent.newBuilder().setTimestamp(1691586000166L).setBatteryLevel(100)
- .setType(BatteryEventType.FULL_CHARGED).build(),
- BatteryEvent.newBuilder().setTimestamp(1691589600000L).setBatteryLevel(98)
- .setType(BatteryEventType.EVEN_HOUR).build());
+ final List<BatteryEvent> batteryLevelRecordEvents =
+ List.of(
+ BatteryEvent.newBuilder()
+ .setTimestamp(1691586000166L)
+ .setBatteryLevel(100)
+ .setType(BatteryEventType.FULL_CHARGED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(1691589600000L)
+ .setBatteryLevel(98)
+ .setType(BatteryEventType.EVEN_HOUR)
+ .build());
BatteryLevelData result =
BatteryLevelData.combine(batteryLevelData, batteryLevelRecordEvents);
assertThat(result.getDailyBatteryLevels().getTimestamps())
.isEqualTo(List.of(1691586000166L, 1691596800000L, 1691604000000L));
- assertThat(result.getDailyBatteryLevels().getLevels())
- .isEqualTo(List.of(100, 90, 80));
- assertThat(result.getHourlyBatteryLevelsPerDay())
- .hasSize(2);
+ assertThat(result.getDailyBatteryLevels().getLevels()).isEqualTo(List.of(100, 90, 80));
+ assertThat(result.getHourlyBatteryLevelsPerDay()).hasSize(2);
assertThat(result.getHourlyBatteryLevelsPerDay().get(0).getTimestamps())
.isEqualTo(List.of(1691586000166L, 1691589600000L, 1691596800000L));
assertThat(result.getHourlyBatteryLevelsPerDay().get(0).getLevels())
@@ -199,17 +218,22 @@
@Test
public void combine_existingBatteryLevelDataIsNull_returnExpectedResult() {
- final List<BatteryEvent> batteryLevelRecordEvents = List.of(
- BatteryEvent.newBuilder().setTimestamp(1691586000166L).setBatteryLevel(100)
- .setType(BatteryEventType.FULL_CHARGED).build(),
- BatteryEvent.newBuilder().setTimestamp(1691589600000L).setBatteryLevel(98)
- .setType(BatteryEventType.EVEN_HOUR).build());
+ final List<BatteryEvent> batteryLevelRecordEvents =
+ List.of(
+ BatteryEvent.newBuilder()
+ .setTimestamp(1691586000166L)
+ .setBatteryLevel(100)
+ .setType(BatteryEventType.FULL_CHARGED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(1691589600000L)
+ .setBatteryLevel(98)
+ .setType(BatteryEventType.EVEN_HOUR)
+ .build());
- BatteryLevelData result =
- BatteryLevelData.combine(null, batteryLevelRecordEvents);
+ BatteryLevelData result = BatteryLevelData.combine(null, batteryLevelRecordEvents);
- assertThat(result.getHourlyBatteryLevelsPerDay())
- .hasSize(1);
+ assertThat(result.getHourlyBatteryLevelsPerDay()).hasSize(1);
assertThat(result.getHourlyBatteryLevelsPerDay().get(0).getTimestamps())
.isEqualTo(List.of(1691586000166L, 1691589600000L));
assertThat(result.getHourlyBatteryLevelsPerDay().get(0).getLevels())
@@ -219,25 +243,31 @@
@Test
public void getIndexByTimestamps_returnExpectedResult() {
final BatteryLevelData batteryLevelData =
- new BatteryLevelData(Map.of(
- 1694354400000L, 1, // 2023-09-10 22:00:00
- 1694361600000L, 2, // 2023-09-11 00:00:00
- 1694368800000L, 3)); // 2023-09-11 02:00:00
+ new BatteryLevelData(
+ Map.of(
+ 1694354400000L, 1, // 2023-09-10 22:00:00
+ 1694361600000L, 2, // 2023-09-11 00:00:00
+ 1694368800000L, 3)); // 2023-09-11 02:00:00
final PowerAnomalyEvent event = BatteryTestUtils.createAppAnomalyEvent();
assertThat(batteryLevelData.getIndexByTimestamps(0L, 0L))
- .isEqualTo(Pair.create(BatteryChartViewModel.SELECTED_INDEX_INVALID,
- BatteryChartViewModel.SELECTED_INDEX_INVALID));
+ .isEqualTo(
+ Pair.create(
+ BatteryChartViewModel.SELECTED_INDEX_INVALID,
+ BatteryChartViewModel.SELECTED_INDEX_INVALID));
assertThat(batteryLevelData.getIndexByTimestamps(1694361600000L + 1L, 1694368800000L + 1L))
- .isEqualTo(Pair.create(BatteryChartViewModel.SELECTED_INDEX_INVALID,
- BatteryChartViewModel.SELECTED_INDEX_INVALID));
+ .isEqualTo(
+ Pair.create(
+ BatteryChartViewModel.SELECTED_INDEX_INVALID,
+ BatteryChartViewModel.SELECTED_INDEX_INVALID));
assertThat(batteryLevelData.getIndexByTimestamps(1694361600000L, 1694368800000L))
.isEqualTo(Pair.create(1, 0));
assertThat(batteryLevelData.getIndexByTimestamps(1694361600000L + 1L, 1694368800000L - 1L))
.isEqualTo(Pair.create(1, 0));
- assertThat(batteryLevelData.getIndexByTimestamps(
- event.getWarningItemInfo().getStartTimestamp(),
- event.getWarningItemInfo().getEndTimestamp()))
+ assertThat(
+ batteryLevelData.getIndexByTimestamps(
+ event.getWarningItemInfo().getStartTimestamp(),
+ event.getWarningItemInfo().getEndTimestamp()))
.isEqualTo(Pair.create(1, 0));
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
index 63cb1b3..91d8c7d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
@@ -61,19 +61,16 @@
private BatteryTipsController mBatteryTipsController;
private BatteryChartPreferenceController mBatteryChartPreferenceController;
- @Mock
- private View mFakeView;
- @Mock
- private BatteryUsageBreakdownController mBatteryUsageBreakdownController;
- @Mock
- private BatteryDiffEntry mFakeEntry;
+ @Mock private View mFakeView;
+ @Mock private BatteryUsageBreakdownController mBatteryUsageBreakdownController;
+ @Mock private BatteryDiffEntry mFakeEntry;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mFeatureFactory = FakeFeatureFactory.setupForTest();
- mBatteryTipsCardPreference = new BatteryTipsCardPreference(mContext, /*attrs=*/ null);
+ mBatteryTipsCardPreference = new BatteryTipsCardPreference(mContext, /* attrs= */ null);
mBatteryTipsController = new BatteryTipsController(mContext);
mBatteryChartPreferenceController =
spy(new BatteryChartPreferenceController(mContext, null, null));
@@ -85,17 +82,20 @@
mPowerUsageAdvanced.mBatteryTipsController = mBatteryTipsController;
mPowerUsageAdvanced.mBatteryChartPreferenceController = mBatteryChartPreferenceController;
mPowerUsageAdvanced.mBatteryUsageBreakdownController = mBatteryUsageBreakdownController;
- mPowerUsageAdvanced.mBatteryLevelData = Optional.of(new BatteryLevelData(Map.of(
- 1694354400000L, 1, // 2023-09-10 22:00:00
- 1694361600000L, 2, // 2023-09-11 00:00:00
- 1694368800000L, 3))); // 2023-09-11 02:00:00
+ mPowerUsageAdvanced.mBatteryLevelData =
+ Optional.of(
+ new BatteryLevelData(
+ Map.of(
+ 1694354400000L, 1, // 2023-09-10 22:00:00
+ 1694361600000L, 2, // 2023-09-11 00:00:00
+ 1694368800000L, 3))); // 2023-09-11 02:00:00
doReturn("TestEntriesKey").when(mFakeEntry).getKey();
}
@Test
public void constructor_returnExpectedResult() {
- assertThat(mBatteryTipsCardPreference.getLayoutResource()).isEqualTo(
- R.layout.battery_tips_card);
+ assertThat(mBatteryTipsCardPreference.getLayoutResource())
+ .isEqualTo(R.layout.battery_tips_card);
}
@Test
@@ -118,10 +118,13 @@
.isEqualTo(DisplaySettings.class.getName());
assertThat(intent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, -1))
.isEqualTo(SettingsEnums.DISPLAY);
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "BrightnessAnomaly");
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_ACCEPT, "BrightnessAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "BrightnessAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_BATTERY_TIPS_CARD_ACCEPT,
+ "BrightnessAnomaly");
}
@Test
@@ -140,10 +143,16 @@
assertThat(DatabaseUtils.getDismissedPowerAnomalyKeys(mContext)).hasSize(1);
assertThat(DatabaseUtils.getDismissedPowerAnomalyKeys(mContext))
.contains(PowerAnomalyKey.KEY_SCREEN_TIMEOUT.name());
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "ScreenTimeoutAnomaly");
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_DISMISS, "ScreenTimeoutAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW,
+ "ScreenTimeoutAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_BATTERY_TIPS_CARD_DISMISS,
+ "ScreenTimeoutAnomaly");
}
@Test
@@ -159,13 +168,12 @@
assertThat(mBatteryTipsCardPreference.isVisible()).isFalse();
verify(mContext, never()).startActivity(any(Intent.class));
- verify(mBatteryChartPreferenceController).onHighlightSlotIndexUpdate(
- eq(1), eq(0));
+ verify(mBatteryChartPreferenceController).onHighlightSlotIndexUpdate(eq(1), eq(0));
verify(mBatteryChartPreferenceController).selectHighlightSlotIndex();
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "AppAnomaly");
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_ACCEPT, "AppAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "AppAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_ACCEPT, "AppAnomaly");
}
@Test
@@ -180,12 +188,11 @@
assertThat(mBatteryTipsCardPreference.isVisible()).isFalse();
verify(mContext, never()).startActivity(any(Intent.class));
- verify(mBatteryChartPreferenceController).onHighlightSlotIndexUpdate(
- eq(1), eq(0));
+ verify(mBatteryChartPreferenceController).onHighlightSlotIndexUpdate(eq(1), eq(0));
verify(mBatteryChartPreferenceController, never()).selectHighlightSlotIndex();
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "AppAnomaly");
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_DISMISS, "AppAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "AppAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_DISMISS, "AppAnomaly");
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java
index b8afe98..91b2e15 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java
@@ -48,8 +48,7 @@
private FakeFeatureFactory mFeatureFactory;
private BatteryTipsController mBatteryTipsController;
- @Mock
- private BatteryTipsCardPreference mBatteryTipsCardPreference;
+ @Mock private BatteryTipsCardPreference mBatteryTipsCardPreference;
@Before
public void setUp() {
@@ -82,17 +81,17 @@
new AnomalyEventWrapper(mContext, event), false);
// Check pre-defined string
- verify(mBatteryTipsCardPreference).setTitle(
- "Turn on adaptive brightness to extend battery life");
+ verify(mBatteryTipsCardPreference)
+ .setTitle("Turn on adaptive brightness to extend battery life");
verify(mBatteryTipsCardPreference).setIconResourceId(R.drawable.ic_battery_tips_lightbulb);
- verify(mBatteryTipsCardPreference).setMainButtonStrokeColorResourceId(
- R.color.color_accent_selector);
+ verify(mBatteryTipsCardPreference)
+ .setMainButtonStrokeColorResourceId(R.color.color_accent_selector);
verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
// Check proto info
verify(mBatteryTipsCardPreference).setVisible(true);
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "BrightnessAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "BrightnessAnomaly");
}
@Test
@@ -105,25 +104,29 @@
verify(mBatteryTipsCardPreference).setTitle("Reduce screen timeout to extend battery life");
verify(mBatteryTipsCardPreference).setIconResourceId(R.drawable.ic_battery_tips_lightbulb);
- verify(mBatteryTipsCardPreference).setMainButtonStrokeColorResourceId(
- R.color.color_accent_selector);
+ verify(mBatteryTipsCardPreference)
+ .setMainButtonStrokeColorResourceId(R.color.color_accent_selector);
verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
verify(mBatteryTipsCardPreference).setVisible(true);
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "ScreenTimeoutAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW,
+ "ScreenTimeoutAnomaly");
}
@Test
public void handleBatteryTipsCardUpdated_screenTimeoutAnomalyHasTitle_showAnomaly() {
PowerAnomalyEvent event = BatteryTestUtils.createScreenTimeoutAnomalyEvent();
String testTitle = "TestTitle";
- event = event.toBuilder()
- .setWarningBannerInfo(
- event.getWarningBannerInfo().toBuilder()
- .setTitleString(testTitle)
- .build())
- .build();
+ event =
+ event.toBuilder()
+ .setWarningBannerInfo(
+ event.getWarningBannerInfo().toBuilder()
+ .setTitleString(testTitle)
+ .build())
+ .build();
when(mFeatureFactory.powerUsageFeatureProvider.isBatteryTipsEnabled()).thenReturn(true);
mBatteryTipsController.handleBatteryTipsCardUpdated(
@@ -131,13 +134,16 @@
verify(mBatteryTipsCardPreference).setTitle(testTitle);
verify(mBatteryTipsCardPreference).setIconResourceId(R.drawable.ic_battery_tips_lightbulb);
- verify(mBatteryTipsCardPreference).setMainButtonStrokeColorResourceId(
- R.color.color_accent_selector);
+ verify(mBatteryTipsCardPreference)
+ .setMainButtonStrokeColorResourceId(R.color.color_accent_selector);
verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
verify(mBatteryTipsCardPreference).setVisible(true);
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "ScreenTimeoutAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW,
+ "ScreenTimeoutAnomaly");
}
@Test
@@ -146,20 +152,18 @@
when(mFeatureFactory.powerUsageFeatureProvider.isBatteryTipsEnabled()).thenReturn(true);
AnomalyEventWrapper eventWrapper = new AnomalyEventWrapper(mContext, event);
- eventWrapper.setRelatedBatteryDiffEntry(
- new BatteryDiffEntry(mContext, "", "Chrome", 0));
+ eventWrapper.setRelatedBatteryDiffEntry(new BatteryDiffEntry(mContext, "", "Chrome", 0));
mBatteryTipsController.handleBatteryTipsCardUpdated(eventWrapper, false);
- verify(mBatteryTipsCardPreference).setTitle(
- "Chrome used more battery than usual");
- verify(mBatteryTipsCardPreference).setIconResourceId(
- R.drawable.ic_battery_tips_warning_icon);
- verify(mBatteryTipsCardPreference).setMainButtonStrokeColorResourceId(
- R.color.color_battery_anomaly_yellow_selector);
+ verify(mBatteryTipsCardPreference).setTitle("Chrome used more battery than usual");
+ verify(mBatteryTipsCardPreference)
+ .setIconResourceId(R.drawable.ic_battery_tips_warning_icon);
+ verify(mBatteryTipsCardPreference)
+ .setMainButtonStrokeColorResourceId(R.color.color_battery_anomaly_yellow_selector);
verify(mBatteryTipsCardPreference).setMainButtonLabel("Check");
verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
verify(mBatteryTipsCardPreference).setVisible(true);
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "AppAnomaly");
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, "AppAnomaly");
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
index a721ad4..fc30702 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
@@ -58,18 +58,12 @@
private static final String PREF_KEY2 = "pref_key2";
private static final String PREF_SUMMARY = "fake preference summary";
- @Mock
- private InstrumentedPreferenceFragment mFragment;
- @Mock
- private SettingsActivity mSettingsActivity;
- @Mock
- private PreferenceGroup mAppListPreferenceGroup;
- @Mock
- private Drawable mDrawable;
- @Mock
- private BatteryHistEntry mBatteryHistEntry;
- @Mock
- private AnomalyAppItemPreference mAnomalyAppItemPreference;
+ @Mock private InstrumentedPreferenceFragment mFragment;
+ @Mock private SettingsActivity mSettingsActivity;
+ @Mock private PreferenceGroup mAppListPreferenceGroup;
+ @Mock private Drawable mDrawable;
+ @Mock private BatteryHistEntry mBatteryHistEntry;
+ @Mock private AnomalyAppItemPreference mAnomalyAppItemPreference;
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
@@ -94,43 +88,51 @@
.getHideApplicationSet();
mBatteryUsageBreakdownController = createController();
mBatteryUsageBreakdownController.mAppListPreferenceGroup = mAppListPreferenceGroup;
- mBatteryDiffEntry = new BatteryDiffEntry(
- mContext,
- /*uid=*/ 0L,
- /*userId=*/ 0L,
- /*key=*/ "key",
- /*isHidden=*/ false,
- /*componentId=*/ -1,
- /*legacyPackageName=*/ null,
- /*legacyLabel=*/ null,
- /*consumerType=*/ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
- /*foregroundUsageTimeInMs=*/ 1,
- /*backgroundUsageTimeInMs=*/ 2,
- /*screenOnTimeInMs=*/ 0,
- /*consumePower=*/ 3,
- /*foregroundUsageConsumePower=*/ 0,
- /*foregroundServiceUsageConsumePower=*/ 1,
- /*backgroundUsageConsumePower=*/ 2,
- /*cachedUsageConsumePower=*/ 0);
+ mBatteryDiffEntry =
+ new BatteryDiffEntry(
+ mContext,
+ /* uid= */ 0L,
+ /* userId= */ 0L,
+ /* key= */ "key",
+ /* isHidden= */ false,
+ /* componentId= */ -1,
+ /* legacyPackageName= */ null,
+ /* legacyLabel= */ null,
+ /* consumerType= */ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 1,
+ /* backgroundUsageTimeInMs= */ 2,
+ /* screenOnTimeInMs= */ 0,
+ /* consumePower= */ 3,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 1,
+ /* backgroundUsageConsumePower= */ 2,
+ /* cachedUsageConsumePower= */ 0);
mBatteryDiffEntry = spy(mBatteryDiffEntry);
mBatteryUsageBreakdownController.mBatteryDiffData =
- new BatteryDiffData(mContext, /* startTimestamp= */ 0L, /* endTimestamp= */ 0L,
- /* startBatteryLevel= */ 0, /* endBatteryLevel= */ 0,
- /* screenOnTime= */ 0L, Arrays.asList(mBatteryDiffEntry), Arrays.asList(),
- Set.of(), Set.of(), /* isAccumulated= */ false);
+ new BatteryDiffData(
+ mContext,
+ /* startTimestamp= */ 0L,
+ /* endTimestamp= */ 0L,
+ /* startBatteryLevel= */ 0,
+ /* endBatteryLevel= */ 0,
+ /* screenOnTime= */ 0L,
+ Arrays.asList(mBatteryDiffEntry),
+ Arrays.asList(),
+ Set.of(),
+ Set.of(),
+ /* isAccumulated= */ false);
BatteryDiffEntry.clearCache();
// Adds fake testing data.
BatteryDiffEntry.sResourceCache.put(
"fakeBatteryDiffEntryKey",
- new BatteryEntry.NameAndIcon("fakeName", /*icon=*/ null, /*iconId=*/ 1));
+ new BatteryEntry.NameAndIcon("fakeName", /* icon= */ null, /* iconId= */ 1));
doReturn(mAnomalyAppItemPreference).when(mAppListPreferenceGroup).findPreference(PREF_KEY);
}
@Test
public void onDestroy_clearPreferenceCacheAndPreferenceGroupRemoveAll() {
// Ensures the testing environment is correct.
- mBatteryUsageBreakdownController.mPreferenceCache.put(
- PREF_KEY, mAnomalyAppItemPreference);
+ mBatteryUsageBreakdownController.mPreferenceCache.put(PREF_KEY, mAnomalyAppItemPreference);
assertThat(mBatteryUsageBreakdownController.mPreferenceCache).hasSize(1);
mBatteryUsageBreakdownController.onDestroy();
@@ -158,8 +160,8 @@
// Verifies the preference cache.
final PowerGaugePreference pref =
- (PowerGaugePreference) mBatteryUsageBreakdownController.mPreferenceCache
- .get(PREF_KEY);
+ (PowerGaugePreference)
+ mBatteryUsageBreakdownController.mPreferenceCache.get(PREF_KEY);
assertThat(pref).isNotNull();
// Verifies the added preference configuration.
verify(mAppListPreferenceGroup).addPreference(pref);
@@ -218,8 +220,10 @@
@Test
public void handlePreferenceTreeClick_notPowerGaugePreference_returnFalse() {
- assertThat(mBatteryUsageBreakdownController
- .handlePreferenceTreeClick(mAppListPreferenceGroup)).isFalse();
+ assertThat(
+ mBatteryUsageBreakdownController.handlePreferenceTreeClick(
+ mAppListPreferenceGroup))
+ .isFalse();
verify(mMetricsFeatureProvider, never())
.action(mContext, SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM);
@@ -232,8 +236,10 @@
mBatteryDiffEntry.mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;
doReturn(mBatteryDiffEntry).when(mAnomalyAppItemPreference).getBatteryDiffEntry();
- assertThat(mBatteryUsageBreakdownController.handlePreferenceTreeClick(
- mAnomalyAppItemPreference)).isTrue();
+ assertThat(
+ mBatteryUsageBreakdownController.handlePreferenceTreeClick(
+ mAnomalyAppItemPreference))
+ .isTrue();
verify(mMetricsFeatureProvider)
.action(
SettingsEnums.OPEN_BATTERY_USAGE,
@@ -248,8 +254,10 @@
mBatteryDiffEntry.mConsumerType = ConvertUtils.CONSUMER_TYPE_UID_BATTERY;
doReturn(mBatteryDiffEntry).when(mAnomalyAppItemPreference).getBatteryDiffEntry();
- assertThat(mBatteryUsageBreakdownController.handlePreferenceTreeClick(
- mAnomalyAppItemPreference)).isTrue();
+ assertThat(
+ mBatteryUsageBreakdownController.handlePreferenceTreeClick(
+ mAnomalyAppItemPreference))
+ .isTrue();
verify(mMetricsFeatureProvider)
.action(
SettingsEnums.OPEN_BATTERY_USAGE,
@@ -262,11 +270,12 @@
@Test
public void setPreferencePercent_lessThanThreshold_expectedFormat() {
final PowerGaugePreference pref = new PowerGaugePreference(mContext);
- final BatteryDiffEntry batteryDiffEntry = createBatteryDiffEntry(
- /*isSystem=*/ true,
- /*screenOnTimeInMs=*/ 0,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0);
+ final BatteryDiffEntry batteryDiffEntry =
+ createBatteryDiffEntry(
+ /* isSystem= */ true,
+ /* screenOnTimeInMs= */ 0,
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0);
batteryDiffEntry.mConsumePower = 0.8;
batteryDiffEntry.setTotalConsumePower(100);
mBatteryUsageBreakdownController.mPercentLessThanThresholdText = "< 1%";
@@ -279,11 +288,12 @@
@Test
public void setPreferencePercent_greaterThanThreshold_expectedFormat() {
final PowerGaugePreference pref = new PowerGaugePreference(mContext);
- final BatteryDiffEntry batteryDiffEntry = createBatteryDiffEntry(
- /*isSystem=*/ true,
- /*screenOnTimeInMs=*/ 0,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0);
+ final BatteryDiffEntry batteryDiffEntry =
+ createBatteryDiffEntry(
+ /* isSystem= */ true,
+ /* screenOnTimeInMs= */ 0,
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0);
batteryDiffEntry.mConsumePower = 16;
batteryDiffEntry.setTotalConsumePower(100);
mBatteryUsageBreakdownController.mPercentLessThanThresholdText = "< 1%";
@@ -299,11 +309,12 @@
pref.setSummary(PREF_SUMMARY);
mBatteryUsageBreakdownController.setPreferenceSummary(
- pref, createBatteryDiffEntry(
- /*isSystem=*/ true,
- /*screenOnTimeInMs=*/ 0,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0));
+ pref,
+ createBatteryDiffEntry(
+ /* isSystem= */ true,
+ /* screenOnTimeInMs= */ 0,
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0));
assertThat(pref.getSummary().toString().isEmpty()).isTrue();
}
@@ -313,11 +324,12 @@
pref.setSummary(PREF_SUMMARY);
mBatteryUsageBreakdownController.setPreferenceSummary(
- pref, createBatteryDiffEntry(
- /*isSystem=*/ true,
- /*screenOnTimeInMs=*/ 0,
- /*foregroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS - 1,
- /*backgroundUsageTimeInMs=*/ 0));
+ pref,
+ createBatteryDiffEntry(
+ /* isSystem= */ true,
+ /* screenOnTimeInMs= */ 0,
+ /* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1,
+ /* backgroundUsageTimeInMs= */ 0));
assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a min");
}
@@ -327,11 +339,12 @@
pref.setSummary(PREF_SUMMARY);
mBatteryUsageBreakdownController.setPreferenceSummary(
- pref, createBatteryDiffEntry(
- /*isSystem=*/ true,
- /*screenOnTimeInMs=*/ 0,
- /*foregroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS * 2,
- /*backgroundUsageTimeInMs=*/ 0));
+ pref,
+ createBatteryDiffEntry(
+ /* isSystem= */ true,
+ /* screenOnTimeInMs= */ 0,
+ /* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS * 2,
+ /* backgroundUsageTimeInMs= */ 0));
assertThat(pref.getSummary().toString()).isEqualTo("Total: 2 min");
}
@@ -341,11 +354,12 @@
pref.setSummary(PREF_SUMMARY);
mBatteryUsageBreakdownController.setPreferenceSummary(
- pref, createBatteryDiffEntry(
- /*isSystem=*/ false,
- /*screenOnTimeInMs=*/ 0,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0));
+ pref,
+ createBatteryDiffEntry(
+ /* isSystem= */ false,
+ /* screenOnTimeInMs= */ 0,
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0));
assertThat(pref.getSummary().toString().isEmpty()).isTrue();
}
@@ -355,11 +369,12 @@
pref.setSummary(PREF_SUMMARY);
mBatteryUsageBreakdownController.setPreferenceSummary(
- pref, createBatteryDiffEntry(
- /*isSystem=*/ false,
- /*screenOnTimeInMs=*/ 0,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS));
+ pref,
+ createBatteryDiffEntry(
+ /* isSystem= */ false,
+ /* screenOnTimeInMs= */ 0,
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS));
assertThat(pref.getSummary().toString()).isEqualTo("Background: 1 min");
}
@@ -369,11 +384,12 @@
pref.setSummary(PREF_SUMMARY);
mBatteryUsageBreakdownController.setPreferenceSummary(
- pref, createBatteryDiffEntry(
- /*isSystem=*/ false,
- /*screenOnTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0));
+ pref,
+ createBatteryDiffEntry(
+ /* isSystem= */ false,
+ /* screenOnTimeInMs= */ DateUtils.MINUTE_IN_MILLIS,
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0));
assertThat(pref.getSummary().toString()).isEqualTo("Screen time: 1 min");
}
@@ -383,21 +399,28 @@
pref.setSummary(PREF_SUMMARY);
mBatteryUsageBreakdownController.setPreferenceSummary(
- pref, createBatteryDiffEntry(
- /*isSystem=*/ false,
- /*screenOnTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS - 1,
- /*foregroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS - 1,
- /*backgroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS - 1));
- assertThat(pref.getSummary().toString()).isEqualTo(
- "Screen time: less than a min\nBackground: less than a min");
+ pref,
+ createBatteryDiffEntry(
+ /* isSystem= */ false,
+ /* screenOnTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1,
+ /* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1,
+ /* backgroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1));
+ assertThat(pref.getSummary().toString())
+ .isEqualTo("Screen time: less than a min\nBackground: less than a min");
}
- private BatteryDiffEntry createBatteryDiffEntry(boolean isSystem, long screenOnTimeInMs,
- long foregroundUsageTimeInMs, long backgroundUsageTimeInMs) {
+ private BatteryDiffEntry createBatteryDiffEntry(
+ boolean isSystem,
+ long screenOnTimeInMs,
+ long foregroundUsageTimeInMs,
+ long backgroundUsageTimeInMs) {
final ContentValues contentValues = new ContentValues();
- contentValues.put(BatteryHistEntry.KEY_CONSUMER_TYPE, Integer.valueOf(
- isSystem ? ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY
- : ConvertUtils.CONSUMER_TYPE_UID_BATTERY));
+ contentValues.put(
+ BatteryHistEntry.KEY_CONSUMER_TYPE,
+ Integer.valueOf(
+ isSystem
+ ? ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY
+ : ConvertUtils.CONSUMER_TYPE_UID_BATTERY));
contentValues.put(BatteryHistEntry.KEY_USER_ID, Integer.valueOf(1001));
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(contentValues);
return new BatteryDiffEntry(
@@ -413,17 +436,17 @@
foregroundUsageTimeInMs,
backgroundUsageTimeInMs,
screenOnTimeInMs,
- /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0,
- /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0,
- /*cachedUsageConsumePower=*/ 0);
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0);
}
private BatteryUsageBreakdownController createController() {
final BatteryUsageBreakdownController controller =
new BatteryUsageBreakdownController(
- mContext, /*lifecycle=*/ null, mSettingsActivity, mFragment);
+ mContext, /* lifecycle= */ null, mSettingsActivity, mFragment);
controller.mPrefContext = mContext;
return controller;
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
index c4cb89e..af0cb91 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
@@ -48,8 +48,7 @@
private BatteryUsageBroadcastReceiver mBatteryUsageBroadcastReceiver;
private FakeFeatureFactory mFakeFeatureFactory;
- @Mock
- private PackageManager mPackageManager;
+ @Mock private PackageManager mPackageManager;
@Before
public void setUp() {
@@ -72,8 +71,8 @@
public void onReceive_workProfile_doNothing() {
BatteryTestUtils.setWorkProfile(mContext);
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
}
@@ -84,11 +83,12 @@
.thenReturn(Intent.ACTION_BATTERY_LEVEL_CHANGED);
when(mFakeFeatureFactory.powerUsageFeatureProvider.delayHourlyJobWhenBooting())
.thenReturn(true);
- doReturn(getBatteryIntent(/*level=*/ 20, BatteryManager.BATTERY_STATUS_UNKNOWN))
- .when(mContext).registerReceiver(any(), any());
+ doReturn(getBatteryIntent(/* level= */ 20, BatteryManager.BATTERY_STATUS_UNKNOWN))
+ .when(mContext)
+ .registerReceiver(any(), any());
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
assertSharedPreferences(Intent.ACTION_BATTERY_LEVEL_CHANGED);
@@ -101,14 +101,15 @@
when(mFakeFeatureFactory.powerUsageFeatureProvider.delayHourlyJobWhenBooting())
.thenReturn(true);
// Make sure isCharged returns true.
- doReturn(getBatteryIntent(/*level=*/ 100, BatteryManager.BATTERY_STATUS_FULL))
- .when(mContext).registerReceiver(any(), any());
+ doReturn(getBatteryIntent(/* level= */ 100, BatteryManager.BATTERY_STATUS_FULL))
+ .when(mContext)
+ .registerReceiver(any(), any());
// Make sure broadcast will be sent with delay.
BatteryUsageBroadcastReceiver.sBroadcastDelayFromBoot =
SystemClock.elapsedRealtime() + 5 * DateUtils.MINUTE_IN_MILLIS;
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
assertSharedPreferences(Intent.ACTION_BATTERY_LEVEL_CHANGED);
@@ -121,13 +122,14 @@
when(mFakeFeatureFactory.powerUsageFeatureProvider.delayHourlyJobWhenBooting())
.thenReturn(true);
// Make sure isCharged returns true.
- doReturn(getBatteryIntent(/*level=*/ 100, BatteryManager.BATTERY_STATUS_UNKNOWN))
- .when(mContext).registerReceiver(any(), any());
+ doReturn(getBatteryIntent(/* level= */ 100, BatteryManager.BATTERY_STATUS_UNKNOWN))
+ .when(mContext)
+ .registerReceiver(any(), any());
BatteryUsageBroadcastReceiver.sBroadcastDelayFromBoot =
SystemClock.elapsedRealtime() - 5 * DateUtils.MINUTE_IN_MILLIS;
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
assertSharedPreferences(Intent.ACTION_BATTERY_LEVEL_CHANGED);
@@ -140,13 +142,14 @@
when(mFakeFeatureFactory.powerUsageFeatureProvider.delayHourlyJobWhenBooting())
.thenReturn(true);
// Make sure isCharged returns true.
- doReturn(getBatteryIntent(/*level=*/ 100, BatteryManager.BATTERY_STATUS_UNKNOWN))
- .when(mContext).registerReceiver(any(), any());
+ doReturn(getBatteryIntent(/* level= */ 100, BatteryManager.BATTERY_STATUS_UNKNOWN))
+ .when(mContext)
+ .registerReceiver(any(), any());
BatteryUsageBroadcastReceiver.sBroadcastDelayFromBoot =
SystemClock.elapsedRealtime() - 5 * DateUtils.MINUTE_IN_MILLIS;
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isTrue();
assertSharedPreferences(Intent.ACTION_BATTERY_LEVEL_CHANGED);
@@ -158,11 +161,12 @@
.thenReturn(Intent.ACTION_POWER_DISCONNECTED);
when(mFakeFeatureFactory.powerUsageFeatureProvider.delayHourlyJobWhenBooting())
.thenReturn(false);
- doReturn(getBatteryIntent(/*level=*/ 20, BatteryManager.BATTERY_STATUS_UNKNOWN))
- .when(mContext).registerReceiver(any(), any());
+ doReturn(getBatteryIntent(/* level= */ 20, BatteryManager.BATTERY_STATUS_UNKNOWN))
+ .when(mContext)
+ .registerReceiver(any(), any());
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
@@ -175,14 +179,15 @@
when(mFakeFeatureFactory.powerUsageFeatureProvider.delayHourlyJobWhenBooting())
.thenReturn(false);
// Make sure isCharged returns true.
- doReturn(getBatteryIntent(/*level=*/ 100, BatteryManager.BATTERY_STATUS_FULL))
- .when(mContext).registerReceiver(any(), any());
+ doReturn(getBatteryIntent(/* level= */ 100, BatteryManager.BATTERY_STATUS_FULL))
+ .when(mContext)
+ .registerReceiver(any(), any());
// Make sure broadcast will be sent with delay.
BatteryUsageBroadcastReceiver.sBroadcastDelayFromBoot =
SystemClock.elapsedRealtime() + 5 * DateUtils.MINUTE_IN_MILLIS;
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isTrue();
assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
@@ -195,13 +200,14 @@
when(mFakeFeatureFactory.powerUsageFeatureProvider.delayHourlyJobWhenBooting())
.thenReturn(false);
// Make sure isCharged returns true.
- doReturn(getBatteryIntent(/*level=*/ 100, BatteryManager.BATTERY_STATUS_UNKNOWN))
- .when(mContext).registerReceiver(any(), any());
+ doReturn(getBatteryIntent(/* level= */ 100, BatteryManager.BATTERY_STATUS_UNKNOWN))
+ .when(mContext)
+ .registerReceiver(any(), any());
BatteryUsageBroadcastReceiver.sBroadcastDelayFromBoot =
SystemClock.elapsedRealtime() - 5 * DateUtils.MINUTE_IN_MILLIS;
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
@@ -214,13 +220,14 @@
when(mFakeFeatureFactory.powerUsageFeatureProvider.delayHourlyJobWhenBooting())
.thenReturn(false);
// Make sure isCharged returns true.
- doReturn(getBatteryIntent(/*level=*/ 100, BatteryManager.BATTERY_STATUS_UNKNOWN))
- .when(mContext).registerReceiver(any(), any());
+ doReturn(getBatteryIntent(/* level= */ 100, BatteryManager.BATTERY_STATUS_UNKNOWN))
+ .when(mContext)
+ .registerReceiver(any(), any());
BatteryUsageBroadcastReceiver.sBroadcastDelayFromBoot =
SystemClock.elapsedRealtime() - 5 * DateUtils.MINUTE_IN_MILLIS;
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
- new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isTrue();
assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
@@ -234,12 +241,12 @@
/*packageName*/ "com.android.testing_package", Boolean.valueOf(true));
assertThat(BatteryDiffEntry.sValidForRestriction).isNotEmpty();
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext,
new Intent(BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA));
assertThat(BatteryDiffEntry.sValidForRestriction).isEmpty();
- assertSharedPreferences(
- BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA);
+ assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA);
}
@Test
@@ -250,12 +257,12 @@
/*packageName*/ "com.android.testing_package", Boolean.valueOf(true));
assertThat(BatteryDiffEntry.sValidForRestriction).isNotEmpty();
- mBatteryUsageBroadcastReceiver.onReceive(mContext,
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext,
new Intent(BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA));
assertThat(BatteryDiffEntry.sValidForRestriction).isNotEmpty();
- assertSharedPreferences(
- BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA);
+ assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA);
}
private static Intent getBatteryIntent(int level, int status) {
@@ -267,7 +274,6 @@
}
private void assertSharedPreferences(String preferenceKey) {
- assertThat(DatabaseUtils.getSharedPreferences(mContext).contains(preferenceKey))
- .isTrue();
+ assertThat(DatabaseUtils.getSharedPreferences(mContext).contains(preferenceKey)).isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java
index 999a921..95b950f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java
@@ -66,7 +66,7 @@
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mProvider = new BatteryUsageContentProvider();
- mProvider.attachInfo(mContext, /*info=*/ null);
+ mProvider.attachInfo(mContext, /* info= */ null);
BatteryTestUtils.setUpBatteryStateDatabase(mContext);
}
@@ -95,11 +95,14 @@
IllegalArgumentException.class,
() ->
mProvider.query(
- uri, /*strings=*/ null, /*s=*/ null, /*strings1=*/ null,
- /*s1=*/ null));
+ uri,
+ /* strings= */ null,
+ /* s= */ null,
+ /* strings1= */ null,
+ /* s1= */ null));
assertThrows(
IllegalArgumentException.class,
- () -> mProvider.insert(uri, /*contentValues=*/ null));
+ () -> mProvider.insert(uri, /* contentValues= */ null));
}
@Test
@@ -116,11 +119,14 @@
IllegalArgumentException.class,
() ->
mProvider.query(
- uri, /*strings=*/ null, /*s=*/ null, /*strings1=*/ null,
- /*s1=*/ null));
+ uri,
+ /* strings= */ null,
+ /* s= */ null,
+ /* strings1= */ null,
+ /* s1= */ null));
assertThrows(
IllegalArgumentException.class,
- () -> mProvider.insert(uri, /*contentValues=*/ null));
+ () -> mProvider.insert(uri, /* contentValues= */ null));
}
@Test
@@ -128,7 +134,8 @@
mProvider.onCreate();
ContentValues values = new ContentValues();
values.put(BatteryEventEntity.KEY_TIMESTAMP, 10001L);
- values.put(BatteryEventEntity.KEY_BATTERY_EVENT_TYPE,
+ values.put(
+ BatteryEventEntity.KEY_BATTERY_EVENT_TYPE,
BatteryEventType.FULL_CHARGED.getNumber());
values.put(BatteryEventEntity.KEY_BATTERY_LEVEL, 100);
mProvider.insert(DatabaseUtils.BATTERY_EVENT_URI, values);
@@ -263,15 +270,13 @@
public void insert_batteryState_returnsExpectedResult() {
mProvider.onCreate();
final DeviceBatteryState deviceBatteryState =
- DeviceBatteryState
- .newBuilder()
+ DeviceBatteryState.newBuilder()
.setBatteryLevel(51)
.setBatteryStatus(2)
.setBatteryHealth(3)
.build();
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
+ BatteryInformation.newBuilder()
.setDeviceBatteryState(deviceBatteryState)
.setAppLabel("Settings")
.setIsHidden(true)
@@ -318,17 +323,13 @@
public void insert_partialFieldsContentValues_returnsExpectedResult() {
mProvider.onCreate();
final DeviceBatteryState deviceBatteryState =
- DeviceBatteryState
- .newBuilder()
+ DeviceBatteryState.newBuilder()
.setBatteryLevel(52)
.setBatteryStatus(3)
.setBatteryHealth(2)
.build();
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
- .setDeviceBatteryState(deviceBatteryState)
- .build();
+ BatteryInformation.newBuilder().setDeviceBatteryState(deviceBatteryState).build();
final String expectedBatteryInformationString =
ConvertUtils.convertBatteryInformationToString(batteryInformation);
final ContentValues values = new ContentValues();
@@ -381,7 +382,8 @@
mProvider.onCreate();
ContentValues values = new ContentValues();
values.put(BatteryEventEntity.KEY_TIMESTAMP, 10001L);
- values.put(BatteryEventEntity.KEY_BATTERY_EVENT_TYPE,
+ values.put(
+ BatteryEventEntity.KEY_BATTERY_EVENT_TYPE,
BatteryEventType.POWER_CONNECTED.getNumber());
values.put(BatteryEventEntity.KEY_BATTERY_LEVEL, 66);
@@ -393,24 +395,26 @@
BatteryStateDatabase.getInstance(mContext).batteryEventDao().getAll();
assertThat(entities).hasSize(1);
assertThat(entities.get(0).timestamp).isEqualTo(10001L);
- assertThat(entities.get(0).batteryEventType).isEqualTo(
- BatteryEventType.POWER_CONNECTED.getNumber());
+ assertThat(entities.get(0).batteryEventType)
+ .isEqualTo(BatteryEventType.POWER_CONNECTED.getNumber());
assertThat(entities.get(0).batteryLevel).isEqualTo(66);
- final Cursor cursor1 = getCursorOfBatteryEvents(
- 0L, List.of(BatteryEventType.POWER_CONNECTED.getNumber()));
+ final Cursor cursor1 =
+ getCursorOfBatteryEvents(0L, List.of(BatteryEventType.POWER_CONNECTED.getNumber()));
assertThat(cursor1.getCount()).isEqualTo(1);
cursor1.moveToFirst();
assertThat(cursor1.getLong(cursor1.getColumnIndex(BatteryEventEntity.KEY_TIMESTAMP)))
.isEqualTo(10001L);
assertThat(
- cursor1.getInt(cursor1.getColumnIndex(BatteryEventEntity.KEY_BATTERY_EVENT_TYPE)))
+ cursor1.getInt(
+ cursor1.getColumnIndex(BatteryEventEntity.KEY_BATTERY_EVENT_TYPE)))
.isEqualTo(BatteryEventType.POWER_CONNECTED.getNumber());
assertThat(cursor1.getInt(cursor1.getColumnIndex(BatteryEventEntity.KEY_BATTERY_LEVEL)))
.isEqualTo(66);
- final Cursor cursor2 = getCursorOfBatteryEvents(
- 0L, List.of(BatteryEventType.POWER_DISCONNECTED.getNumber()));
+ final Cursor cursor2 =
+ getCursorOfBatteryEvents(
+ 0L, List.of(BatteryEventType.POWER_DISCONNECTED.getNumber()));
assertThat(cursor2.getCount()).isEqualTo(0);
}
@@ -435,8 +439,11 @@
cursor1.moveToFirst();
assertThat(cursor1.getLong(cursor1.getColumnIndex(BatteryUsageSlotEntity.KEY_TIMESTAMP)))
.isEqualTo(10001L);
- assertThat(cursor1.getString(cursor1.getColumnIndex(
- BatteryUsageSlotEntity.KEY_BATTERY_USAGE_SLOT))).isEqualTo("TEST_STRING");
+ assertThat(
+ cursor1.getString(
+ cursor1.getColumnIndex(
+ BatteryUsageSlotEntity.KEY_BATTERY_USAGE_SLOT)))
+ .isEqualTo("TEST_STRING");
final Cursor cursor2 = getCursorOfBatteryUsageSlots(10002L);
assertThat(cursor2.getCount()).isEqualTo(0);
@@ -446,7 +453,7 @@
public void delete_throwsUnsupportedOperationException() {
assertThrows(
UnsupportedOperationException.class,
- () -> mProvider.delete(/*uri=*/ null, /*s=*/ null, /*strings=*/ null));
+ () -> mProvider.delete(/* uri= */ null, /* s= */ null, /* strings= */ null));
}
@Test
@@ -455,13 +462,13 @@
UnsupportedOperationException.class,
() ->
mProvider.update(
- /*uri=*/ null, /*contentValues=*/ null, /*s=*/ null,
- /*strings=*/ null));
+ /* uri= */ null,
+ /* contentValues= */ null,
+ /* s= */ null,
+ /* strings= */ null));
}
- private Cursor insertBatteryState(
- Duration currentTime,
- String queryTimestamp)
+ private Cursor insertBatteryState(Duration currentTime, String queryTimestamp)
throws Exception {
mProvider.onCreate();
final FakeClock fakeClock = new FakeClock();
@@ -470,20 +477,17 @@
final long currentTimestamp = currentTime.toMillis();
// Inserts some valid testing data.
BatteryTestUtils.insertDataToBatteryStateTable(
- mContext, currentTimestamp - 6, PACKAGE_NAME1,
- /*isFullChargeStart=*/ true);
+ mContext, currentTimestamp - 6, PACKAGE_NAME1, /* isFullChargeStart= */ true);
BatteryTestUtils.insertDataToBatteryStateTable(
mContext, currentTimestamp - 2, PACKAGE_NAME2);
- BatteryTestUtils.insertDataToBatteryStateTable(
- mContext, currentTimestamp, PACKAGE_NAME3);
+ BatteryTestUtils.insertDataToBatteryStateTable(mContext, currentTimestamp, PACKAGE_NAME3);
final Uri batteryStateQueryContentUri =
new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(DatabaseUtils.AUTHORITY)
.appendPath(DatabaseUtils.BATTERY_STATE_TABLE)
- .appendQueryParameter(
- DatabaseUtils.QUERY_KEY_TIMESTAMP, queryTimestamp)
+ .appendQueryParameter(DatabaseUtils.QUERY_KEY_TIMESTAMP, queryTimestamp)
.build();
final Cursor cursor = query(batteryStateQueryContentUri);
@@ -532,17 +536,17 @@
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(DatabaseUtils.AUTHORITY)
.appendPath(DatabaseUtils.APP_USAGE_LATEST_TIMESTAMP_PATH)
- .appendQueryParameter(
- DatabaseUtils.QUERY_KEY_USERID, Long.toString(userId))
+ .appendQueryParameter(DatabaseUtils.QUERY_KEY_USERID, Long.toString(userId))
.build();
return query(appUsageLatestTimestampQueryContentUri);
}
private Cursor getCursorOfAppUsage(final List<Long> userIds, final long queryTimestamp) {
- final String queryUserIdString = userIds.stream()
- .map(userId -> String.valueOf(userId))
- .collect(Collectors.joining(","));
+ final String queryUserIdString =
+ userIds.stream()
+ .map(userId -> String.valueOf(userId))
+ .collect(Collectors.joining(","));
final Uri appUsageEventUri =
new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
@@ -558,9 +562,10 @@
private Cursor getCursorOfBatteryEvents(
final long queryTimestamp, final List<Integer> batteryEventTypes) {
- final String batteryEventTypesString = batteryEventTypes.stream()
- .map(type -> String.valueOf(type))
- .collect(Collectors.joining(","));
+ final String batteryEventTypesString =
+ batteryEventTypes.stream()
+ .map(type -> String.valueOf(type))
+ .collect(Collectors.joining(","));
final Uri batteryEventUri =
new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
@@ -590,6 +595,6 @@
private Cursor query(Uri uri) {
return mProvider.query(
- uri, /*strings=*/ null, /*s=*/ null, /*strings1=*/ null, /*s1=*/ null);
+ uri, /* strings= */ null, /* s= */ null, /* strings1= */ null, /* s1= */ null);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoaderTest.java
index f3965fd..723a138 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoaderTest.java
@@ -52,28 +52,22 @@
public final class BatteryUsageDataLoaderTest {
private Context mContext;
- @Mock
- private ContentResolver mMockContentResolver;
- @Mock
- private BatteryStatsManager mBatteryStatsManager;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private UserManager mUserManager;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
- @Mock
- private BatteryEntry mMockBatteryEntry;
- @Captor
- private ArgumentCaptor<BatteryUsageStatsQuery> mStatsQueryCaptor;
+ @Mock private ContentResolver mMockContentResolver;
+ @Mock private BatteryStatsManager mBatteryStatsManager;
+ @Mock private PackageManager mPackageManager;
+ @Mock private UserManager mUserManager;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
+ @Mock private BatteryEntry mMockBatteryEntry;
+ @Captor private ArgumentCaptor<BatteryUsageStatsQuery> mStatsQueryCaptor;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mContext).when(mContext).getApplicationContext();
- doReturn(mBatteryStatsManager).when(mContext).getSystemService(
- Context.BATTERY_STATS_SERVICE);
+ doReturn(mBatteryStatsManager)
+ .when(mContext)
+ .getSystemService(Context.BATTERY_STATS_SERVICE);
doReturn(mPackageManager).when(mContext).getPackageManager();
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(mMockContentResolver).when(mContext).getContentResolver();
@@ -88,11 +82,10 @@
.thenReturn(mBatteryUsageStats);
BatteryUsageDataLoader.sFakeBatteryEntryListSupplier = () -> batteryEntryList;
- BatteryUsageDataLoader.loadBatteryStatsData(mContext, /*isFullChargeStart=*/ false);
+ BatteryUsageDataLoader.loadBatteryStatsData(mContext, /* isFullChargeStart= */ false);
final int queryFlags = mStatsQueryCaptor.getValue().getFlags();
- assertThat(queryFlags
- & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY)
+ assertThat(queryFlags & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY)
.isNotEqualTo(0);
verify(mMockContentResolver).insert(any(), any());
}
@@ -103,7 +96,7 @@
.thenReturn(mBatteryUsageStats);
BatteryUsageDataLoader.sFakeBatteryEntryListSupplier = () -> null;
- BatteryUsageDataLoader.loadBatteryStatsData(mContext, /*isFullChargeStart=*/ false);
+ BatteryUsageDataLoader.loadBatteryStatsData(mContext, /* isFullChargeStart= */ false);
verify(mMockContentResolver).insert(any(), any());
}
@@ -114,7 +107,7 @@
.thenReturn(mBatteryUsageStats);
BatteryUsageDataLoader.sFakeBatteryEntryListSupplier = () -> new ArrayList<>();
- BatteryUsageDataLoader.loadBatteryStatsData(mContext, /*isFullChargeStart=*/ false);
+ BatteryUsageDataLoader.loadBatteryStatsData(mContext, /* isFullChargeStart= */ false);
verify(mMockContentResolver).insert(any(), any());
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoaderTest.java
index 1d0bca4..2932209 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoaderTest.java
@@ -39,25 +39,23 @@
@RunWith(RobolectricTestRunner.class)
public class BatteryUsageStatsLoaderTest {
private Context mContext;
- @Mock
- private BatteryStatsManager mBatteryStatsManager;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
- @Captor
- private ArgumentCaptor<BatteryUsageStatsQuery> mUsageStatsQueryCaptor;
+ @Mock private BatteryStatsManager mBatteryStatsManager;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
+ @Captor private ArgumentCaptor<BatteryUsageStatsQuery> mUsageStatsQueryCaptor;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- doReturn(mBatteryStatsManager).when(mContext).getSystemService(
- Context.BATTERY_STATS_SERVICE);
+ doReturn(mBatteryStatsManager)
+ .when(mContext)
+ .getSystemService(Context.BATTERY_STATS_SERVICE);
}
@Test
public void testLoadInBackground_loadWithoutHistory() {
- BatteryUsageStatsLoader loader = new BatteryUsageStatsLoader(
- mContext, /* includeBatteryHistory */ false);
+ BatteryUsageStatsLoader loader =
+ new BatteryUsageStatsLoader(mContext, /* includeBatteryHistory */ false);
when(mBatteryStatsManager.getBatteryUsageStats(mUsageStatsQueryCaptor.capture()))
.thenReturn(mBatteryUsageStats);
@@ -65,14 +63,14 @@
loader.loadInBackground();
final int queryFlags = mUsageStatsQueryCaptor.getValue().getFlags();
- assertThat(queryFlags
- & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY).isEqualTo(0);
+ assertThat(queryFlags & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY)
+ .isEqualTo(0);
}
@Test
public void testLoadInBackground_loadWithHistory() {
- BatteryUsageStatsLoader loader = new BatteryUsageStatsLoader(
- mContext, /* includeBatteryHistory */ true);
+ BatteryUsageStatsLoader loader =
+ new BatteryUsageStatsLoader(mContext, /* includeBatteryHistory */ true);
when(mBatteryStatsManager.getBatteryUsageStats(mUsageStatsQueryCaptor.capture()))
.thenReturn(mBatteryUsageStats);
@@ -80,7 +78,7 @@
loader.loadInBackground();
final int queryFlags = mUsageStatsQueryCaptor.getValue().getFlags();
- assertThat(queryFlags
- & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY).isNotEqualTo(0);
+ assertThat(queryFlags & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY)
+ .isNotEqualTo(0);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
index 566df52..118c3ed 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
@@ -88,7 +88,8 @@
final SharedPreferences sharedPreferences = DatabaseUtils.getSharedPreferences(mContext);
sharedPreferences
.edit()
- .putInt(DatabaseUtils.KEY_LAST_USAGE_SOURCE,
+ .putInt(
+ DatabaseUtils.KEY_LAST_USAGE_SOURCE,
UsageStatsManager.USAGE_SOURCE_CURRENT_ACTIVITY)
.apply();
@@ -96,9 +97,8 @@
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull();
assertThat(
- DatabaseUtils
- .getSharedPreferences(mContext)
- .contains(DatabaseUtils.KEY_LAST_USAGE_SOURCE))
+ DatabaseUtils.getSharedPreferences(mContext)
+ .contains(DatabaseUtils.KEY_LAST_USAGE_SOURCE))
.isFalse();
}
@@ -124,7 +124,7 @@
@Test
public void onReceive_nullIntent_notRefreshesJob() {
- mReceiver.onReceive(mContext, /*intent=*/ null);
+ mReceiver.onReceive(mContext, /* intent= */ null);
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull();
}
@@ -142,11 +142,10 @@
public void invokeJobRecheck_broadcastsIntent() {
BootBroadcastReceiver.invokeJobRecheck(mContext);
- final List<Intent> intents =
- Shadows.shadowOf((Application) mContext).getBroadcastIntents();
+ final List<Intent> intents = Shadows.shadowOf((Application) mContext).getBroadcastIntents();
assertThat(intents).hasSize(1);
- assertThat(intents.get(0).getAction()).isEqualTo(
- BootBroadcastReceiver.ACTION_PERIODIC_JOB_RECHECK);
+ assertThat(intents.get(0).getAction())
+ .isEqualTo(BootBroadcastReceiver.ACTION_PERIODIC_JOB_RECHECK);
}
private void clearSharedPreferences() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
index c648cde..672bc54 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
@@ -61,14 +61,10 @@
private Context mContext;
- @Mock
- private PackageManager mMockPackageManager;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
- @Mock
- private BatteryEntry mMockBatteryEntry;
- @Mock
- private IUsageStatsManager mUsageStatsManager;
+ @Mock private PackageManager mMockPackageManager;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
+ @Mock private BatteryEntry mMockBatteryEntry;
+ @Mock private IUsageStatsManager mUsageStatsManager;
@Before
public void setUp() {
@@ -104,12 +100,12 @@
ConvertUtils.convertBatteryEntryToContentValues(
mMockBatteryEntry,
mBatteryUsageStats,
- /*batteryLevel=*/ 12,
- /*batteryStatus=*/ BatteryManager.BATTERY_STATUS_FULL,
- /*batteryHealth=*/ BatteryManager.BATTERY_HEALTH_COLD,
- /*bootTimestamp=*/ 101L,
- /*timestamp=*/ 10001L,
- /*isFullChargeStart=*/ true);
+ /* batteryLevel= */ 12,
+ /* batteryStatus= */ BatteryManager.BATTERY_STATUS_FULL,
+ /* batteryHealth= */ BatteryManager.BATTERY_HEALTH_COLD,
+ /* bootTimestamp= */ 101L,
+ /* timestamp= */ 10001L,
+ /* isFullChargeStart= */ true);
final BatteryInformation batteryInformation =
ConvertUtils.getBatteryInformation(
values, BatteryHistEntry.KEY_BATTERY_INFORMATION);
@@ -150,8 +146,8 @@
when(mMockBatteryEntry.getUid()).thenReturn(-1);
when(mMockBatteryEntry.getLabel()).thenReturn("CPU");
when(mMockBatteryEntry.getDefaultPackageName()).thenReturn(null);
- when(mMockBatteryEntry.getPowerComponentId()).thenReturn(
- BatteryConsumer.POWER_COMPONENT_CPU);
+ when(mMockBatteryEntry.getPowerComponentId())
+ .thenReturn(BatteryConsumer.POWER_COMPONENT_CPU);
when(mBatteryUsageStats.getConsumedPower()).thenReturn(5.1);
when(mMockBatteryEntry.getConsumedPower()).thenReturn(1.1);
when(mMockBatteryEntry.getConsumedPowerInForeground()).thenReturn(1.2);
@@ -168,12 +164,12 @@
ConvertUtils.convertBatteryEntryToContentValues(
mMockBatteryEntry,
mBatteryUsageStats,
- /*batteryLevel=*/ 12,
- /*batteryStatus=*/ BatteryManager.BATTERY_STATUS_FULL,
- /*batteryHealth=*/ BatteryManager.BATTERY_HEALTH_COLD,
- /*bootTimestamp=*/ 101L,
- /*timestamp=*/ 10001L,
- /*isFullChargeStart=*/ true);
+ /* batteryLevel= */ 12,
+ /* batteryStatus= */ BatteryManager.BATTERY_STATUS_FULL,
+ /* batteryHealth= */ BatteryManager.BATTERY_HEALTH_COLD,
+ /* bootTimestamp= */ 101L,
+ /* timestamp= */ 10001L,
+ /* isFullChargeStart= */ true);
final BatteryInformation batteryInformation =
ConvertUtils.getBatteryInformation(
values, BatteryHistEntry.KEY_BATTERY_INFORMATION);
@@ -200,8 +196,8 @@
assertThat(batteryInformation.getPercentOfTotal()).isEqualTo(0.3);
assertThat(batteryInformation.getForegroundUsageTimeInMs()).isEqualTo(1234L);
assertThat(batteryInformation.getBackgroundUsageTimeInMs()).isEqualTo(5689L);
- assertThat(batteryInformation.getDrainType()).isEqualTo(
- BatteryConsumer.POWER_COMPONENT_CPU);
+ assertThat(batteryInformation.getDrainType())
+ .isEqualTo(BatteryConsumer.POWER_COMPONENT_CPU);
assertThat(deviceBatteryState.getBatteryLevel()).isEqualTo(12);
assertThat(deviceBatteryState.getBatteryStatus())
.isEqualTo(BatteryManager.BATTERY_STATUS_FULL);
@@ -213,14 +209,14 @@
public void convertBatteryEntryToContentValues_nullBatteryEntry_returnsExpectedContentValues() {
final ContentValues values =
ConvertUtils.convertBatteryEntryToContentValues(
- /*entry=*/ null,
- /*batteryUsageStats=*/ null,
- /*batteryLevel=*/ 12,
- /*batteryStatus=*/ BatteryManager.BATTERY_STATUS_FULL,
- /*batteryHealth=*/ BatteryManager.BATTERY_HEALTH_COLD,
- /*bootTimestamp=*/ 101L,
- /*timestamp=*/ 10001L,
- /*isFullChargeStart=*/ false);
+ /* entry= */ null,
+ /* batteryUsageStats= */ null,
+ /* batteryLevel= */ 12,
+ /* batteryStatus= */ BatteryManager.BATTERY_STATUS_FULL,
+ /* batteryHealth= */ BatteryManager.BATTERY_HEALTH_COLD,
+ /* bootTimestamp= */ 101L,
+ /* timestamp= */ 10001L,
+ /* isFullChargeStart= */ false);
final BatteryInformation batteryInformation =
ConvertUtils.getBatteryInformation(
@@ -234,8 +230,7 @@
.isEqualTo(BatteryManager.BATTERY_STATUS_FULL);
assertThat(deviceBatteryState.getBatteryHealth())
.isEqualTo(BatteryManager.BATTERY_HEALTH_COLD);
- assertThat(values.getAsLong(BatteryHistEntry.KEY_TIMESTAMP))
- .isEqualTo(10001L);
+ assertThat(values.getAsLong(BatteryHistEntry.KEY_TIMESTAMP)).isEqualTo(10001L);
assertThat(values.getAsString(BatteryHistEntry.KEY_PACKAGE_NAME))
.isEqualTo(ConvertUtils.FAKE_PACKAGE_NAME);
}
@@ -273,11 +268,10 @@
.setType(BatteryEventType.POWER_CONNECTED)
.setBatteryLevel(66)
.build();
- final ContentValues values =
- ConvertUtils.convertBatteryEventToContentValues(batteryEvent);
+ final ContentValues values = ConvertUtils.convertBatteryEventToContentValues(batteryEvent);
assertThat(values.getAsLong(BatteryEventEntity.KEY_TIMESTAMP)).isEqualTo(10001L);
- assertThat(values.getAsInteger(BatteryEventEntity.KEY_BATTERY_EVENT_TYPE)).isEqualTo(
- BatteryEventType.POWER_CONNECTED.getNumber());
+ assertThat(values.getAsInteger(BatteryEventEntity.KEY_BATTERY_EVENT_TYPE))
+ .isEqualTo(BatteryEventType.POWER_CONNECTED.getNumber());
assertThat(values.getAsInteger(BatteryEventEntity.KEY_BATTERY_LEVEL)).isEqualTo(66);
}
@@ -302,8 +296,7 @@
final int expectedType = 3;
when(mMockBatteryEntry.getUid()).thenReturn(1001);
when(mMockBatteryEntry.getLabel()).thenReturn("Settings");
- when(mMockBatteryEntry.getDefaultPackageName())
- .thenReturn("com.android.settings.battery");
+ when(mMockBatteryEntry.getDefaultPackageName()).thenReturn("com.android.settings.battery");
when(mMockBatteryEntry.isHidden()).thenReturn(true);
when(mBatteryUsageStats.getConsumedPower()).thenReturn(5.1);
when(mMockBatteryEntry.getConsumedPower()).thenReturn(1.1);
@@ -319,23 +312,16 @@
.thenReturn(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
final BatteryHistEntry batteryHistEntry =
- ConvertUtils.convertToBatteryHistEntry(
- mMockBatteryEntry,
- mBatteryUsageStats);
+ ConvertUtils.convertToBatteryHistEntry(mMockBatteryEntry, mBatteryUsageStats);
assertThat(batteryHistEntry.mUid).isEqualTo(1001L);
- assertThat(batteryHistEntry.mUserId)
- .isEqualTo(UserHandle.getUserId(1001));
- assertThat(batteryHistEntry.mAppLabel)
- .isEqualTo("Settings");
- assertThat(batteryHistEntry.mPackageName)
- .isEqualTo("com.android.settings.battery");
+ assertThat(batteryHistEntry.mUserId).isEqualTo(UserHandle.getUserId(1001));
+ assertThat(batteryHistEntry.mAppLabel).isEqualTo("Settings");
+ assertThat(batteryHistEntry.mPackageName).isEqualTo("com.android.settings.battery");
assertThat(batteryHistEntry.mIsHidden).isTrue();
- assertThat(batteryHistEntry.mBootTimestamp)
- .isEqualTo(0L);
+ assertThat(batteryHistEntry.mBootTimestamp).isEqualTo(0L);
assertThat(batteryHistEntry.mTimestamp).isEqualTo(0L);
- assertThat(batteryHistEntry.mZoneId)
- .isEqualTo(TimeZone.getDefault().getID());
+ assertThat(batteryHistEntry.mZoneId).isEqualTo(TimeZone.getDefault().getID());
assertThat(batteryHistEntry.mTotalPower).isEqualTo(5.1);
assertThat(batteryHistEntry.mConsumePower).isEqualTo(1.1);
assertThat(batteryHistEntry.mForegroundUsageConsumePower).isEqualTo(1.2);
@@ -343,10 +329,8 @@
assertThat(batteryHistEntry.mBackgroundUsageConsumePower).isEqualTo(1.4);
assertThat(batteryHistEntry.mCachedUsageConsumePower).isEqualTo(1.5);
assertThat(batteryHistEntry.mPercentOfTotal).isEqualTo(0.3);
- assertThat(batteryHistEntry.mForegroundUsageTimeInMs)
- .isEqualTo(1234L);
- assertThat(batteryHistEntry.mBackgroundUsageTimeInMs)
- .isEqualTo(5689L);
+ assertThat(batteryHistEntry.mForegroundUsageTimeInMs).isEqualTo(1234L);
+ assertThat(batteryHistEntry.mBackgroundUsageTimeInMs).isEqualTo(5689L);
assertThat(batteryHistEntry.mDrainType).isEqualTo(expectedType);
assertThat(batteryHistEntry.mConsumerType)
.isEqualTo(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
@@ -359,20 +343,15 @@
public void convertToBatteryHistEntry_nullBatteryEntry_returnsExpectedResult() {
final BatteryHistEntry batteryHistEntry =
ConvertUtils.convertToBatteryHistEntry(
- /*entry=*/ null,
- /*batteryUsageStats=*/ null);
+ /* entry= */ null, /* batteryUsageStats= */ null);
- assertThat(batteryHistEntry.mBootTimestamp)
- .isEqualTo(0L);
- assertThat(batteryHistEntry.mTimestamp)
- .isEqualTo(0);
- assertThat(batteryHistEntry.mZoneId)
- .isEqualTo(TimeZone.getDefault().getID());
+ assertThat(batteryHistEntry.mBootTimestamp).isEqualTo(0L);
+ assertThat(batteryHistEntry.mTimestamp).isEqualTo(0);
+ assertThat(batteryHistEntry.mZoneId).isEqualTo(TimeZone.getDefault().getID());
assertThat(batteryHistEntry.mBatteryLevel).isEqualTo(0);
assertThat(batteryHistEntry.mBatteryStatus).isEqualTo(0);
assertThat(batteryHistEntry.mBatteryHealth).isEqualTo(0);
- assertThat(batteryHistEntry.mPackageName)
- .isEqualTo(ConvertUtils.FAKE_PACKAGE_NAME);
+ assertThat(batteryHistEntry.mPackageName).isEqualTo(ConvertUtils.FAKE_PACKAGE_NAME);
}
@Test
@@ -387,8 +366,8 @@
when(mMockPackageManager.getPackageUidAsUser(any(), anyInt())).thenReturn(1001);
final long userId = 2;
- final AppUsageEvent appUsageEvent = ConvertUtils.convertToAppUsageEvent(
- mContext, mUsageStatsManager, event, userId);
+ final AppUsageEvent appUsageEvent =
+ ConvertUtils.convertToAppUsageEvent(mContext, mUsageStatsManager, event, userId);
assertThat(appUsageEvent.getTimestamp()).isEqualTo(101L);
assertThat(appUsageEvent.getType()).isEqualTo(AppUsageEventType.ACTIVITY_RESUMED);
assertThat(appUsageEvent.getPackageName()).isEqualTo("com.android.settings1");
@@ -426,14 +405,14 @@
final AppUsageEvent appUsageEvent =
ConvertUtils.convertToAppUsageEvent(
- mContext, mUsageStatsManager, event, /*userId=*/ 0);
+ mContext, mUsageStatsManager, event, /* userId= */ 0);
assertThat(appUsageEvent).isNull();
}
@Test
public void convertToAppUsageEvent_failToGetUid_returnsNull()
- throws PackageManager.NameNotFoundException {
+ throws PackageManager.NameNotFoundException {
final Event event = new Event();
event.mEventType = UsageEvents.Event.DEVICE_SHUTDOWN;
event.mPackage = "com.android.settings1";
@@ -449,24 +428,27 @@
@Test
public void convertToAppUsageEvent_returnExpectedResult() {
- final MatrixCursor cursor = new MatrixCursor(
- new String[]{
- AppUsageEventEntity.KEY_UID,
- AppUsageEventEntity.KEY_USER_ID,
- AppUsageEventEntity.KEY_PACKAGE_NAME,
- AppUsageEventEntity.KEY_TIMESTAMP,
- AppUsageEventEntity.KEY_APP_USAGE_EVENT_TYPE,
- AppUsageEventEntity.KEY_TASK_ROOT_PACKAGE_NAME,
- AppUsageEventEntity.KEY_INSTANCE_ID});
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ AppUsageEventEntity.KEY_UID,
+ AppUsageEventEntity.KEY_USER_ID,
+ AppUsageEventEntity.KEY_PACKAGE_NAME,
+ AppUsageEventEntity.KEY_TIMESTAMP,
+ AppUsageEventEntity.KEY_APP_USAGE_EVENT_TYPE,
+ AppUsageEventEntity.KEY_TASK_ROOT_PACKAGE_NAME,
+ AppUsageEventEntity.KEY_INSTANCE_ID
+ });
cursor.addRow(
- new Object[]{
- 101L,
- 1001L,
- "com.android.settings1",
- 10001L,
- AppUsageEventType.DEVICE_SHUTDOWN.getNumber(),
- "com.android.settings2",
- 100001L});
+ new Object[] {
+ 101L,
+ 1001L,
+ "com.android.settings1",
+ 10001L,
+ AppUsageEventType.DEVICE_SHUTDOWN.getNumber(),
+ "com.android.settings2",
+ 100001L
+ });
cursor.moveToFirst();
final AppUsageEvent appUsageEvent = ConvertUtils.convertToAppUsageEvent(cursor);
@@ -482,20 +464,23 @@
@Test
public void convertToAppUsageEvent_emptyInstanceIdAndRootName_returnExpectedResult() {
- final MatrixCursor cursor = new MatrixCursor(
- new String[]{
- AppUsageEventEntity.KEY_UID,
- AppUsageEventEntity.KEY_USER_ID,
- AppUsageEventEntity.KEY_PACKAGE_NAME,
- AppUsageEventEntity.KEY_TIMESTAMP,
- AppUsageEventEntity.KEY_APP_USAGE_EVENT_TYPE});
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ AppUsageEventEntity.KEY_UID,
+ AppUsageEventEntity.KEY_USER_ID,
+ AppUsageEventEntity.KEY_PACKAGE_NAME,
+ AppUsageEventEntity.KEY_TIMESTAMP,
+ AppUsageEventEntity.KEY_APP_USAGE_EVENT_TYPE
+ });
cursor.addRow(
- new Object[]{
- 101L,
- 1001L,
- "com.android.settings1",
- 10001L,
- AppUsageEventType.DEVICE_SHUTDOWN.getNumber()});
+ new Object[] {
+ 101L,
+ 1001L,
+ "com.android.settings1",
+ 10001L,
+ AppUsageEventType.DEVICE_SHUTDOWN.getNumber()
+ });
cursor.moveToFirst();
final AppUsageEvent appUsageEvent = ConvertUtils.convertToAppUsageEvent(cursor);
@@ -511,8 +496,8 @@
@Test
public void convertToBatteryEvent_normalCase_returnsExpectedResult() {
- final BatteryEvent batteryEvent = ConvertUtils.convertToBatteryEvent(
- 666L, BatteryEventType.POWER_DISCONNECTED, 88);
+ final BatteryEvent batteryEvent =
+ ConvertUtils.convertToBatteryEvent(666L, BatteryEventType.POWER_DISCONNECTED, 88);
assertThat(batteryEvent.getTimestamp()).isEqualTo(666L);
assertThat(batteryEvent.getType()).isEqualTo(BatteryEventType.POWER_DISCONNECTED);
assertThat(batteryEvent.getBatteryLevel()).isEqualTo(88);
@@ -520,8 +505,9 @@
@Test
public void convertToBatteryEventList_normalCase_returnsExpectedResult() {
- final BatteryLevelData batteryLevelData = new BatteryLevelData(Map.of(
- 1691589600000L, 98, 1691596800000L, 90, 1691596812345L, 80));
+ final BatteryLevelData batteryLevelData =
+ new BatteryLevelData(
+ Map.of(1691589600000L, 98, 1691596800000L, 90, 1691596812345L, 80));
final List<BatteryEvent> batteryEventList =
ConvertUtils.convertToBatteryEventList(batteryLevelData);
@@ -537,14 +523,20 @@
@Test
public void convertToBatteryUsageSlotList_normalCase_returnsExpectedResult() {
- BatteryDiffData batteryDiffData1 = new BatteryDiffData(
- mContext, 11L, 12L, 13, 14, 15, List.of(), List.of(), Set.of(), Set.of(), false);
- BatteryDiffData batteryDiffData2 = new BatteryDiffData(
- mContext, 21L, 22L, 23, 24, 25, List.of(), List.of(), Set.of(), Set.of(), false);
- BatteryDiffData batteryDiffData3 = new BatteryDiffData(
- mContext, 31L, 32L, 33, 34, 35, List.of(), List.of(), Set.of(), Set.of(), false);
- final Map<Long, BatteryDiffData> batteryDiffDataMap = Map.of(
- 11L, batteryDiffData1, 21L, batteryDiffData2, 31L, batteryDiffData3);
+ BatteryDiffData batteryDiffData1 =
+ new BatteryDiffData(
+ mContext, 11L, 12L, 13, 14, 15, List.of(), List.of(), Set.of(), Set.of(),
+ false);
+ BatteryDiffData batteryDiffData2 =
+ new BatteryDiffData(
+ mContext, 21L, 22L, 23, 24, 25, List.of(), List.of(), Set.of(), Set.of(),
+ false);
+ BatteryDiffData batteryDiffData3 =
+ new BatteryDiffData(
+ mContext, 31L, 32L, 33, 34, 35, List.of(), List.of(), Set.of(), Set.of(),
+ false);
+ final Map<Long, BatteryDiffData> batteryDiffDataMap =
+ Map.of(11L, batteryDiffData1, 21L, batteryDiffData2, 31L, batteryDiffData3);
final List<BatteryUsageSlot> batteryUsageSlotList =
ConvertUtils.convertToBatteryUsageSlotList(batteryDiffDataMap);
@@ -556,8 +548,7 @@
@Test
public void getLocale_nullContext_returnDefaultLocale() {
- assertThat(ConvertUtils.getLocale(/*context=*/ null))
- .isEqualTo(Locale.getDefault());
+ assertThat(ConvertUtils.getLocale(/* context= */ null)).isEqualTo(Locale.getDefault());
}
@Test
@@ -578,8 +569,9 @@
final String packageName = "com.android.settings1";
final String taskRootPackageName = "com.android.settings2";
- assertThat(ConvertUtils.getEffectivePackageName(
- mContext, mUsageStatsManager, packageName, taskRootPackageName))
+ assertThat(
+ ConvertUtils.getEffectivePackageName(
+ mContext, mUsageStatsManager, packageName, taskRootPackageName))
.isEqualTo(packageName);
}
@@ -588,8 +580,9 @@
final String packageName = "com.android.settings1";
final String taskRootPackageName = "com.android.settings2";
- assertThat(ConvertUtils.getEffectivePackageName(
- mContext, mUsageStatsManager, packageName, taskRootPackageName))
+ assertThat(
+ ConvertUtils.getEffectivePackageName(
+ mContext, mUsageStatsManager, packageName, taskRootPackageName))
.isEqualTo(packageName);
}
@@ -599,8 +592,9 @@
final String packageName = "com.android.settings1";
final String taskRootPackageName = "com.android.settings2";
- assertThat(ConvertUtils.getEffectivePackageName(
- mContext, mUsageStatsManager, packageName, taskRootPackageName))
+ assertThat(
+ ConvertUtils.getEffectivePackageName(
+ mContext, mUsageStatsManager, packageName, taskRootPackageName))
.isEqualTo(taskRootPackageName);
}
@@ -609,11 +603,19 @@
ConvertUtils.sUsageSource = USAGE_SOURCE_TASK_ROOT_ACTIVITY;
final String packageName = "com.android.settings1";
- assertThat(ConvertUtils.getEffectivePackageName(
- mContext, mUsageStatsManager, packageName, /*taskRootPackageName=*/ null))
+ assertThat(
+ ConvertUtils.getEffectivePackageName(
+ mContext,
+ mUsageStatsManager,
+ packageName,
+ /* taskRootPackageName= */ null))
.isEqualTo(packageName);
- assertThat(ConvertUtils.getEffectivePackageName(
- mContext, mUsageStatsManager, packageName, /*taskRootPackageName=*/ ""))
+ assertThat(
+ ConvertUtils.getEffectivePackageName(
+ mContext,
+ mUsageStatsManager,
+ packageName,
+ /* taskRootPackageName= */ ""))
.isEqualTo(packageName);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
index 601d3f3..6227790 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
@@ -70,18 +70,12 @@
private Context mContext;
private DataProcessManager mDataProcessManager;
- @Mock
- private IUsageStatsManager mUsageStatsManager;
- @Mock
- private UserManager mUserManager;
- @Mock
- private BatteryStatsManager mBatteryStatsManager;
- @Mock
- private BatteryUsageStats mBatteryUsageStats;
- @Mock
- private Intent mIntent;
- @Captor
- private ArgumentCaptor<BatteryUsageStatsQuery> mBatteryUsageStatsQueryCaptor;
+ @Mock private IUsageStatsManager mUsageStatsManager;
+ @Mock private UserManager mUserManager;
+ @Mock private BatteryStatsManager mBatteryStatsManager;
+ @Mock private BatteryUsageStats mBatteryUsageStats;
+ @Mock private Intent mIntent;
+ @Captor private ArgumentCaptor<BatteryUsageStatsQuery> mBatteryUsageStatsQueryCaptor;
@Before
public void setUp() {
@@ -91,22 +85,26 @@
DataProcessor.sTestSystemAppsPackageNames = Set.of();
DataProcessor.sUsageStatsManager = mUsageStatsManager;
doReturn(mContext).when(mContext).getApplicationContext();
- doReturn(mUserManager)
+ doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
+ doReturn(mBatteryStatsManager)
.when(mContext)
- .getSystemService(UserManager.class);
- doReturn(mBatteryStatsManager).when(mContext).getSystemService(
- Context.BATTERY_STATS_SERVICE);
- doReturn(mBatteryUsageStats).when(
- mBatteryStatsManager).getBatteryUsageStats(mBatteryUsageStatsQueryCaptor.capture());
+ .getSystemService(Context.BATTERY_STATS_SERVICE);
+ doReturn(mBatteryUsageStats)
+ .when(mBatteryStatsManager)
+ .getBatteryUsageStats(mBatteryUsageStatsQueryCaptor.capture());
doReturn(mIntent).when(mContext).registerReceiver(any(), any());
doReturn(100).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_SCALE), anyInt());
doReturn(66).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_LEVEL), anyInt());
- mDataProcessManager = new DataProcessManager(
- mContext, /*handler=*/ null, /*rawStartTimestamp=*/ 0L,
- /*lastFullChargeTimestamp=*/ 0L, /*callbackFunction=*/ null,
- /*hourlyBatteryLevelsPerDay=*/ new ArrayList<>(),
- /*batteryHistoryMap=*/ new HashMap<>());
+ mDataProcessManager =
+ new DataProcessManager(
+ mContext,
+ /* handler= */ null,
+ /* rawStartTimestamp= */ 0L,
+ /* lastFullChargeTimestamp= */ 0L,
+ /* callbackFunction= */ null,
+ /* hourlyBatteryLevelsPerDay= */ new ArrayList<>(),
+ /* batteryHistoryMap= */ new HashMap<>());
}
@After
@@ -119,18 +117,20 @@
@LooperMode(LooperMode.Mode.LEGACY)
public void constructor_noLevelData() {
final DataProcessManager dataProcessManager =
- new DataProcessManager(mContext, /*handler=*/ null, /*callbackFunction=*/ null);
+ new DataProcessManager(mContext, /* handler= */ null, /* callbackFunction= */ null);
assertThat(dataProcessManager.getShowScreenOnTime()).isFalse();
}
@Test
@LooperMode(LooperMode.Mode.LEGACY)
public void start_loadEmptyDatabaseAppUsageData() {
- final MatrixCursor cursor = new MatrixCursor(
- new String[]{
- AppUsageEventEntity.KEY_UID,
- AppUsageEventEntity.KEY_PACKAGE_NAME,
- AppUsageEventEntity.KEY_TIMESTAMP});
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ AppUsageEventEntity.KEY_UID,
+ AppUsageEventEntity.KEY_PACKAGE_NAME,
+ AppUsageEventEntity.KEY_TIMESTAMP
+ });
DatabaseUtils.sFakeSupplier = () -> cursor;
doReturn(true).when(mUserManager).isUserUnlocked(anyInt());
@@ -166,9 +166,9 @@
new BatteryLevelData.PeriodBatteryLevelData(batteryLevelMap2, timestamps2));
// Fake current usage data.
final UsageEvents.Event event1 =
- getUsageEvent(UsageEvents.Event.ACTIVITY_RESUMED, /*timestamp=*/ 1, packageName);
+ getUsageEvent(UsageEvents.Event.ACTIVITY_RESUMED, /* timestamp= */ 1, packageName);
final UsageEvents.Event event2 =
- getUsageEvent(UsageEvents.Event.ACTIVITY_STOPPED, /*timestamp=*/ 2, packageName);
+ getUsageEvent(UsageEvents.Event.ACTIVITY_STOPPED, /* timestamp= */ 2, packageName);
final List<UsageEvents.Event> events = new ArrayList<>();
events.add(event1);
events.add(event2);
@@ -182,40 +182,68 @@
doReturn(new ArrayList<>()).when(mUserManager).getUserProfiles();
// Fake database usage data.
- final MatrixCursor cursor = new MatrixCursor(
- new String[]{
- AppUsageEventEntity.KEY_APP_USAGE_EVENT_TYPE,
- AppUsageEventEntity.KEY_TIMESTAMP,
- AppUsageEventEntity.KEY_USER_ID,
- AppUsageEventEntity.KEY_INSTANCE_ID,
- AppUsageEventEntity.KEY_PACKAGE_NAME
- });
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ AppUsageEventEntity.KEY_APP_USAGE_EVENT_TYPE,
+ AppUsageEventEntity.KEY_TIMESTAMP,
+ AppUsageEventEntity.KEY_USER_ID,
+ AppUsageEventEntity.KEY_INSTANCE_ID,
+ AppUsageEventEntity.KEY_PACKAGE_NAME
+ });
// Adds fake data into the cursor.
- cursor.addRow(new Object[] {
- AppUsageEventType.ACTIVITY_RESUMED.getNumber(), /*timestamp=*/ 3, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName});
- cursor.addRow(new Object[] {
- AppUsageEventType.ACTIVITY_STOPPED.getNumber(), /*timestamp=*/ 4, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName});
- cursor.addRow(new Object[] {
- AppUsageEventType.ACTIVITY_RESUMED.getNumber(), /*timestamp=*/ 5, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName});
- cursor.addRow(new Object[] {
- AppUsageEventType.ACTIVITY_STOPPED.getNumber(), /*timestamp=*/ 6, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName});
- DatabaseUtils.sFakeSupplier = new Supplier<>() {
- private int mTimes = 0;
- @Override
- public Cursor get() {
- mTimes++;
- return mTimes <= 2 ? null : cursor;
- }
- };
+ cursor.addRow(
+ new Object[] {
+ AppUsageEventType.ACTIVITY_RESUMED.getNumber(),
+ /* timestamp= */ 3,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName
+ });
+ cursor.addRow(
+ new Object[] {
+ AppUsageEventType.ACTIVITY_STOPPED.getNumber(),
+ /* timestamp= */ 4,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName
+ });
+ cursor.addRow(
+ new Object[] {
+ AppUsageEventType.ACTIVITY_RESUMED.getNumber(),
+ /* timestamp= */ 5,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName
+ });
+ cursor.addRow(
+ new Object[] {
+ AppUsageEventType.ACTIVITY_STOPPED.getNumber(),
+ /* timestamp= */ 6,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName
+ });
+ DatabaseUtils.sFakeSupplier =
+ new Supplier<>() {
+ private int mTimes = 0;
- final DataProcessManager dataProcessManager = new DataProcessManager(
- mContext, /*handler=*/ null, /*rawStartTimestamp=*/ 2L,
- /*lastFullChargeTimestamp=*/ 1L, /*callbackFunction=*/ null,
- hourlyBatteryLevelsPerDay, /*batteryHistoryMap=*/ new HashMap<>());
+ @Override
+ public Cursor get() {
+ mTimes++;
+ return mTimes <= 2 ? null : cursor;
+ }
+ };
+
+ final DataProcessManager dataProcessManager =
+ new DataProcessManager(
+ mContext,
+ /* handler= */ null,
+ /* rawStartTimestamp= */ 2L,
+ /* lastFullChargeTimestamp= */ 1L,
+ /* callbackFunction= */ null,
+ hourlyBatteryLevelsPerDay,
+ /* batteryHistoryMap= */ new HashMap<>());
dataProcessManager.start();
assertThat(dataProcessManager.getIsCurrentAppUsageLoaded()).isTrue();
@@ -226,17 +254,17 @@
Collections.sort(appUsageEventList, DataProcessor.APP_USAGE_EVENT_TIMESTAMP_COMPARATOR);
assertThat(appUsageEventList.size()).isEqualTo(6);
assertAppUsageEvent(
- appUsageEventList.get(0), AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 1);
+ appUsageEventList.get(0), AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 1);
assertAppUsageEvent(
- appUsageEventList.get(1), AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 2);
+ appUsageEventList.get(1), AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 2);
assertAppUsageEvent(
- appUsageEventList.get(2), AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 3);
+ appUsageEventList.get(2), AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 3);
assertAppUsageEvent(
- appUsageEventList.get(3), AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 4);
+ appUsageEventList.get(3), AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 4);
assertAppUsageEvent(
- appUsageEventList.get(4), AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 5);
+ appUsageEventList.get(4), AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 5);
assertAppUsageEvent(
- appUsageEventList.get(5), AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 6);
+ appUsageEventList.get(5), AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 6);
final Map<Integer, Map<Integer, Map<Long, Map<String, List<AppUsagePeriod>>>>>
appUsagePeriodMap = dataProcessManager.getAppUsagePeriodMap();
@@ -267,18 +295,20 @@
@LooperMode(LooperMode.Mode.LEGACY)
public void start_currentUserLocked_emptyAppUsageList() throws RemoteException {
final UsageEvents.Event event =
- getUsageEvent(UsageEvents.Event.ACTIVITY_RESUMED, /*timestamp=*/ 1, "package");
+ getUsageEvent(UsageEvents.Event.ACTIVITY_RESUMED, /* timestamp= */ 1, "package");
final List<UsageEvents.Event> events = new ArrayList<>();
events.add(event);
doReturn(getUsageEvents(events))
.when(mUsageStatsManager)
.queryEventsForUser(anyLong(), anyLong(), anyInt(), any());
doReturn(false).when(mUserManager).isUserUnlocked(anyInt());
- final MatrixCursor cursor = new MatrixCursor(
- new String[]{
- AppUsageEventEntity.KEY_UID,
- AppUsageEventEntity.KEY_PACKAGE_NAME,
- AppUsageEventEntity.KEY_TIMESTAMP});
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ AppUsageEventEntity.KEY_UID,
+ AppUsageEventEntity.KEY_PACKAGE_NAME,
+ AppUsageEventEntity.KEY_TIMESTAMP
+ });
// Adds fake data into the cursor.
cursor.addRow(new Object[] {101L, "app name1", 1001L});
DatabaseUtils.sFakeSupplier = () -> cursor;
@@ -293,25 +323,30 @@
@Test
@LooperMode(LooperMode.Mode.LEGACY)
public void getBatteryLevelData_emptyHistoryMap_returnNull() {
- assertThat(DataProcessManager.getBatteryLevelData(
- mContext,
- /*handler=*/ null,
- /*isFromPeriodJob=*/ false,
- /*asyncResponseDelegate=*/ null)).isNull();
- assertThat(DataProcessManager.getBatteryLevelData(
- mContext,
- /*handler=*/ null,
- /*isFromPeriodJob=*/ true,
- /*asyncResponseDelegate=*/ null)).isNull();
+ assertThat(
+ DataProcessManager.getBatteryLevelData(
+ mContext,
+ /* handler= */ null,
+ /* isFromPeriodJob= */ false,
+ /* asyncResponseDelegate= */ null))
+ .isNull();
+ assertThat(
+ DataProcessManager.getBatteryLevelData(
+ mContext,
+ /* handler= */ null,
+ /* isFromPeriodJob= */ true,
+ /* asyncResponseDelegate= */ null))
+ .isNull();
}
@Test
public void getBatteryLevelData_allDataInOneHour_returnExpectedResult() {
// The timestamps and the current time are within half hour before an even hour.
final long[] timestamps = {
- DateUtils.HOUR_IN_MILLIS * 2 - 300L,
- DateUtils.HOUR_IN_MILLIS * 2 - 200L,
- DateUtils.HOUR_IN_MILLIS * 2 - 100L};
+ DateUtils.HOUR_IN_MILLIS * 2 - 300L,
+ DateUtils.HOUR_IN_MILLIS * 2 - 200L,
+ DateUtils.HOUR_IN_MILLIS * 2 - 100L
+ };
final int[] levels = {100, 99, 98};
DataProcessManager.sFakeBatteryHistoryMap = createHistoryMap(timestamps, levels);
DataProcessor.sTestCurrentTimeMillis = timestamps[timestamps.length - 1];
@@ -319,13 +354,12 @@
final BatteryLevelData resultData =
DataProcessManager.getBatteryLevelData(
mContext,
- /*handler=*/ null,
- /*isFromPeriodJob=*/ false,
- /*asyncResponseDelegate=*/ null);
+ /* handler= */ null,
+ /* isFromPeriodJob= */ false,
+ /* asyncResponseDelegate= */ null);
- final List<Long> expectedDailyTimestamps = List.of(
- DateUtils.HOUR_IN_MILLIS * 2 - 300L,
- DateUtils.HOUR_IN_MILLIS * 2 - 100L);
+ final List<Long> expectedDailyTimestamps =
+ List.of(DateUtils.HOUR_IN_MILLIS * 2 - 300L, DateUtils.HOUR_IN_MILLIS * 2 - 100L);
final List<Integer> expectedDailyLevels = List.of(100, 66);
final List<List<Long>> expectedHourlyTimestamps = List.of(expectedDailyTimestamps);
final List<List<Integer>> expectedHourlyLevels = List.of(expectedDailyLevels);
@@ -348,13 +382,14 @@
final BatteryLevelData resultData =
DataProcessManager.getBatteryLevelData(
mContext,
- /*handler=*/ null,
- /*isFromPeriodJob=*/ false,
- /*asyncResponseDelegate=*/ null);
+ /* handler= */ null,
+ /* isFromPeriodJob= */ false,
+ /* asyncResponseDelegate= */ null);
- final List<Long> expectedDailyTimestamps = List.of(
- 1640966400000L, // 2022-01-01 00:00:00
- 1640970000000L); // 2022-01-01 01:00:00
+ final List<Long> expectedDailyTimestamps =
+ List.of(
+ 1640966400000L, // 2022-01-01 00:00:00
+ 1640970000000L); // 2022-01-01 01:00:00
final List<Integer> expectedDailyLevels = List.of(100, 66);
final List<List<Long>> expectedHourlyTimestamps = List.of(expectedDailyTimestamps);
final List<List<Integer>> expectedHourlyLevels = List.of(expectedDailyLevels);
@@ -400,16 +435,11 @@
private static ContentValues getContentValuesWithBatteryLevel(final int level) {
final ContentValues values = new ContentValues();
final DeviceBatteryState deviceBatteryState =
- DeviceBatteryState
- .newBuilder()
- .setBatteryLevel(level)
- .build();
+ DeviceBatteryState.newBuilder().setBatteryLevel(level).build();
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
- .setDeviceBatteryState(deviceBatteryState)
- .build();
- values.put(BatteryHistEntry.KEY_BATTERY_INFORMATION,
+ BatteryInformation.newBuilder().setDeviceBatteryState(deviceBatteryState).build();
+ values.put(
+ BatteryHistEntry.KEY_BATTERY_INFORMATION,
ConvertUtils.convertBatteryInformationToString(batteryInformation));
return values;
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
index 636a7a3..7a67240 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
@@ -98,18 +98,19 @@
DataProcessor.sTestSystemAppsPackageNames = Set.of();
DataProcessor.sUsageStatsManager = mUsageStatsManager;
- doReturn(mIntent).when(mContext).registerReceiver(
- isA(BroadcastReceiver.class), isA(IntentFilter.class));
+ doReturn(mIntent)
+ .when(mContext)
+ .registerReceiver(isA(BroadcastReceiver.class), isA(IntentFilter.class));
doReturn(100).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_SCALE), anyInt());
doReturn(66).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_LEVEL), anyInt());
doReturn(mContext).when(mContext).getApplicationContext();
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
- doReturn(new int[]{0}).when(mUserManager).getProfileIdsWithDisabled(anyInt());
+ doReturn(new int[] {0}).when(mUserManager).getProfileIdsWithDisabled(anyInt());
}
@Test
public void getAppUsageEvents_returnExpectedResult() throws RemoteException {
- UserInfo userInfo = new UserInfo(/*id=*/ 0, "user_0", /*flags=*/ 0);
+ UserInfo userInfo = new UserInfo(/* id= */ 0, "user_0", /* flags= */ 0);
final List<UserInfo> userInfoList = new ArrayList<>();
userInfoList.add(userInfo);
doReturn(userInfoList).when(mUserManager).getAliveUsers();
@@ -126,7 +127,7 @@
@Test
public void getAppUsageEvents_lockedUser_returnNull() {
- UserInfo userInfo = new UserInfo(/*id=*/ 0, "user_0", /*flags=*/ 0);
+ UserInfo userInfo = new UserInfo(/* id= */ 0, "user_0", /* flags= */ 0);
final List<UserInfo> userInfoList = new ArrayList<>();
userInfoList.add(userInfo);
doReturn(userInfoList).when(mUserManager).getAliveUsers();
@@ -140,12 +141,13 @@
@Test
public void getAppUsageEvents_nullUsageEvents_returnNull() throws RemoteException {
- UserInfo userInfo = new UserInfo(/*id=*/ 0, "user_0", /*flags=*/ 0);
+ UserInfo userInfo = new UserInfo(/* id= */ 0, "user_0", /* flags= */ 0);
final List<UserInfo> userInfoList = new ArrayList<>();
userInfoList.add(userInfo);
doReturn(userInfoList).when(mUserManager).getAliveUsers();
doReturn(true).when(mUserManager).isUserUnlocked(userInfo.id);
- doReturn(null).when(mUsageStatsManager)
+ doReturn(null)
+ .when(mUsageStatsManager)
.queryEventsForUser(anyLong(), anyLong(), anyInt(), anyString());
final Map<Long, UsageEvents> resultMap = DataProcessor.getAppUsageEvents(mContext);
@@ -178,7 +180,8 @@
public void getAppUsageEventsForUser_nullUsageEvents_returnNull() throws RemoteException {
final int userId = 1;
doReturn(true).when(mUserManager).isUserUnlocked(userId);
- doReturn(null).when(mUsageStatsManager)
+ doReturn(null)
+ .when(mUsageStatsManager)
.queryEventsForUser(anyLong(), anyLong(), anyInt(), anyString());
assertThat(DataProcessor.getAppUsageEventsForUser(mContext, userId, 0)).isNull();
@@ -206,52 +209,112 @@
new BatteryLevelData.PeriodBatteryLevelData(batteryLevelMap2, timestamps2));
final List<AppUsageEvent> appUsageEventList = new ArrayList<>();
// Adds some events before the start timestamp.
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 1, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 2, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 1,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 2,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
// Adds the valid app usage events.
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 4200000L, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 4500000L, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 12600000L, /*userId=*/ 2,
- /*instanceId=*/ 3, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 15600000L, /*userId=*/ 2,
- /*instanceId=*/ 3, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 16200000L, /*userId=*/ 2,
- /*instanceId=*/ 3, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 18000000L, /*userId=*/ 2,
- /*instanceId=*/ 3, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 17200000L, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 17800000L, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 46000000L, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 47800000L, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 49000000L, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 59600000L, /*userId=*/ 1,
- /*instanceId=*/ 4, packageName));
- appUsageEventList.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 61200000L, /*userId=*/ 1,
- /*instanceId=*/ 4, packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 4200000L,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 4500000L,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 12600000L,
+ /* userId= */ 2,
+ /* instanceId= */ 3,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 15600000L,
+ /* userId= */ 2,
+ /* instanceId= */ 3,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 16200000L,
+ /* userId= */ 2,
+ /* instanceId= */ 3,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 18000000L,
+ /* userId= */ 2,
+ /* instanceId= */ 3,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 17200000L,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 17800000L,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 46000000L,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 47800000L,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 49000000L,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 59600000L,
+ /* userId= */ 1,
+ /* instanceId= */ 4,
+ packageName));
+ appUsageEventList.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 61200000L,
+ /* userId= */ 1,
+ /* instanceId= */ 4,
+ packageName));
final Map<Integer, Map<Integer, Map<Long, Map<String, List<AppUsagePeriod>>>>> periodMap =
DataProcessor.generateAppUsagePeriodMap(
@@ -292,18 +355,22 @@
new ArrayList<>();
hourlyBatteryLevelsPerDay.add(
new BatteryLevelData.PeriodBatteryLevelData(new ArrayMap<>(), new ArrayList<>()));
- assertThat(DataProcessor.generateAppUsagePeriodMap(
- mContext, hourlyBatteryLevelsPerDay, new ArrayList<>(), new ArrayList<>()))
+ assertThat(
+ DataProcessor.generateAppUsagePeriodMap(
+ mContext,
+ hourlyBatteryLevelsPerDay,
+ new ArrayList<>(),
+ new ArrayList<>()))
.isNull();
}
@Test
public void generateAppUsageEventListFromUsageEvents_returnExpectedResult() {
- Event event1 = getUsageEvent(Event.NOTIFICATION_INTERRUPTION, /*timestamp=*/ 1);
- Event event2 = getUsageEvent(Event.ACTIVITY_RESUMED, /*timestamp=*/ 2);
- Event event3 = getUsageEvent(Event.ACTIVITY_STOPPED, /*timestamp=*/ 3);
- Event event4 = getUsageEvent(Event.DEVICE_SHUTDOWN, /*timestamp=*/ 4);
- Event event5 = getUsageEvent(Event.ACTIVITY_RESUMED, /*timestamp=*/ 5);
+ Event event1 = getUsageEvent(Event.NOTIFICATION_INTERRUPTION, /* timestamp= */ 1);
+ Event event2 = getUsageEvent(Event.ACTIVITY_RESUMED, /* timestamp= */ 2);
+ Event event3 = getUsageEvent(Event.ACTIVITY_STOPPED, /* timestamp= */ 3);
+ Event event4 = getUsageEvent(Event.DEVICE_SHUTDOWN, /* timestamp= */ 4);
+ Event event5 = getUsageEvent(Event.ACTIVITY_RESUMED, /* timestamp= */ 5);
event5.mPackage = null;
List<Event> events1 = new ArrayList<>();
events1.add(event1);
@@ -325,17 +392,16 @@
assertThat(appUsageEventList).hasSize(3);
assertAppUsageEvent(
- appUsageEventList.get(0), AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 2);
+ appUsageEventList.get(0), AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 2);
assertAppUsageEvent(
- appUsageEventList.get(1), AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 3);
+ appUsageEventList.get(1), AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 3);
assertAppUsageEvent(
- appUsageEventList.get(2), AppUsageEventType.DEVICE_SHUTDOWN, /*timestamp=*/ 4);
+ appUsageEventList.get(2), AppUsageEventType.DEVICE_SHUTDOWN, /* timestamp= */ 4);
}
@Test
public void getHistoryMapWithExpectedTimestamps_emptyHistoryMap_returnEmptyMap() {
- assertThat(DataProcessor
- .getHistoryMapWithExpectedTimestamps(mContext, new HashMap<>()))
+ assertThat(DataProcessor.getHistoryMapWithExpectedTimestamps(mContext, new HashMap<>()))
.isEmpty();
}
@@ -343,11 +409,11 @@
public void getHistoryMapWithExpectedTimestamps_returnExpectedMap() {
// Timezone GMT+8
final long[] timestamps = {
- 1640966700000L, // 2022-01-01 00:05:00
- 1640970180000L, // 2022-01-01 01:03:00
- 1640973840000L, // 2022-01-01 02:04:00
- 1640978100000L, // 2022-01-01 03:15:00
- 1640981400000L // 2022-01-01 04:10:00
+ 1640966700000L, // 2022-01-01 00:05:00
+ 1640970180000L, // 2022-01-01 01:03:00
+ 1640973840000L, // 2022-01-01 02:04:00
+ 1640978100000L, // 2022-01-01 03:15:00
+ 1640981400000L // 2022-01-01 04:10:00
};
final int[] levels = {100, 94, 90, 82, 50};
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
@@ -359,12 +425,12 @@
// Timezone GMT+8
final long[] expectedTimestamps = {
- 1640966700000L, // 2022-01-01 00:05:00
- 1640970000000L, // 2022-01-01 01:00:00
- 1640973600000L, // 2022-01-01 02:00:00
- 1640977200000L, // 2022-01-01 03:00:00
- 1640980800000L, // 2022-01-01 04:00:00
- 1640981400000L // 2022-01-01 04:10:00
+ 1640966700000L, // 2022-01-01 00:05:00
+ 1640970000000L, // 2022-01-01 01:00:00
+ 1640973600000L, // 2022-01-01 02:00:00
+ 1640977200000L, // 2022-01-01 03:00:00
+ 1640980800000L, // 2022-01-01 04:00:00
+ 1640981400000L // 2022-01-01 04:10:00
};
final int[] expectedLevels = {100, 94, 90, 84, 56, 98};
assertThat(resultMap).hasSize(expectedLevels.length);
@@ -372,19 +438,23 @@
assertThat(resultMap.get(expectedTimestamps[index]).get(FAKE_ENTRY_KEY).mBatteryLevel)
.isEqualTo(expectedLevels[index]);
}
- assertThat(resultMap.get(expectedTimestamps[expectedLevels.length - 1]).containsKey(
- DataProcessor.CURRENT_TIME_BATTERY_HISTORY_PLACEHOLDER)).isTrue();
+ assertThat(
+ resultMap
+ .get(expectedTimestamps[expectedLevels.length - 1])
+ .containsKey(
+ DataProcessor.CURRENT_TIME_BATTERY_HISTORY_PLACEHOLDER))
+ .isTrue();
}
@Test
public void getLevelDataThroughProcessedHistoryMap_OneDayData_returnExpectedResult() {
// Timezone GMT+8
final long[] timestamps = {
- 1640966400000L, // 2022-01-01 00:00:00
- 1640970000000L, // 2022-01-01 01:00:00
- 1640973600000L, // 2022-01-01 02:00:00
- 1640977200000L, // 2022-01-01 03:00:00
- 1640980800000L // 2022-01-01 04:00:00
+ 1640966400000L, // 2022-01-01 00:00:00
+ 1640970000000L, // 2022-01-01 01:00:00
+ 1640973600000L, // 2022-01-01 02:00:00
+ 1640977200000L, // 2022-01-01 03:00:00
+ 1640980800000L // 2022-01-01 04:00:00
};
final int[] levels = {100, 94, 90, 82, 50};
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
@@ -396,12 +466,10 @@
final List<Long> expectedDailyTimestamps = List.of(timestamps[0], timestamps[4]);
final List<Integer> expectedDailyLevels = List.of(levels[0], levels[4]);
- final List<List<Long>> expectedHourlyTimestamps = List.of(
- List.of(timestamps[0], timestamps[2], timestamps[4])
- );
- final List<List<Integer>> expectedHourlyLevels = List.of(
- List.of(levels[0], levels[2], levels[4])
- );
+ final List<List<Long>> expectedHourlyTimestamps =
+ List.of(List.of(timestamps[0], timestamps[2], timestamps[4]));
+ final List<List<Integer>> expectedHourlyLevels =
+ List.of(List.of(levels[0], levels[2], levels[4]));
verifyExpectedBatteryLevelData(
resultData,
expectedDailyTimestamps,
@@ -414,10 +482,10 @@
public void getLevelDataThroughProcessedHistoryMap_MultipleDaysData_returnExpectedResult() {
// Timezone GMT+8
final long[] timestamps = {
- 1641038400000L, // 2022-01-01 20:00:00
- 1641060000000L, // 2022-01-02 02:00:00
- 1641067200000L, // 2022-01-02 04:00:00
- 1641081600000L, // 2022-01-02 08:00:00
+ 1641038400000L, // 2022-01-01 20:00:00
+ 1641060000000L, // 2022-01-02 02:00:00
+ 1641067200000L, // 2022-01-02 04:00:00
+ 1641081600000L, // 2022-01-02 08:00:00
};
final int[] levels = {100, 94, 90, 82};
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
@@ -427,29 +495,30 @@
final BatteryLevelData resultData =
DataProcessor.getLevelDataThroughProcessedHistoryMap(mContext, batteryHistoryMap);
- final List<Long> expectedDailyTimestamps = List.of(
- 1641038400000L, // 2022-01-01 20:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- 1641081600000L // 2022-01-02 08:00:00
- );
+ final List<Long> expectedDailyTimestamps =
+ List.of(
+ 1641038400000L, // 2022-01-01 20:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641081600000L // 2022-01-02 08:00:00
+ );
final List<Integer> expectedDailyLevels = new ArrayList<>();
expectedDailyLevels.add(100);
expectedDailyLevels.add(BATTERY_LEVEL_UNKNOWN);
expectedDailyLevels.add(82);
- final List<List<Long>> expectedHourlyTimestamps = List.of(
+ final List<List<Long>> expectedHourlyTimestamps =
List.of(
- 1641038400000L, // 2022-01-01 20:00:00
- 1641045600000L, // 2022-01-01 22:00:00
- 1641052800000L // 2022-01-02 00:00:00
- ),
- List.of(
- 1641052800000L, // 2022-01-02 00:00:00
- 1641060000000L, // 2022-01-02 02:00:00
- 1641067200000L, // 2022-01-02 04:00:00
- 1641074400000L, // 2022-01-02 06:00:00
- 1641081600000L // 2022-01-02 08:00:00
- )
- );
+ List.of(
+ 1641038400000L, // 2022-01-01 20:00:00
+ 1641045600000L, // 2022-01-01 22:00:00
+ 1641052800000L // 2022-01-02 00:00:00
+ ),
+ List.of(
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641060000000L, // 2022-01-02 02:00:00
+ 1641067200000L, // 2022-01-02 04:00:00
+ 1641074400000L, // 2022-01-02 06:00:00
+ 1641081600000L // 2022-01-02 08:00:00
+ ));
final List<Integer> expectedHourlyLevels1 = new ArrayList<>();
expectedHourlyLevels1.add(100);
expectedHourlyLevels1.add(BATTERY_LEVEL_UNKNOWN);
@@ -460,10 +529,8 @@
expectedHourlyLevels2.add(90);
expectedHourlyLevels2.add(BATTERY_LEVEL_UNKNOWN);
expectedHourlyLevels2.add(82);
- final List<List<Integer>> expectedHourlyLevels = List.of(
- expectedHourlyLevels1,
- expectedHourlyLevels2
- );
+ final List<List<Integer>> expectedHourlyLevels =
+ List.of(expectedHourlyLevels1, expectedHourlyLevels2);
verifyExpectedBatteryLevelData(
resultData,
expectedDailyTimestamps,
@@ -477,8 +544,8 @@
// Timezone PST 2022-11-06 has an extra 01:00:00 - 01:59:59 for daylight saving.
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
final long[] timestamps = {
- 1667667600000L, // 2022-11-05 10:00:00
- 1667829600000L // 2022-11-07 06:00:00
+ 1667667600000L, // 2022-11-05 10:00:00
+ 1667829600000L // 2022-11-07 06:00:00
};
final int[] levels = {100, 88};
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
@@ -488,51 +555,52 @@
final BatteryLevelData resultData =
DataProcessor.getLevelDataThroughProcessedHistoryMap(mContext, batteryHistoryMap);
- final List<Long> expectedDailyTimestamps = List.of(
- 1667667600000L, // 2022-11-05 10:00:00
- 1667718000000L, // 2022-11-06 00:00:00
- 1667808000000L, // 2022-11-07 00:00:00
- 1667829600000L // 2022-11-07 06:00:00
- );
+ final List<Long> expectedDailyTimestamps =
+ List.of(
+ 1667667600000L, // 2022-11-05 10:00:00
+ 1667718000000L, // 2022-11-06 00:00:00
+ 1667808000000L, // 2022-11-07 00:00:00
+ 1667829600000L // 2022-11-07 06:00:00
+ );
final List<Integer> expectedDailyLevels = new ArrayList<>();
expectedDailyLevels.add(100);
expectedDailyLevels.add(BATTERY_LEVEL_UNKNOWN);
expectedDailyLevels.add(BATTERY_LEVEL_UNKNOWN);
expectedDailyLevels.add(88);
- final List<List<Long>> expectedHourlyTimestamps = List.of(
+ final List<List<Long>> expectedHourlyTimestamps =
List.of(
- 1667667600000L, // 2022-11-05 10:00:00
- 1667674800000L, // 2022-11-05 12:00:00
- 1667682000000L, // 2022-11-05 14:00:00
- 1667689200000L, // 2022-11-05 16:00:00
- 1667696400000L, // 2022-11-05 18:00:00
- 1667703600000L, // 2022-11-05 20:00:00
- 1667710800000L, // 2022-11-05 22:00:00
- 1667718000000L // 2022-11-06 00:00:00
- ),
- List.of(
- 1667718000000L, // 2022-11-06 00:00:00
- 1667725200000L, // 2022-11-06 01:00:00 after daylight saving change
- 1667732400000L, // 2022-11-06 03:00:00
- 1667739600000L, // 2022-11-06 05:00:00
- 1667746800000L, // 2022-11-06 07:00:00
- 1667754000000L, // 2022-11-06 09:00:00
- 1667761200000L, // 2022-11-06 11:00:00
- 1667768400000L, // 2022-11-06 13:00:00
- 1667775600000L, // 2022-11-06 15:00:00
- 1667782800000L, // 2022-11-06 17:00:00
- 1667790000000L, // 2022-11-06 19:00:00
- 1667797200000L, // 2022-11-06 21:00:00
- 1667804400000L, // 2022-11-06 23:00:00
- 1667808000000L // 2022-11-07 00:00:00
- ),
- List.of(
- 1667808000000L, // 2022-11-07 00:00:00
- 1667815200000L, // 2022-11-07 02:00:00
- 1667822400000L, // 2022-11-07 04:00:00
- 1667829600000L // 2022-11-07 06:00:00
- )
- );
+ List.of(
+ 1667667600000L, // 2022-11-05 10:00:00
+ 1667674800000L, // 2022-11-05 12:00:00
+ 1667682000000L, // 2022-11-05 14:00:00
+ 1667689200000L, // 2022-11-05 16:00:00
+ 1667696400000L, // 2022-11-05 18:00:00
+ 1667703600000L, // 2022-11-05 20:00:00
+ 1667710800000L, // 2022-11-05 22:00:00
+ 1667718000000L // 2022-11-06 00:00:00
+ ),
+ List.of(
+ 1667718000000L, // 2022-11-06 00:00:00
+ 1667725200000L, // 2022-11-06 01:00:00 after daylight saving change
+ 1667732400000L, // 2022-11-06 03:00:00
+ 1667739600000L, // 2022-11-06 05:00:00
+ 1667746800000L, // 2022-11-06 07:00:00
+ 1667754000000L, // 2022-11-06 09:00:00
+ 1667761200000L, // 2022-11-06 11:00:00
+ 1667768400000L, // 2022-11-06 13:00:00
+ 1667775600000L, // 2022-11-06 15:00:00
+ 1667782800000L, // 2022-11-06 17:00:00
+ 1667790000000L, // 2022-11-06 19:00:00
+ 1667797200000L, // 2022-11-06 21:00:00
+ 1667804400000L, // 2022-11-06 23:00:00
+ 1667808000000L // 2022-11-07 00:00:00
+ ),
+ List.of(
+ 1667808000000L, // 2022-11-07 00:00:00
+ 1667815200000L, // 2022-11-07 02:00:00
+ 1667822400000L, // 2022-11-07 04:00:00
+ 1667829600000L // 2022-11-07 06:00:00
+ ));
final List<Integer> expectedHourlyLevels1 = new ArrayList<>();
expectedHourlyLevels1.add(100);
expectedHourlyLevels1.add(BATTERY_LEVEL_UNKNOWN);
@@ -562,11 +630,8 @@
expectedHourlyLevels3.add(BATTERY_LEVEL_UNKNOWN);
expectedHourlyLevels3.add(BATTERY_LEVEL_UNKNOWN);
expectedHourlyLevels3.add(88);
- final List<List<Integer>> expectedHourlyLevels = List.of(
- expectedHourlyLevels1,
- expectedHourlyLevels2,
- expectedHourlyLevels3
- );
+ final List<List<Integer>> expectedHourlyLevels =
+ List.of(expectedHourlyLevels1, expectedHourlyLevels2, expectedHourlyLevels3);
verifyExpectedBatteryLevelData(
resultData,
expectedDailyTimestamps,
@@ -580,8 +645,8 @@
// Timezone PST 2022-03-13 has no 02:00:00 - 02:59:59 for daylight saving.
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
final long[] timestamps = {
- 1647151200000L, // 2022-03-12 22:00:00
- 1647262800000L // 2022-03-14 06:00:00
+ 1647151200000L, // 2022-03-12 22:00:00
+ 1647262800000L // 2022-03-14 06:00:00
};
final int[] levels = {100, 88};
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
@@ -591,44 +656,45 @@
final BatteryLevelData resultData =
DataProcessor.getLevelDataThroughProcessedHistoryMap(mContext, batteryHistoryMap);
- final List<Long> expectedDailyTimestamps = List.of(
- 1647151200000L, // 2022-03-12 22:00:00
- 1647158400000L, // 2022-03-13 00:00:00
- 1647241200000L, // 2022-03-14 00:00:00
- 1647262800000L // 2022-03-14 06:00:00
- );
+ final List<Long> expectedDailyTimestamps =
+ List.of(
+ 1647151200000L, // 2022-03-12 22:00:00
+ 1647158400000L, // 2022-03-13 00:00:00
+ 1647241200000L, // 2022-03-14 00:00:00
+ 1647262800000L // 2022-03-14 06:00:00
+ );
final List<Integer> expectedDailyLevels = new ArrayList<>();
expectedDailyLevels.add(100);
expectedDailyLevels.add(BATTERY_LEVEL_UNKNOWN);
expectedDailyLevels.add(BATTERY_LEVEL_UNKNOWN);
expectedDailyLevels.add(88);
- final List<List<Long>> expectedHourlyTimestamps = List.of(
+ final List<List<Long>> expectedHourlyTimestamps =
List.of(
- 1647151200000L, // 2022-03-12 22:00:00
- 1647158400000L // 2022-03-13 00:00:00
- ),
- List.of(
- 1647158400000L, // 2022-03-13 00:00:00
- 1647165600000L, // 2022-03-13 03:00:00 after daylight saving change
- 1647172800000L, // 2022-03-13 05:00:00
- 1647180000000L, // 2022-03-13 07:00:00
- 1647187200000L, // 2022-03-13 09:00:00
- 1647194400000L, // 2022-03-13 11:00:00
- 1647201600000L, // 2022-03-13 13:00:00
- 1647208800000L, // 2022-03-13 15:00:00
- 1647216000000L, // 2022-03-13 17:00:00
- 1647223200000L, // 2022-03-13 19:00:00
- 1647230400000L, // 2022-03-13 21:00:00
- 1647237600000L, // 2022-03-13 23:00:00
- 1647241200000L // 2022-03-14 00:00:00
- ),
- List.of(
- 1647241200000L, // 2022-03-14 00:00:00
- 1647248400000L, // 2022-03-14 02:00:00
- 1647255600000L, // 2022-03-14 04:00:00
- 1647262800000L // 2022-03-14 06:00:00
- )
- );
+ List.of(
+ 1647151200000L, // 2022-03-12 22:00:00
+ 1647158400000L // 2022-03-13 00:00:00
+ ),
+ List.of(
+ 1647158400000L, // 2022-03-13 00:00:00
+ 1647165600000L, // 2022-03-13 03:00:00 after daylight saving change
+ 1647172800000L, // 2022-03-13 05:00:00
+ 1647180000000L, // 2022-03-13 07:00:00
+ 1647187200000L, // 2022-03-13 09:00:00
+ 1647194400000L, // 2022-03-13 11:00:00
+ 1647201600000L, // 2022-03-13 13:00:00
+ 1647208800000L, // 2022-03-13 15:00:00
+ 1647216000000L, // 2022-03-13 17:00:00
+ 1647223200000L, // 2022-03-13 19:00:00
+ 1647230400000L, // 2022-03-13 21:00:00
+ 1647237600000L, // 2022-03-13 23:00:00
+ 1647241200000L // 2022-03-14 00:00:00
+ ),
+ List.of(
+ 1647241200000L, // 2022-03-14 00:00:00
+ 1647248400000L, // 2022-03-14 02:00:00
+ 1647255600000L, // 2022-03-14 04:00:00
+ 1647262800000L // 2022-03-14 06:00:00
+ ));
final List<Integer> expectedHourlyLevels1 = new ArrayList<>();
expectedHourlyLevels1.add(100);
expectedHourlyLevels1.add(BATTERY_LEVEL_UNKNOWN);
@@ -651,11 +717,8 @@
expectedHourlyLevels3.add(BATTERY_LEVEL_UNKNOWN);
expectedHourlyLevels3.add(BATTERY_LEVEL_UNKNOWN);
expectedHourlyLevels3.add(88);
- final List<List<Integer>> expectedHourlyLevels = List.of(
- expectedHourlyLevels1,
- expectedHourlyLevels2,
- expectedHourlyLevels3
- );
+ final List<List<Integer>> expectedHourlyLevels =
+ List.of(expectedHourlyLevels1, expectedHourlyLevels2, expectedHourlyLevels3);
verifyExpectedBatteryLevelData(
resultData,
expectedDailyTimestamps,
@@ -666,8 +729,9 @@
@Test
public void getTimestampSlots_emptyRawList_returnEmptyList() {
- final List<Long> resultList = DataProcessor.getTimestampSlots(
- new ArrayList<>(), 1641038400000L); // 2022-01-01 20:00:00
+ final List<Long> resultList =
+ DataProcessor.getTimestampSlots(
+ new ArrayList<>(), 1641038400000L); // 2022-01-01 20:00:00
assertThat(resultList).isEmpty();
}
@@ -756,20 +820,24 @@
@Test
public void findNearestTimestamp_returnExpectedResult() {
- long[] results = DataProcessor.findNearestTimestamp(
- Arrays.asList(10L, 20L, 30L, 40L), /*target=*/ 15L);
+ long[] results =
+ DataProcessor.findNearestTimestamp(
+ Arrays.asList(10L, 20L, 30L, 40L), /* target= */ 15L);
assertThat(results).isEqualTo(new long[] {10L, 20L});
- results = DataProcessor.findNearestTimestamp(
- Arrays.asList(10L, 20L, 30L, 40L), /*target=*/ 10L);
+ results =
+ DataProcessor.findNearestTimestamp(
+ Arrays.asList(10L, 20L, 30L, 40L), /* target= */ 10L);
assertThat(results).isEqualTo(new long[] {10L, 10L});
- results = DataProcessor.findNearestTimestamp(
- Arrays.asList(10L, 20L, 30L, 40L), /*target=*/ 5L);
+ results =
+ DataProcessor.findNearestTimestamp(
+ Arrays.asList(10L, 20L, 30L, 40L), /* target= */ 5L);
assertThat(results).isEqualTo(new long[] {0L, 10L});
- results = DataProcessor.findNearestTimestamp(
- Arrays.asList(10L, 20L, 30L, 40L), /*target=*/ 50L);
+ results =
+ DataProcessor.findNearestTimestamp(
+ Arrays.asList(10L, 20L, 30L, 40L), /* target= */ 50L);
assertThat(results).isEqualTo(new long[] {40L, 0L});
}
@@ -781,36 +849,100 @@
hourlyBatteryLevelsPerDay.add(
new BatteryLevelData.PeriodBatteryLevelData(new ArrayMap<>(), new ArrayList<>()));
- assertThat(DataProcessor.getBatteryDiffDataMap(mContext, hourlyBatteryLevelsPerDay,
- new HashMap<>(), /*appUsagePeriodMap=*/ null, Set.of(), Set.of())).isEmpty();
+ assertThat(
+ DataProcessor.getBatteryDiffDataMap(
+ mContext,
+ hourlyBatteryLevelsPerDay,
+ new HashMap<>(),
+ /* appUsagePeriodMap= */ null,
+ Set.of(),
+ Set.of()))
+ .isEmpty();
}
@Test
public void getBatteryDiffDataMap_normalFlow_returnExpectedResult() {
final int userId = mContext.getUserId();
- final long[] batteryHistoryKeys = new long[]{
- 1641045600000L, // 2022-01-01 22:00:00
- 1641049200000L, // 2022-01-01 23:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- };
- final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap = Map.of(
- batteryHistoryKeys[0], Map.of(FAKE_PACKAGE_NAME, createBatteryHistEntry(
- FAKE_PACKAGE_NAME, "fake_label", /*consumePower=*/ 0, 0, 0,
- 0, 0, 0L, userId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, 0L, 0L, false)),
- batteryHistoryKeys[1], Map.of(FAKE_PACKAGE_NAME, createBatteryHistEntry(
- FAKE_PACKAGE_NAME, "fake_label", /*consumePower=*/ 5, 0, 0,
- 0, 0, 0L, userId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, 0L, 0L, false)),
- batteryHistoryKeys[2], Map.of(FAKE_PACKAGE_NAME, createBatteryHistEntry(
- FAKE_PACKAGE_NAME, "fake_label", /*consumePower=*/ 16, 0, 0,
- 0, 0, 0L, userId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, 0L, 0L, false)));
+ final long[] batteryHistoryKeys =
+ new long[] {
+ 1641045600000L, // 2022-01-01 22:00:00
+ 1641049200000L, // 2022-01-01 23:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ };
+ final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
+ Map.of(
+ batteryHistoryKeys[0],
+ Map.of(
+ FAKE_PACKAGE_NAME,
+ createBatteryHistEntry(
+ FAKE_PACKAGE_NAME,
+ "fake_label",
+ /* consumePower= */ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0L,
+ userId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ 0L,
+ 0L,
+ false)),
+ batteryHistoryKeys[1],
+ Map.of(
+ FAKE_PACKAGE_NAME,
+ createBatteryHistEntry(
+ FAKE_PACKAGE_NAME,
+ "fake_label",
+ /* consumePower= */ 5,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0L,
+ userId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ 0L,
+ 0L,
+ false)),
+ batteryHistoryKeys[2],
+ Map.of(
+ FAKE_PACKAGE_NAME,
+ createBatteryHistEntry(
+ FAKE_PACKAGE_NAME,
+ "fake_label",
+ /* consumePower= */ 16,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0L,
+ userId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ 0L,
+ 0L,
+ false)));
final BatteryLevelData batteryLevelData = generateBatteryLevelData(batteryHistoryKeys);
final Map<Integer, Map<Integer, Map<Long, Map<String, List<AppUsagePeriod>>>>>
- appUsagePeriodMap = Map.of(0, Map.of(0, Map.of(Long.valueOf(userId), Map.of(
- FAKE_PACKAGE_NAME, List.of(buildAppUsagePeriod(0, 6))))));
+ appUsagePeriodMap =
+ Map.of(
+ 0,
+ Map.of(
+ 0,
+ Map.of(
+ Long.valueOf(userId),
+ Map.of(
+ FAKE_PACKAGE_NAME,
+ List.of(buildAppUsagePeriod(0, 6))))));
- Map<Long, BatteryDiffData> batteryDiffDataMap = DataProcessor.getBatteryDiffDataMap(
- mContext, batteryLevelData.getHourlyBatteryLevelsPerDay(), batteryHistoryMap,
- appUsagePeriodMap, Set.of(), Set.of());
+ Map<Long, BatteryDiffData> batteryDiffDataMap =
+ DataProcessor.getBatteryDiffDataMap(
+ mContext,
+ batteryLevelData.getHourlyBatteryLevelsPerDay(),
+ batteryHistoryMap,
+ appUsagePeriodMap,
+ Set.of(),
+ Set.of());
assertThat(batteryDiffDataMap).hasSize(1);
assertThat(batteryDiffDataMap).containsKey(batteryHistoryKeys[0]);
@@ -821,31 +953,48 @@
@Test
public void generateBatteryUsageMap_returnsExpectedResult() {
- final long[] batteryHistoryKeys = new long[]{
- 1641045600000L, // 2022-01-01 22:00:00
- 1641049200000L, // 2022-01-01 23:00:00
- 1641052800000L, // 2022-01-02 00:00:00
- 1641056400000L, // 2022-01-02 01:00:00
- 1641060000000L, // 2022-01-02 02:00:00
- };
+ final long[] batteryHistoryKeys =
+ new long[] {
+ 1641045600000L, // 2022-01-01 22:00:00
+ 1641049200000L, // 2022-01-01 23:00:00
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641056400000L, // 2022-01-02 01:00:00
+ 1641060000000L, // 2022-01-02 02:00:00
+ };
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap = new HashMap<>();
final int currentUserId = mContext.getUserId();
- final BatteryHistEntry fakeEntry = createBatteryHistEntry(
- FAKE_PACKAGE_NAME, "fake_label", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 0L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
- /*foregroundUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L,
- /*isHidden=*/ false);
+ final BatteryHistEntry fakeEntry =
+ createBatteryHistEntry(
+ FAKE_PACKAGE_NAME,
+ "fake_label",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 0L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
// Adds the index = 0 data.
Map<String, BatteryHistEntry> entryMap = new HashMap<>();
- BatteryHistEntry entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 5.0,
- /*foregroundUsageConsumePower=*/ 2, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 3, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ BatteryHistEntry entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 5.0,
+ /* foregroundUsageConsumePower= */ 2,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 3,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 10L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
entryMap.put(fakeEntry.getKey(), fakeEntry);
batteryHistoryMap.put(batteryHistoryKeys[0], entryMap);
@@ -855,69 +1004,125 @@
batteryHistoryMap.put(batteryHistoryKeys[1], entryMap);
// Adds the index = 2 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 20.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 15L,
- /*backgroundUsageTimeInMs=*/ 25L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 20.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 15L,
+ /* backgroundUsageTimeInMs= */ 25L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
entryMap.put(fakeEntry.getKey(), fakeEntry);
batteryHistoryMap.put(batteryHistoryKeys[2], entryMap);
// Adds the index = 3 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 40.0,
- /*foregroundUsageConsumePower=*/ 8, /*foregroundServiceUsageConsumePower=*/ 8,
- /*backgroundUsageConsumePower=*/ 8, /*cachedUsageConsumePower=*/ 8,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 25L,
- /*backgroundUsageTimeInMs=*/ 35L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 40.0,
+ /* foregroundUsageConsumePower= */ 8,
+ /* foregroundServiceUsageConsumePower= */ 8,
+ /* backgroundUsageConsumePower= */ 8,
+ /* cachedUsageConsumePower= */ 8,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 25L,
+ /* backgroundUsageTimeInMs= */ 35L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package3", "Screen", /*consumePower=*/ 10.0,
- /*foregroundUsageConsumePower=*/ 4, /*foregroundServiceUsageConsumePower=*/ 2,
- /*backgroundUsageConsumePower=*/ 2, /*cachedUsageConsumePower=*/ 2,
- /*uid=*/ 3L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*foregroundUsageTimeInMs=*/ 40L,
- /*backgroundUsageTimeInMs=*/ 50L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package3",
+ "Screen",
+ /* consumePower= */ 10.0,
+ /* foregroundUsageConsumePower= */ 4,
+ /* foregroundServiceUsageConsumePower= */ 2,
+ /* backgroundUsageConsumePower= */ 2,
+ /* cachedUsageConsumePower= */ 2,
+ /* uid= */ 3L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
+ /* foregroundUsageTimeInMs= */ 40L,
+ /* backgroundUsageTimeInMs= */ 50L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package4", "label4", /*consumePower=*/ 15.0,
- /*foregroundUsageConsumePower=*/ 6, /*foregroundServiceUsageConsumePower=*/ 3,
- /*backgroundUsageConsumePower=*/ 3, /*cachedUsageConsumePower=*/ 3,
- /*uid=*/ 4L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 5L,
- /*backgroundUsageTimeInMs=*/ 5L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package4",
+ "label4",
+ /* consumePower= */ 15.0,
+ /* foregroundUsageConsumePower= */ 6,
+ /* foregroundServiceUsageConsumePower= */ 3,
+ /* backgroundUsageConsumePower= */ 3,
+ /* cachedUsageConsumePower= */ 3,
+ /* uid= */ 4L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 5L,
+ /* backgroundUsageTimeInMs= */ 5L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
entryMap.put(fakeEntry.getKey(), fakeEntry);
batteryHistoryMap.put(batteryHistoryKeys[3], entryMap);
// Adds the index = 4 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 40.0,
- /*foregroundUsageConsumePower=*/ 14, /*foregroundServiceUsageConsumePower=*/ 9,
- /*backgroundUsageConsumePower=*/ 9, /*cachedUsageConsumePower=*/ 8,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 30L,
- /*backgroundUsageTimeInMs=*/ 40L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 40.0,
+ /* foregroundUsageConsumePower= */ 14,
+ /* foregroundServiceUsageConsumePower= */ 9,
+ /* backgroundUsageConsumePower= */ 9,
+ /* cachedUsageConsumePower= */ 8,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 30L,
+ /* backgroundUsageTimeInMs= */ 40L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package3", "Screen", /*consumePower=*/ 20.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*uid=*/ 3L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*foregroundUsageTimeInMs=*/ 50L,
- /*backgroundUsageTimeInMs=*/ 60L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package3",
+ "Screen",
+ /* consumePower= */ 20.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* uid= */ 3L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
+ /* foregroundUsageTimeInMs= */ 50L,
+ /* backgroundUsageTimeInMs= */ 60L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package4", "label4", /*consumePower=*/ 40.0,
- /*foregroundUsageConsumePower=*/ 8, /*foregroundServiceUsageConsumePower=*/ 8,
- /*backgroundUsageConsumePower=*/ 8, /*cachedUsageConsumePower=*/ 8,
- /*uid=*/ 4L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 5L,
- /*backgroundUsageTimeInMs=*/ 5L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package4",
+ "label4",
+ /* consumePower= */ 40.0,
+ /* foregroundUsageConsumePower= */ 8,
+ /* foregroundServiceUsageConsumePower= */ 8,
+ /* backgroundUsageConsumePower= */ 8,
+ /* cachedUsageConsumePower= */ 8,
+ /* uid= */ 4L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 5L,
+ /* backgroundUsageTimeInMs= */ 5L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
entryMap.put(fakeEntry.getKey(), fakeEntry);
batteryHistoryMap.put(batteryHistoryKeys[4], entryMap);
@@ -938,18 +1143,22 @@
appUsageMap = new HashMap<>();
userPeriodMap = new HashMap<>();
appUsageMap.put(Long.valueOf(currentUserId), userPeriodMap);
- userPeriodMap.put("package2",
- List.of(buildAppUsagePeriod(2, 7), buildAppUsagePeriod(5, 9)));
- userPeriodMap.put("package3",
- List.of(buildAppUsagePeriod(10, 15), buildAppUsagePeriod(25, 29)));
+ userPeriodMap.put(
+ "package2", List.of(buildAppUsagePeriod(2, 7), buildAppUsagePeriod(5, 9)));
+ userPeriodMap.put(
+ "package3", List.of(buildAppUsagePeriod(10, 15), buildAppUsagePeriod(25, 29)));
appUsagePeriodMap.get(1).put(0, appUsageMap);
final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =
DataProcessor.generateBatteryUsageMap(
mContext,
- DataProcessor.getBatteryDiffDataMap(mContext,
- batteryLevelData.getHourlyBatteryLevelsPerDay(), batteryHistoryMap,
- appUsagePeriodMap, Set.of(), Set.of()),
+ DataProcessor.getBatteryDiffDataMap(
+ mContext,
+ batteryLevelData.getHourlyBatteryLevelsPerDay(),
+ batteryHistoryMap,
+ appUsagePeriodMap,
+ Set.of(),
+ Set.of()),
batteryLevelData);
BatteryDiffData resultDiffData =
@@ -958,146 +1167,261 @@
.get(DataProcessor.SELECTED_INDEX_ALL);
assertThat(resultDiffData.getScreenOnTime()).isEqualTo(36L);
assertBatteryDiffEntry(
- resultDiffData.getAppDiffEntryList().get(0), currentUserId, /*uid=*/ 2L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 50.0,
- /*foregroundUsageConsumePower=*/ 14, /*foregroundServiceUsageConsumePower=*/ 9,
- /*backgroundUsageConsumePower=*/ 9, /*cachedUsageConsumePower=*/ 8,
- /*foregroundUsageTimeInMs=*/ 30, /*backgroundUsageTimeInMs=*/ 40,
- /*screenOnTimeInMs=*/ 12);
+ resultDiffData.getAppDiffEntryList().get(0),
+ currentUserId,
+ /* uid= */ 2L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 50.0,
+ /* foregroundUsageConsumePower= */ 14,
+ /* foregroundServiceUsageConsumePower= */ 9,
+ /* backgroundUsageConsumePower= */ 9,
+ /* cachedUsageConsumePower= */ 8,
+ /* foregroundUsageTimeInMs= */ 30,
+ /* backgroundUsageTimeInMs= */ 40,
+ /* screenOnTimeInMs= */ 12);
assertBatteryDiffEntry(
- resultDiffData.getAppDiffEntryList().get(1), currentUserId, /*uid=*/ 4L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 50.0,
- /*foregroundUsageConsumePower=*/ 8, /*foregroundServiceUsageConsumePower=*/ 8,
- /*backgroundUsageConsumePower=*/ 8, /*cachedUsageConsumePower=*/ 8,
- /*foregroundUsageTimeInMs=*/ 5, /*backgroundUsageTimeInMs=*/ 5,
- /*screenOnTimeInMs=*/ 0);
+ resultDiffData.getAppDiffEntryList().get(1),
+ currentUserId,
+ /* uid= */ 4L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 50.0,
+ /* foregroundUsageConsumePower= */ 8,
+ /* foregroundServiceUsageConsumePower= */ 8,
+ /* backgroundUsageConsumePower= */ 8,
+ /* cachedUsageConsumePower= */ 8,
+ /* foregroundUsageTimeInMs= */ 5,
+ /* backgroundUsageTimeInMs= */ 5,
+ /* screenOnTimeInMs= */ 0);
assertBatteryDiffEntry(
- resultDiffData.getSystemDiffEntryList().get(0), currentUserId, /*uid=*/ 3L,
- ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*consumePercentage=*/ 100.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*foregroundUsageTimeInMs=*/ 16, /*backgroundUsageTimeInMs=*/ 60,
- /*screenOnTimeInMs=*/ 9);
+ resultDiffData.getSystemDiffEntryList().get(0),
+ currentUserId,
+ /* uid= */ 3L,
+ ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
+ /* consumePercentage= */ 100.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* foregroundUsageTimeInMs= */ 16,
+ /* backgroundUsageTimeInMs= */ 60,
+ /* screenOnTimeInMs= */ 9);
resultDiffData = resultMap.get(0).get(DataProcessor.SELECTED_INDEX_ALL);
assertBatteryDiffEntry(
- resultDiffData.getAppDiffEntryList().get(0), currentUserId, /*uid=*/ 2L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 100.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*foregroundUsageTimeInMs=*/ 15, /*backgroundUsageTimeInMs=*/ 25,
- /*screenOnTimeInMs=*/ 5);
+ resultDiffData.getAppDiffEntryList().get(0),
+ currentUserId,
+ /* uid= */ 2L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 100.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* foregroundUsageTimeInMs= */ 15,
+ /* backgroundUsageTimeInMs= */ 25,
+ /* screenOnTimeInMs= */ 5);
resultDiffData = resultMap.get(1).get(DataProcessor.SELECTED_INDEX_ALL);
assertBatteryDiffEntry(
- resultDiffData.getAppDiffEntryList().get(0), currentUserId, /*uid=*/ 4L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 66.66666666666666,
- /*foregroundUsageConsumePower=*/ 8, /*foregroundServiceUsageConsumePower=*/ 8,
- /*backgroundUsageConsumePower=*/ 8, /*cachedUsageConsumePower=*/ 8,
- /*foregroundUsageTimeInMs=*/ 5, /*backgroundUsageTimeInMs=*/ 5,
- /*screenOnTimeInMs=*/ 0);
+ resultDiffData.getAppDiffEntryList().get(0),
+ currentUserId,
+ /* uid= */ 4L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 66.66666666666666,
+ /* foregroundUsageConsumePower= */ 8,
+ /* foregroundServiceUsageConsumePower= */ 8,
+ /* backgroundUsageConsumePower= */ 8,
+ /* cachedUsageConsumePower= */ 8,
+ /* foregroundUsageTimeInMs= */ 5,
+ /* backgroundUsageTimeInMs= */ 5,
+ /* screenOnTimeInMs= */ 0);
assertBatteryDiffEntry(
- resultDiffData.getAppDiffEntryList().get(1), currentUserId, /*uid=*/ 2L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 33.33333333333333,
- /*foregroundUsageConsumePower=*/ 9, /*foregroundServiceUsageConsumePower=*/ 4,
- /*backgroundUsageConsumePower=*/ 4, /*cachedUsageConsumePower=*/ 3,
- /*foregroundUsageTimeInMs=*/ 15, /*backgroundUsageTimeInMs=*/ 15,
- /*screenOnTimeInMs=*/ 7);
+ resultDiffData.getAppDiffEntryList().get(1),
+ currentUserId,
+ /* uid= */ 2L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 33.33333333333333,
+ /* foregroundUsageConsumePower= */ 9,
+ /* foregroundServiceUsageConsumePower= */ 4,
+ /* backgroundUsageConsumePower= */ 4,
+ /* cachedUsageConsumePower= */ 3,
+ /* foregroundUsageTimeInMs= */ 15,
+ /* backgroundUsageTimeInMs= */ 15,
+ /* screenOnTimeInMs= */ 7);
assertBatteryDiffEntry(
- resultDiffData.getSystemDiffEntryList().get(0), currentUserId, /*uid=*/ 3L,
- ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*consumePercentage=*/ 100.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*foregroundUsageTimeInMs=*/ 16, /*backgroundUsageTimeInMs=*/ 60,
- /*screenOnTimeInMs=*/ 9);
+ resultDiffData.getSystemDiffEntryList().get(0),
+ currentUserId,
+ /* uid= */ 3L,
+ ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
+ /* consumePercentage= */ 100.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* foregroundUsageTimeInMs= */ 16,
+ /* backgroundUsageTimeInMs= */ 60,
+ /* screenOnTimeInMs= */ 9);
}
@Test
public void generateBatteryUsageMap_multipleUsers_returnsExpectedResult() {
- final long[] batteryHistoryKeys = new long[]{
- 1641052800000L, // 2022-01-02 00:00:00
- 1641056400000L, // 2022-01-02 01:00:00
- 1641060000000L // 2022-01-02 02:00:00
- };
+ final long[] batteryHistoryKeys =
+ new long[] {
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641056400000L, // 2022-01-02 01:00:00
+ 1641060000000L // 2022-01-02 02:00:00
+ };
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap = new HashMap<>();
final int currentUserId = mContext.getUserId();
// Adds the index = 0 data.
Map<String, BatteryHistEntry> entryMap = new HashMap<>();
- BatteryHistEntry entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 5.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ BatteryHistEntry entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 5.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 10L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 10.0,
- /*foregroundUsageConsumePower=*/ 7, /*foregroundServiceUsageConsumePower=*/ 1,
- /*backgroundUsageConsumePower=*/ 1, /*cachedUsageConsumePower=*/ 1,
- /*uid=*/ 2L, currentUserId + 1,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 10.0,
+ /* foregroundUsageConsumePower= */ 7,
+ /* foregroundServiceUsageConsumePower= */ 1,
+ /* backgroundUsageConsumePower= */ 1,
+ /* cachedUsageConsumePower= */ 1,
+ /* uid= */ 2L,
+ currentUserId + 1,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 10L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 5.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 3L, currentUserId + 2,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 20L,
- /*backgroundUsageTimeInMs=*/ 30L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 5.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 3L,
+ currentUserId + 2,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 20L,
+ /* backgroundUsageTimeInMs= */ 30L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[0], entryMap);
// Adds the index = 1 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 15.0,
- /*foregroundUsageConsumePower=*/ 9, /*foregroundServiceUsageConsumePower=*/ 2,
- /*backgroundUsageConsumePower=*/ 2, /*cachedUsageConsumePower=*/ 2,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 20L,
- /*backgroundUsageTimeInMs=*/ 30L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 15.0,
+ /* foregroundUsageConsumePower= */ 9,
+ /* foregroundServiceUsageConsumePower= */ 2,
+ /* backgroundUsageConsumePower= */ 2,
+ /* cachedUsageConsumePower= */ 2,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 20L,
+ /* backgroundUsageTimeInMs= */ 30L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 30.0,
- /*foregroundUsageConsumePower=*/ 20, /*foregroundServiceUsageConsumePower=*/ 6,
- /*backgroundUsageConsumePower=*/ 2, /*cachedUsageConsumePower=*/ 2,
- /*uid=*/ 2L, currentUserId + 1,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 30.0,
+ /* foregroundUsageConsumePower= */ 20,
+ /* foregroundServiceUsageConsumePower= */ 6,
+ /* backgroundUsageConsumePower= */ 2,
+ /* cachedUsageConsumePower= */ 2,
+ /* uid= */ 2L,
+ currentUserId + 1,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 10L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 15.0,
- /*foregroundUsageConsumePower=*/ 10, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 3L, currentUserId + 2,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 30L,
- /*backgroundUsageTimeInMs=*/ 30L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 15.0,
+ /* foregroundUsageConsumePower= */ 10,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 3L,
+ currentUserId + 2,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 30L,
+ /* backgroundUsageTimeInMs= */ 30L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[1], entryMap);
// Adds the index = 2 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 25.0,
- /*foregroundUsageConsumePower=*/ 10, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 20L,
- /*backgroundUsageTimeInMs=*/ 30L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 25.0,
+ /* foregroundUsageConsumePower= */ 10,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 20L,
+ /* backgroundUsageTimeInMs= */ 30L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 50.0,
- /*foregroundUsageConsumePower=*/ 20, /*foregroundServiceUsageConsumePower=*/ 10,
- /*backgroundUsageConsumePower=*/ 10, /*cachedUsageConsumePower=*/ 10,
- /*uid=*/ 2L, currentUserId + 1,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 20L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 50.0,
+ /* foregroundUsageConsumePower= */ 20,
+ /* foregroundServiceUsageConsumePower= */ 10,
+ /* backgroundUsageConsumePower= */ 10,
+ /* cachedUsageConsumePower= */ 10,
+ /* uid= */ 2L,
+ currentUserId + 1,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 20L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 25.0,
- /*foregroundUsageConsumePower=*/ 10, /*foregroundServiceUsageConsumePower=*/ 10,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 3L, currentUserId + 2,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 30L,
- /*backgroundUsageTimeInMs=*/ 30L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 25.0,
+ /* foregroundUsageConsumePower= */ 10,
+ /* foregroundServiceUsageConsumePower= */ 10,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 3L,
+ currentUserId + 2,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 30L,
+ /* backgroundUsageTimeInMs= */ 30L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[2], entryMap);
final BatteryLevelData batteryLevelData = generateBatteryLevelData(batteryHistoryKeys);
@@ -1105,9 +1429,13 @@
final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =
DataProcessor.generateBatteryUsageMap(
mContext,
- DataProcessor.getBatteryDiffDataMap(mContext,
- batteryLevelData.getHourlyBatteryLevelsPerDay(), batteryHistoryMap,
- /*appUsagePeriodMap=*/ null, Set.of(), Set.of()),
+ DataProcessor.getBatteryDiffDataMap(
+ mContext,
+ batteryLevelData.getHourlyBatteryLevelsPerDay(),
+ batteryHistoryMap,
+ /* appUsagePeriodMap= */ null,
+ Set.of(),
+ Set.of()),
batteryLevelData);
final BatteryDiffData resultDiffData =
@@ -1116,12 +1444,18 @@
.get(DataProcessor.SELECTED_INDEX_ALL);
assertThat(resultDiffData.getScreenOnTime()).isEqualTo(0L);
assertBatteryDiffEntry(
- resultDiffData.getAppDiffEntryList().get(0), currentUserId, /*uid=*/ 1L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 100.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*foregroundUsageTimeInMs=*/ 10, /*backgroundUsageTimeInMs=*/ 10,
- /*screenOnTimeInMs=*/ 0);
+ resultDiffData.getAppDiffEntryList().get(0),
+ currentUserId,
+ /* uid= */ 1L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 100.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* foregroundUsageTimeInMs= */ 10,
+ /* backgroundUsageTimeInMs= */ 10,
+ /* screenOnTimeInMs= */ 0);
assertThat(resultDiffData.getSystemDiffEntryList()).isEmpty();
assertThat(resultMap.get(0).get(0)).isNotNull();
assertThat(resultMap.get(0).get(DataProcessor.SELECTED_INDEX_ALL)).isNotNull();
@@ -1129,44 +1463,69 @@
@Test
public void generateBatteryUsageMap_usageTimeExceed_returnsExpectedResult() {
- final long[] batteryHistoryKeys = new long[]{
- 1641052800000L, // 2022-01-02 00:00:00
- 1641056400000L, // 2022-01-02 01:00:00
- 1641060000000L // 2022-01-02 02:00:00
- };
+ final long[] batteryHistoryKeys =
+ new long[] {
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641056400000L, // 2022-01-02 01:00:00
+ 1641060000000L // 2022-01-02 02:00:00
+ };
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap = new HashMap<>();
final int currentUserId = mContext.getUserId();
// Adds the index = 0 data.
Map<String, BatteryHistEntry> entryMap = new HashMap<>();
- BatteryHistEntry entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ BatteryHistEntry entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[0], entryMap);
// Adds the index = 1 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[1], entryMap);
// Adds the index = 2 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 500.0,
- /*foregroundUsageConsumePower=*/ 200, /*foregroundServiceUsageConsumePower=*/ 100,
- /*backgroundUsageConsumePower=*/ 100, /*cachedUsageConsumePower=*/ 100,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 3600000L,
- /*backgroundUsageTimeInMs=*/ 7200000L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 500.0,
+ /* foregroundUsageConsumePower= */ 200,
+ /* foregroundServiceUsageConsumePower= */ 100,
+ /* backgroundUsageConsumePower= */ 100,
+ /* cachedUsageConsumePower= */ 100,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 3600000L,
+ /* backgroundUsageTimeInMs= */ 7200000L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[2], entryMap);
final BatteryLevelData batteryLevelData = generateBatteryLevelData(batteryHistoryKeys);
@@ -1185,9 +1544,13 @@
final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =
DataProcessor.generateBatteryUsageMap(
mContext,
- DataProcessor.getBatteryDiffDataMap(mContext,
- batteryLevelData.getHourlyBatteryLevelsPerDay(), batteryHistoryMap,
- appUsagePeriodMap, Set.of(), Set.of()),
+ DataProcessor.getBatteryDiffDataMap(
+ mContext,
+ batteryLevelData.getHourlyBatteryLevelsPerDay(),
+ batteryHistoryMap,
+ appUsagePeriodMap,
+ Set.of(),
+ Set.of()),
batteryLevelData);
final BatteryDiffData resultDiffData =
@@ -1200,10 +1563,8 @@
final BatteryDiffEntry resultEntry = resultDiffData.getAppDiffEntryList().get(0);
assertThat(resultEntry.mForegroundUsageTimeInMs)
.isEqualTo(Math.round(entry.mForegroundUsageTimeInMs * ratio));
- assertThat(resultEntry.mBackgroundUsageTimeInMs)
- .isEqualTo(0);
- assertThat(resultEntry.mConsumePower)
- .isEqualTo(entry.mConsumePower * ratio);
+ assertThat(resultEntry.mBackgroundUsageTimeInMs).isEqualTo(0);
+ assertThat(resultEntry.mConsumePower).isEqualTo(entry.mConsumePower * ratio);
assertThat(resultEntry.mForegroundUsageConsumePower)
.isEqualTo(entry.mForegroundUsageConsumePower * ratio);
assertThat(resultEntry.mForegroundServiceUsageConsumePower)
@@ -1219,80 +1580,132 @@
@Test
public void generateBatteryUsageMap_hideApplicationEntries_returnsExpectedResult() {
- final long[] batteryHistoryKeys = new long[]{
- 1641052800000L, // 2022-01-02 00:00:00
- 1641056400000L, // 2022-01-02 01:00:00
- 1641060000000L // 2022-01-02 02:00:00
- };
+ final long[] batteryHistoryKeys =
+ new long[] {
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641056400000L, // 2022-01-02 01:00:00
+ 1641060000000L // 2022-01-02 02:00:00
+ };
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap = new HashMap<>();
final int currentUserId = mContext.getUserId();
// Adds the index = 0 data.
Map<String, BatteryHistEntry> entryMap = new HashMap<>();
- BatteryHistEntry entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ BatteryHistEntry entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[0], entryMap);
// Adds the index = 1 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[1], entryMap);
// Adds the index = 2 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 10.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 10.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 10L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 10.0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 10.0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 10L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[2], entryMap);
final BatteryLevelData batteryLevelData = generateBatteryLevelData(batteryHistoryKeys);
- when(mPowerUsageFeatureProvider.getHideApplicationSet())
- .thenReturn(Set.of("package1"));
+ when(mPowerUsageFeatureProvider.getHideApplicationSet()).thenReturn(Set.of("package1"));
final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =
DataProcessor.generateBatteryUsageMap(
mContext,
- DataProcessor.getBatteryDiffDataMap(mContext,
- batteryLevelData.getHourlyBatteryLevelsPerDay(), batteryHistoryMap,
- /*appUsagePeriodMap=*/ null, Set.of(), Set.of()),
+ DataProcessor.getBatteryDiffDataMap(
+ mContext,
+ batteryLevelData.getHourlyBatteryLevelsPerDay(),
+ batteryHistoryMap,
+ /* appUsagePeriodMap= */ null,
+ Set.of(),
+ Set.of()),
batteryLevelData);
final BatteryDiffData resultDiffData =
@@ -1300,78 +1713,133 @@
.get(DataProcessor.SELECTED_INDEX_ALL)
.get(DataProcessor.SELECTED_INDEX_ALL);
assertBatteryDiffEntry(
- resultDiffData.getAppDiffEntryList().get(0), currentUserId, /*uid=*/ 2L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 100.0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*foregroundUsageTimeInMs=*/ 10, /*backgroundUsageTimeInMs=*/ 20,
- /*screenOnTimeInMs=*/ 0);
+ resultDiffData.getAppDiffEntryList().get(0),
+ currentUserId,
+ /* uid= */ 2L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 100.0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* foregroundUsageTimeInMs= */ 10,
+ /* backgroundUsageTimeInMs= */ 20,
+ /* screenOnTimeInMs= */ 0);
}
@Test
public void generateBatteryUsageMap_hideBackgroundUsageTime_returnsExpectedResult() {
- final long[] batteryHistoryKeys = new long[]{
- 1641052800000L, // 2022-01-02 00:00:00
- 1641056400000L, // 2022-01-02 01:00:00
- 1641060000000L // 2022-01-02 02:00:00
- };
+ final long[] batteryHistoryKeys =
+ new long[] {
+ 1641052800000L, // 2022-01-02 00:00:00
+ 1641056400000L, // 2022-01-02 01:00:00
+ 1641060000000L // 2022-01-02 02:00:00
+ };
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap = new HashMap<>();
final int currentUserId = mContext.getUserId();
// Adds the index = 0 data.
Map<String, BatteryHistEntry> entryMap = new HashMap<>();
- BatteryHistEntry entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ BatteryHistEntry entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[0], entryMap);
// Adds the index = 1 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L,
- /*backgroundUsageTimeInMs=*/ 0L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[1], entryMap);
// Adds the index = 2 data.
entryMap = new HashMap<>();
- entry = createBatteryHistEntry(
- "package1", "label1", /*consumePower=*/ 10.0,
- /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 1L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package1",
+ "label1",
+ /* consumePower= */ 10.0,
+ /* foregroundUsageConsumePower= */ 5,
+ /* foregroundServiceUsageConsumePower= */ 5,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 1L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 10L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
- entry = createBatteryHistEntry(
- "package2", "label2", /*consumePower=*/ 10.0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5,
- /*uid=*/ 2L, currentUserId,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L,
- /*backgroundUsageTimeInMs=*/ 20L, /*isHidden=*/ false);
+ entry =
+ createBatteryHistEntry(
+ "package2",
+ "label2",
+ /* consumePower= */ 10.0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 5,
+ /* cachedUsageConsumePower= */ 5,
+ /* uid= */ 2L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 10L,
+ /* backgroundUsageTimeInMs= */ 20L,
+ /* isHidden= */ false);
entryMap.put(entry.getKey(), entry);
batteryHistoryMap.put(batteryHistoryKeys[2], entryMap);
final BatteryLevelData batteryLevelData = generateBatteryLevelData(batteryHistoryKeys);
@@ -1381,9 +1849,13 @@
final Map<Integer, Map<Integer, BatteryDiffData>> resultMap =
DataProcessor.generateBatteryUsageMap(
mContext,
- DataProcessor.getBatteryDiffDataMap(mContext,
- batteryLevelData.getHourlyBatteryLevelsPerDay(), batteryHistoryMap,
- /*appUsagePeriodMap=*/ null, Set.of(), Set.of()),
+ DataProcessor.getBatteryDiffDataMap(
+ mContext,
+ batteryLevelData.getHourlyBatteryLevelsPerDay(),
+ batteryHistoryMap,
+ /* appUsagePeriodMap= */ null,
+ Set.of(),
+ Set.of()),
batteryLevelData);
final BatteryDiffData resultDiffData =
@@ -1398,11 +1870,13 @@
@Test
public void generateBatteryDiffData_emptyBatteryEntryList_returnEmptyBatteryDiffData() {
- final BatteryDiffData batteryDiffData = DataProcessor.generateBatteryDiffData(mContext,
- System.currentTimeMillis(),
- DataProcessor.convertToBatteryHistEntry(null, mBatteryUsageStats),
- /* systemAppsPackageNames= */ Set.of(),
- /* systemAppsUids= */ Set.of());
+ final BatteryDiffData batteryDiffData =
+ DataProcessor.generateBatteryDiffData(
+ mContext,
+ System.currentTimeMillis(),
+ DataProcessor.convertToBatteryHistEntry(null, mBatteryUsageStats),
+ /* systemAppsPackageNames= */ Set.of(),
+ /* systemAppsUids= */ Set.of());
assertThat(batteryDiffData.getAppDiffEntryList()).isEmpty();
assertThat(batteryDiffData.getSystemDiffEntryList()).isEmpty();
}
@@ -1450,37 +1924,60 @@
doReturn(10L).when(mMockBatteryEntry4).getTimeInBackgroundMs();
doReturn(4).when(mMockBatteryEntry4).getUid();
doReturn(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY)
- .when(mMockBatteryEntry4).getConsumerType();
+ .when(mMockBatteryEntry4)
+ .getConsumerType();
doReturn(BatteryConsumer.POWER_COMPONENT_CAMERA)
- .when(mMockBatteryEntry4).getPowerComponentId();
+ .when(mMockBatteryEntry4)
+ .getPowerComponentId();
- final BatteryDiffData batteryDiffData = DataProcessor.generateBatteryDiffData(mContext,
- System.currentTimeMillis(),
- DataProcessor.convertToBatteryHistEntry(batteryEntryList, mBatteryUsageStats),
- /* systemAppsPackageNames= */ Set.of(),
- /* systemAppsUids= */ Set.of());
+ final BatteryDiffData batteryDiffData =
+ DataProcessor.generateBatteryDiffData(
+ mContext,
+ System.currentTimeMillis(),
+ DataProcessor.convertToBatteryHistEntry(
+ batteryEntryList, mBatteryUsageStats),
+ /* systemAppsPackageNames= */ Set.of(),
+ /* systemAppsUids= */ Set.of());
assertBatteryDiffEntry(
- batteryDiffData.getAppDiffEntryList().get(0), 0, /*uid=*/ 2L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 100.0,
- /*foregroundUsageConsumePower=*/ 0.5, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*foregroundUsageTimeInMs=*/ 20, /*backgroundUsageTimeInMs=*/ 20,
- /*screenOnTimeInMs=*/ 0);
+ batteryDiffData.getAppDiffEntryList().get(0),
+ 0,
+ /* uid= */ 2L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 100.0,
+ /* foregroundUsageConsumePower= */ 0.5,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* foregroundUsageTimeInMs= */ 20,
+ /* backgroundUsageTimeInMs= */ 20,
+ /* screenOnTimeInMs= */ 0);
assertBatteryDiffEntry(
- batteryDiffData.getAppDiffEntryList().get(1), 0, /*uid=*/ 1L,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 0.0,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*foregroundUsageTimeInMs=*/ 30, /*backgroundUsageTimeInMs=*/ 40,
- /*screenOnTimeInMs=*/ 0);
+ batteryDiffData.getAppDiffEntryList().get(1),
+ 0,
+ /* uid= */ 1L,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* consumePercentage= */ 0.0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* foregroundUsageTimeInMs= */ 30,
+ /* backgroundUsageTimeInMs= */ 40,
+ /* screenOnTimeInMs= */ 0);
assertBatteryDiffEntry(
- batteryDiffData.getSystemDiffEntryList().get(0), 0, /*uid=*/ 4L,
- ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*consumePercentage=*/ 100.0,
- /*foregroundUsageConsumePower=*/ 0.9, /*foregroundServiceUsageConsumePower=*/ 0.2,
- /*backgroundUsageConsumePower=*/ 0.3, /*cachedUsageConsumePower=*/ 0.1,
- /*foregroundUsageTimeInMs=*/ 10, /*backgroundUsageTimeInMs=*/ 10,
- /*screenOnTimeInMs=*/ 0);
+ batteryDiffData.getSystemDiffEntryList().get(0),
+ 0,
+ /* uid= */ 4L,
+ ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
+ /* consumePercentage= */ 100.0,
+ /* foregroundUsageConsumePower= */ 0.9,
+ /* foregroundServiceUsageConsumePower= */ 0.2,
+ /* backgroundUsageConsumePower= */ 0.3,
+ /* cachedUsageConsumePower= */ 0.1,
+ /* foregroundUsageTimeInMs= */ 10,
+ /* backgroundUsageTimeInMs= */ 10,
+ /* screenOnTimeInMs= */ 0);
}
@Test
@@ -1489,43 +1986,91 @@
final String packageName1 = "com.android.settings1";
final String packageName2 = "com.android.settings2";
// Fake multiple instances in one package.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 1, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName1));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 2, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName1));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 3, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName1));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 4, /*userId=*/ 1,
- /*instanceId=*/ 2, packageName1));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 2, /*userId=*/ 1,
- /*instanceId=*/ 3, packageName1));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 4, /*userId=*/ 1,
- /*instanceId=*/ 3, packageName1));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 2, /*userId=*/ 1,
- /*instanceId=*/ 5, packageName2));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 4, /*userId=*/ 1,
- /*instanceId=*/ 5, packageName2));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 1,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName1));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 2,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName1));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 3,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName1));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 4,
+ /* userId= */ 1,
+ /* instanceId= */ 2,
+ packageName1));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 2,
+ /* userId= */ 1,
+ /* instanceId= */ 3,
+ packageName1));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 4,
+ /* userId= */ 1,
+ /* instanceId= */ 3,
+ packageName1));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 2,
+ /* userId= */ 1,
+ /* instanceId= */ 5,
+ packageName2));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 4,
+ /* userId= */ 1,
+ /* instanceId= */ 5,
+ packageName2));
// Fake one instance in one package.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 1, /*userId=*/ 2,
- /*instanceId=*/ 4, packageName2));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 2, /*userId=*/ 2,
- /*instanceId=*/ 4, packageName2));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 3, /*userId=*/ 2,
- /*instanceId=*/ 4, packageName2));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 4, /*userId=*/ 2,
- /*instanceId=*/ 4, packageName2));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 1,
+ /* userId= */ 2,
+ /* instanceId= */ 4,
+ packageName2));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 2,
+ /* userId= */ 2,
+ /* instanceId= */ 4,
+ packageName2));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_RESUMED,
+ /* timestamp= */ 3,
+ /* userId= */ 2,
+ /* instanceId= */ 4,
+ packageName2));
+ appUsageEvents.add(
+ buildAppUsageEvent(
+ AppUsageEventType.ACTIVITY_STOPPED,
+ /* timestamp= */ 4,
+ /* userId= */ 2,
+ /* instanceId= */ 4,
+ packageName2));
final Map<Long, Map<String, List<AppUsagePeriod>>> appUsagePeriodMap =
DataProcessor.buildAppUsagePeriodList(
@@ -1552,65 +2097,69 @@
@Test
public void buildAppUsagePeriodList_emptyEventList_returnNull() {
- assertThat(DataProcessor.buildAppUsagePeriodList(
- mContext, new ArrayList<>(), new ArrayList<>(), 0, 1)).isNull();
+ assertThat(
+ DataProcessor.buildAppUsagePeriodList(
+ mContext, new ArrayList<>(), new ArrayList<>(), 0, 1))
+ .isNull();
}
@Test
public void buildAppUsagePeriodList_emptyActivityList_returnNull() {
final List<AppUsageEvent> appUsageEvents = new ArrayList<>();
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.DEVICE_SHUTDOWN, /*timestamp=*/ 1));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.DEVICE_SHUTDOWN, /*timestamp=*/ 2));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.DEVICE_SHUTDOWN, /* timestamp= */ 1));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.DEVICE_SHUTDOWN, /* timestamp= */ 2));
- assertThat(DataProcessor.buildAppUsagePeriodList(
- mContext, appUsageEvents, new ArrayList<>(), 0, 3)).isNull();
+ assertThat(
+ DataProcessor.buildAppUsagePeriodList(
+ mContext, appUsageEvents, new ArrayList<>(), 0, 3))
+ .isNull();
}
@Test
public void buildAppUsagePeriodListPerInstance_returnExpectedResult() {
final List<AppUsageEvent> appUsageEvents = new ArrayList<>();
// Fake data earlier than time range.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 1));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 2));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 1));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 2));
// Fake resume event earlier than time range.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 3));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 120000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 3));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 120000));
// Fake normal data.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 150000));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 200000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 150000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 200000));
// Fake two adjacent resume events.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 300000));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 400000));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 500000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 300000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 400000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 500000));
// Fake no start event when stop event happens.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_STOPPED, /*timestamp=*/ 600000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_STOPPED, /* timestamp= */ 600000));
// There exists start event when device shutdown event happens. Shutdown is later than
// default complete time.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 700000));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.DEVICE_SHUTDOWN, /*timestamp=*/ 800000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 700000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.DEVICE_SHUTDOWN, /* timestamp= */ 800000));
// There exists start event when device shutdown event happens. Shutdown is earlier than
// default complete time.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 900000));
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.DEVICE_SHUTDOWN, /*timestamp=*/ 910000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 900000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.DEVICE_SHUTDOWN, /* timestamp= */ 910000));
// There exists start event when the period ends.
- appUsageEvents.add(buildAppUsageEvent(
- AppUsageEventType.ACTIVITY_RESUMED, /*timestamp=*/ 1000000));
+ appUsageEvents.add(
+ buildAppUsageEvent(AppUsageEventType.ACTIVITY_RESUMED, /* timestamp= */ 1000000));
final List<AppUsagePeriod> appUsagePeriodList =
DataProcessor.buildAppUsagePeriodListPerInstance(appUsageEvents, 100000, 1100000);
@@ -1627,17 +2176,26 @@
@Test
public void excludePowerConnectedTime_startEndNotCharging_returnExpectedResult() {
- final List<AppUsagePeriod> appUsagePeriodList = List.of(
- AppUsagePeriod.newBuilder().setStartTime(100).setEndTime(200).build());
- final List<BatteryEvent> batteryEventList = List.of(
- BatteryEvent.newBuilder().setTimestamp(50).setType(
- BatteryEventType.POWER_DISCONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(166).setType(
- BatteryEventType.POWER_CONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(188).setType(
- BatteryEventType.POWER_DISCONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(280).setType(
- BatteryEventType.POWER_CONNECTED).build());
+ final List<AppUsagePeriod> appUsagePeriodList =
+ List.of(AppUsagePeriod.newBuilder().setStartTime(100).setEndTime(200).build());
+ final List<BatteryEvent> batteryEventList =
+ List.of(
+ BatteryEvent.newBuilder()
+ .setTimestamp(50)
+ .setType(BatteryEventType.POWER_DISCONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(166)
+ .setType(BatteryEventType.POWER_CONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(188)
+ .setType(BatteryEventType.POWER_DISCONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(280)
+ .setType(BatteryEventType.POWER_CONNECTED)
+ .build());
final List<AppUsagePeriod> resultList =
DataProcessor.excludePowerConnectedTimeFromAppUsagePeriodList(
@@ -1650,21 +2208,34 @@
@Test
public void excludePowerConnectedTime_startEndInCharging_returnExpectedResult() {
- final List<AppUsagePeriod> appUsagePeriodList = List.of(
- AppUsagePeriod.newBuilder().setStartTime(100).setEndTime(200).build());
- final List<BatteryEvent> batteryEventList = List.of(
- BatteryEvent.newBuilder().setTimestamp(50).setType(
- BatteryEventType.POWER_DISCONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(80).setType(
- BatteryEventType.POWER_CONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(120).setType(
- BatteryEventType.POWER_DISCONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(150).setType(
- BatteryEventType.POWER_CONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(160).setType(
- BatteryEventType.POWER_DISCONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(180).setType(
- BatteryEventType.POWER_CONNECTED).build());
+ final List<AppUsagePeriod> appUsagePeriodList =
+ List.of(AppUsagePeriod.newBuilder().setStartTime(100).setEndTime(200).build());
+ final List<BatteryEvent> batteryEventList =
+ List.of(
+ BatteryEvent.newBuilder()
+ .setTimestamp(50)
+ .setType(BatteryEventType.POWER_DISCONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(80)
+ .setType(BatteryEventType.POWER_CONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(120)
+ .setType(BatteryEventType.POWER_DISCONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(150)
+ .setType(BatteryEventType.POWER_CONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(160)
+ .setType(BatteryEventType.POWER_DISCONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(180)
+ .setType(BatteryEventType.POWER_CONNECTED)
+ .build());
final List<AppUsagePeriod> resultList =
DataProcessor.excludePowerConnectedTimeFromAppUsagePeriodList(
@@ -1677,13 +2248,18 @@
@Test
public void excludePowerConnectedTime_wholePeriodNotCharging_returnExpectedResult() {
- final List<AppUsagePeriod> appUsagePeriodList = List.of(
- AppUsagePeriod.newBuilder().setStartTime(100).setEndTime(200).build());
- final List<BatteryEvent> batteryEventList = List.of(
- BatteryEvent.newBuilder().setTimestamp(50).setType(
- BatteryEventType.POWER_DISCONNECTED).build(),
- BatteryEvent.newBuilder().setTimestamp(80).setType(
- BatteryEventType.POWER_CONNECTED).build());
+ final List<AppUsagePeriod> appUsagePeriodList =
+ List.of(AppUsagePeriod.newBuilder().setStartTime(100).setEndTime(200).build());
+ final List<BatteryEvent> batteryEventList =
+ List.of(
+ BatteryEvent.newBuilder()
+ .setTimestamp(50)
+ .setType(BatteryEventType.POWER_DISCONNECTED)
+ .build(),
+ BatteryEvent.newBuilder()
+ .setTimestamp(80)
+ .setType(BatteryEventType.POWER_CONNECTED)
+ .build());
final List<AppUsagePeriod> resultList =
DataProcessor.excludePowerConnectedTimeFromAppUsagePeriodList(
@@ -1694,11 +2270,14 @@
@Test
public void excludePowerConnectedTime_wholePeriodInCharging_returnExpectedResult() {
- final List<AppUsagePeriod> appUsagePeriodList = List.of(
- AppUsagePeriod.newBuilder().setStartTime(100).setEndTime(200).build());
- final List<BatteryEvent> batteryEventList = List.of(
- BatteryEvent.newBuilder().setTimestamp(50).setType(
- BatteryEventType.POWER_DISCONNECTED).build());
+ final List<AppUsagePeriod> appUsagePeriodList =
+ List.of(AppUsagePeriod.newBuilder().setStartTime(100).setEndTime(200).build());
+ final List<BatteryEvent> batteryEventList =
+ List.of(
+ BatteryEvent.newBuilder()
+ .setTimestamp(50)
+ .setType(BatteryEventType.POWER_DISCONNECTED)
+ .build());
final List<AppUsagePeriod> resultList =
DataProcessor.excludePowerConnectedTimeFromAppUsagePeriodList(
@@ -1762,32 +2341,32 @@
private static ContentValues getContentValuesWithBatteryLevel(final int level) {
final ContentValues values = new ContentValues();
final DeviceBatteryState deviceBatteryState =
- DeviceBatteryState
- .newBuilder()
- .setBatteryLevel(level)
- .build();
+ DeviceBatteryState.newBuilder().setBatteryLevel(level).build();
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
- .setDeviceBatteryState(deviceBatteryState)
- .build();
- values.put(BatteryHistEntry.KEY_BATTERY_INFORMATION,
+ BatteryInformation.newBuilder().setDeviceBatteryState(deviceBatteryState).build();
+ values.put(
+ BatteryHistEntry.KEY_BATTERY_INFORMATION,
ConvertUtils.convertBatteryInformationToString(batteryInformation));
return values;
}
private static BatteryHistEntry createBatteryHistEntry(
- final String packageName, final String appLabel, final double consumePower,
+ final String packageName,
+ final String appLabel,
+ final double consumePower,
final double foregroundUsageConsumePower,
final double foregroundServiceUsageConsumePower,
- final double backgroundUsageConsumePower, final double cachedUsageConsumePower,
- final long uid, final long userId, final int consumerType,
- final long foregroundUsageTimeInMs, final long backgroundUsageTimeInMs,
+ final double backgroundUsageConsumePower,
+ final double cachedUsageConsumePower,
+ final long uid,
+ final long userId,
+ final int consumerType,
+ final long foregroundUsageTimeInMs,
+ final long backgroundUsageTimeInMs,
final boolean isHidden) {
// Only insert required fields.
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
+ BatteryInformation.newBuilder()
.setAppLabel(appLabel)
.setConsumePower(consumePower)
.setForegroundUsageConsumePower(foregroundUsageConsumePower)
@@ -1803,7 +2382,8 @@
values.put(BatteryHistEntry.KEY_UID, uid);
values.put(BatteryHistEntry.KEY_USER_ID, userId);
values.put(BatteryHistEntry.KEY_CONSUMER_TYPE, consumerType);
- values.put(BatteryHistEntry.KEY_BATTERY_INFORMATION,
+ values.put(
+ BatteryHistEntry.KEY_BATTERY_INFORMATION,
ConvertUtils.convertBatteryInformationToString(batteryInformation));
return new BatteryHistEntry(values);
}
@@ -1817,8 +2397,7 @@
return UsageEvents.CREATOR.createFromParcel(parcel);
}
- private Event getUsageEvent(
- final int eventType, final long timestamp) {
+ private Event getUsageEvent(final int eventType, final long timestamp) {
final Event event = new Event();
event.mEventType = eventType;
event.mPackage = "package";
@@ -1828,8 +2407,7 @@
private AppUsageEvent buildAppUsageEvent(final AppUsageEventType type, final long timestamp) {
return buildAppUsageEvent(
- type, timestamp, /*userId=*/ 1, /*instanceId=*/ 2,
- "com.android.settings");
+ type, timestamp, /* userId= */ 1, /* instanceId= */ 2, "com.android.settings");
}
private AppUsageEvent buildAppUsageEvent(
@@ -1848,10 +2426,7 @@
}
private AppUsagePeriod buildAppUsagePeriod(final long start, final long end) {
- return AppUsagePeriod.newBuilder()
- .setStartTime(start)
- .setEndTime(end)
- .build();
+ return AppUsagePeriod.newBuilder().setStartTime(start).setEndTime(end).build();
}
private void assertAppUsageEvent(
@@ -1918,12 +2493,17 @@
}
private static void assertBatteryDiffEntry(
- final BatteryDiffEntry entry, final long userId, final long uid,
- final int consumerType, final double consumePercentage,
+ final BatteryDiffEntry entry,
+ final long userId,
+ final long uid,
+ final int consumerType,
+ final double consumePercentage,
final double foregroundUsageConsumePower,
final double foregroundServiceUsageConsumePower,
- final double backgroundUsageConsumePower, final double cachedUsageConsumePower,
- final long foregroundUsageTimeInMs, final long backgroundUsageTimeInMs,
+ final double backgroundUsageConsumePower,
+ final double cachedUsageConsumePower,
+ final long foregroundUsageTimeInMs,
+ final long backgroundUsageTimeInMs,
final long screenOnTimeInMs) {
assertThat(entry.mUserId).isEqualTo(userId);
assertThat(entry.mUid).isEqualTo(uid);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
index 12bd457..c31a2b6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
@@ -117,9 +117,7 @@
.setType(AppUsageEventType.ACTIVITY_STOPPED)
.build();
final AppUsageEvent appUsageEvent3 =
- AppUsageEvent.newBuilder()
- .setType(AppUsageEventType.DEVICE_SHUTDOWN)
- .build();
+ AppUsageEvent.newBuilder().setType(AppUsageEventType.DEVICE_SHUTDOWN).build();
appUsageEventList.add(appUsageEvent1);
appUsageEventList.add(appUsageEvent2);
appUsageEventList.add(appUsageEvent3);
@@ -135,10 +133,9 @@
// Verifies the inserted ContentValues into content provider.
final ContentValues[] valuesArray =
new ContentValues[] {valuesList.get(0), valuesList.get(1)};
- verify(mMockContentResolver).bulkInsert(
- DatabaseUtils.APP_USAGE_EVENT_URI, valuesArray);
- verify(mMockContentResolver).notifyChange(
- DatabaseUtils.APP_USAGE_EVENT_URI, /*observer=*/ null);
+ verify(mMockContentResolver).bulkInsert(DatabaseUtils.APP_USAGE_EVENT_URI, valuesArray);
+ verify(mMockContentResolver)
+ .notifyChange(DatabaseUtils.APP_USAGE_EVENT_URI, /* observer= */ null);
}
@Test
@@ -161,12 +158,10 @@
final ContentValues contentValues =
DatabaseUtils.sendBatteryEventData(mContext, batteryEvent);
- assertThat(contentValues.getAsInteger(BatteryEventEntity.KEY_TIMESTAMP))
- .isEqualTo(10001L);
+ assertThat(contentValues.getAsInteger(BatteryEventEntity.KEY_TIMESTAMP)).isEqualTo(10001L);
assertThat(contentValues.getAsInteger(BatteryEventEntity.KEY_BATTERY_EVENT_TYPE))
.isEqualTo(BatteryEventType.POWER_CONNECTED.getNumber());
- assertThat(contentValues.getAsInteger(BatteryEventEntity.KEY_BATTERY_LEVEL))
- .isEqualTo(66);
+ assertThat(contentValues.getAsInteger(BatteryEventEntity.KEY_BATTERY_LEVEL)).isEqualTo(66);
// Verifies the inserted ContentValues into content provider.
verify(mMockContentResolver).insert(DatabaseUtils.BATTERY_EVENT_URI, contentValues);
}
@@ -175,9 +170,12 @@
public void sendBatteryEntryData_nullBatteryIntent_returnsNullValue() {
doReturn(null).when(mContext).registerReceiver(any(), any());
assertThat(
- DatabaseUtils.sendBatteryEntryData(
- mContext, System.currentTimeMillis(), /*batteryEntryList=*/ null,
- mBatteryUsageStats, /*isFullChargeStart=*/ false))
+ DatabaseUtils.sendBatteryEntryData(
+ mContext,
+ System.currentTimeMillis(),
+ /* batteryEntryList= */ null,
+ mBatteryUsageStats,
+ /* isFullChargeStart= */ false))
.isNull();
}
@@ -200,7 +198,7 @@
System.currentTimeMillis(),
batteryEntryList,
mBatteryUsageStats,
- /*isFullChargeStart=*/ false);
+ /* isFullChargeStart= */ false);
assertThat(valuesList).hasSize(2);
// Verifies the ContentValues content.
@@ -209,10 +207,9 @@
// Verifies the inserted ContentValues into content provider.
final ContentValues[] valuesArray =
new ContentValues[] {valuesList.get(0), valuesList.get(1)};
- verify(mMockContentResolver).bulkInsert(
- DatabaseUtils.BATTERY_CONTENT_URI, valuesArray);
- verify(mMockContentResolver).notifyChange(
- DatabaseUtils.BATTERY_CONTENT_URI, /*observer=*/ null);
+ verify(mMockContentResolver).bulkInsert(DatabaseUtils.BATTERY_CONTENT_URI, valuesArray);
+ verify(mMockContentResolver)
+ .notifyChange(DatabaseUtils.BATTERY_CONTENT_URI, /* observer= */ null);
}
@Test
@@ -225,14 +222,14 @@
System.currentTimeMillis(),
new ArrayList<>(),
mBatteryUsageStats,
- /*isFullChargeStart=*/ false);
+ /* isFullChargeStart= */ false);
assertThat(valuesList).hasSize(1);
verifyFakeBatteryEntryContentValues(valuesList.get(0));
// Verifies the inserted ContentValues into content provider.
verify(mMockContentResolver).insert(any(), any());
- verify(mMockContentResolver).notifyChange(
- DatabaseUtils.BATTERY_CONTENT_URI, /*observer=*/ null);
+ verify(mMockContentResolver)
+ .notifyChange(DatabaseUtils.BATTERY_CONTENT_URI, /* observer= */ null);
}
@Test
@@ -243,16 +240,16 @@
DatabaseUtils.sendBatteryEntryData(
mContext,
System.currentTimeMillis(),
- /*batteryEntryList=*/ null,
+ /* batteryEntryList= */ null,
mBatteryUsageStats,
- /*isFullChargeStart=*/ false);
+ /* isFullChargeStart= */ false);
assertThat(valuesList).hasSize(1);
verifyFakeBatteryEntryContentValues(valuesList.get(0));
// Verifies the inserted ContentValues into content provider.
verify(mMockContentResolver).insert(any(), any());
- verify(mMockContentResolver).notifyChange(
- DatabaseUtils.BATTERY_CONTENT_URI, /*observer=*/ null);
+ verify(mMockContentResolver)
+ .notifyChange(DatabaseUtils.BATTERY_CONTENT_URI, /* observer= */ null);
}
@Test
@@ -263,16 +260,16 @@
DatabaseUtils.sendBatteryEntryData(
mContext,
System.currentTimeMillis(),
- /*batteryEntryList=*/ null,
- /*batteryUsageStats=*/ null,
- /*isFullChargeStart=*/ false);
+ /* batteryEntryList= */ null,
+ /* batteryUsageStats= */ null,
+ /* isFullChargeStart= */ false);
assertThat(valuesList).hasSize(1);
verifyFakeBatteryEntryContentValues(valuesList.get(0));
// Verifies the inserted ContentValues into content provider.
verify(mMockContentResolver).insert(any(), any());
- verify(mMockContentResolver).notifyChange(
- DatabaseUtils.BATTERY_CONTENT_URI, /*observer=*/ null);
+ verify(mMockContentResolver)
+ .notifyChange(DatabaseUtils.BATTERY_CONTENT_URI, /* observer= */ null);
}
@Test
@@ -282,16 +279,20 @@
DatabaseUtils.sFakeSupplier = () -> cursor;
final long earliestTimestamp = 10001L;
- assertThat(DatabaseUtils.getAppUsageStartTimestampOfUser(
- mContext, /*userId=*/ 0, earliestTimestamp)).isEqualTo(earliestTimestamp);
+ assertThat(
+ DatabaseUtils.getAppUsageStartTimestampOfUser(
+ mContext, /* userId= */ 0, earliestTimestamp))
+ .isEqualTo(earliestTimestamp);
}
@Test
public void getAppUsageStartTimestampOfUser_nullCursor_returnEarliestTimestamp() {
DatabaseUtils.sFakeSupplier = () -> null;
final long earliestTimestamp = 10001L;
- assertThat(DatabaseUtils.getAppUsageStartTimestampOfUser(
- mContext, /*userId=*/ 0, earliestTimestamp)).isEqualTo(earliestTimestamp);
+ assertThat(
+ DatabaseUtils.getAppUsageStartTimestampOfUser(
+ mContext, /* userId= */ 0, earliestTimestamp))
+ .isEqualTo(earliestTimestamp);
}
@Test
@@ -304,50 +305,62 @@
DatabaseUtils.sFakeSupplier = () -> cursor;
final long earliestTimestamp1 = 1001L;
- assertThat(DatabaseUtils.getAppUsageStartTimestampOfUser(
- mContext, /*userId=*/ 0, earliestTimestamp1)).isEqualTo(returnedTimestamp + 1);
+ assertThat(
+ DatabaseUtils.getAppUsageStartTimestampOfUser(
+ mContext, /* userId= */ 0, earliestTimestamp1))
+ .isEqualTo(returnedTimestamp + 1);
final long earliestTimestamp2 = 100001L;
- assertThat(DatabaseUtils.getAppUsageStartTimestampOfUser(
- mContext, /*userId=*/ 0, earliestTimestamp2)).isEqualTo(earliestTimestamp2);
+ assertThat(
+ DatabaseUtils.getAppUsageStartTimestampOfUser(
+ mContext, /* userId= */ 0, earliestTimestamp2))
+ .isEqualTo(earliestTimestamp2);
}
@Test
public void getAppUsageEventForUsers_emptyCursorContent_returnEmptyMap() {
- final MatrixCursor cursor = new MatrixCursor(
- new String[]{
- AppUsageEventEntity.KEY_UID,
- AppUsageEventEntity.KEY_USER_ID,
- AppUsageEventEntity.KEY_PACKAGE_NAME,
- AppUsageEventEntity.KEY_TIMESTAMP,
- AppUsageEventEntity.KEY_APP_USAGE_EVENT_TYPE});
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ AppUsageEventEntity.KEY_UID,
+ AppUsageEventEntity.KEY_USER_ID,
+ AppUsageEventEntity.KEY_PACKAGE_NAME,
+ AppUsageEventEntity.KEY_TIMESTAMP,
+ AppUsageEventEntity.KEY_APP_USAGE_EVENT_TYPE
+ });
DatabaseUtils.sFakeSupplier = () -> cursor;
- assertThat(DatabaseUtils.getAppUsageEventForUsers(
- mContext,
- /*calendar=*/ null,
- /*userIds=*/ new ArrayList<>(),
- /*startTimestampOfLevelData=*/ 0)).isEmpty();
+ assertThat(
+ DatabaseUtils.getAppUsageEventForUsers(
+ mContext,
+ /* calendar= */ null,
+ /* userIds= */ new ArrayList<>(),
+ /* startTimestampOfLevelData= */ 0))
+ .isEmpty();
}
@Test
public void getAppUsageEventForUsers_nullCursor_returnEmptyMap() {
DatabaseUtils.sFakeSupplier = () -> null;
- assertThat(DatabaseUtils.getAppUsageEventForUsers(
- mContext,
- /*calendar=*/ null,
- /*userIds=*/ new ArrayList<>(),
- /*startTimestampOfLevelData=*/ 0)).isEmpty();
+ assertThat(
+ DatabaseUtils.getAppUsageEventForUsers(
+ mContext,
+ /* calendar= */ null,
+ /* userIds= */ new ArrayList<>(),
+ /* startTimestampOfLevelData= */ 0))
+ .isEmpty();
}
@Test
public void getAppUsageEventForUsers_returnExpectedMap() {
final Long timestamp1 = 1001L;
final Long timestamp2 = 1002L;
- final MatrixCursor cursor = new MatrixCursor(
- new String[]{
- AppUsageEventEntity.KEY_UID,
- AppUsageEventEntity.KEY_PACKAGE_NAME,
- AppUsageEventEntity.KEY_TIMESTAMP});
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ AppUsageEventEntity.KEY_UID,
+ AppUsageEventEntity.KEY_PACKAGE_NAME,
+ AppUsageEventEntity.KEY_TIMESTAMP
+ });
// Adds fake data into the cursor.
cursor.addRow(new Object[] {101L, "app name1", timestamp1});
cursor.addRow(new Object[] {101L, "app name2", timestamp2});
@@ -355,11 +368,12 @@
cursor.addRow(new Object[] {101L, "app name4", timestamp2});
DatabaseUtils.sFakeSupplier = () -> cursor;
- final List<AppUsageEvent> appUsageEventList = DatabaseUtils.getAppUsageEventForUsers(
- mContext,
- /*calendar=*/ null,
- /*userIds=*/ new ArrayList<>(),
- /*startTimestampOfLevelData=*/ 0);
+ final List<AppUsageEvent> appUsageEventList =
+ DatabaseUtils.getAppUsageEventForUsers(
+ mContext,
+ /* calendar= */ null,
+ /* userIds= */ new ArrayList<>(),
+ /* startTimestampOfLevelData= */ 0);
assertThat(appUsageEventList.get(0).getPackageName()).isEqualTo("app name1");
assertThat(appUsageEventList.get(1).getPackageName()).isEqualTo("app name2");
@@ -369,11 +383,13 @@
@Test
public void getHistoryMap_emptyCursorContent_returnEmptyMap() {
- final MatrixCursor cursor = new MatrixCursor(
- new String[] {
- BatteryHistEntry.KEY_UID,
- BatteryHistEntry.KEY_USER_ID,
- BatteryHistEntry.KEY_TIMESTAMP});
+ final MatrixCursor cursor =
+ new MatrixCursor(
+ new String[] {
+ BatteryHistEntry.KEY_UID,
+ BatteryHistEntry.KEY_USER_ID,
+ BatteryHistEntry.KEY_TIMESTAMP
+ });
DatabaseUtils.sFakeSupplier = () -> cursor;
assertThat(DatabaseUtils.getHistoryMapSinceQueryTimestamp(mContext, 0)).isEmpty();
@@ -391,14 +407,22 @@
final Long timestamp2 = Long.valueOf(1002L);
final MatrixCursor cursor = getMatrixCursor();
// Adds fake data into the cursor.
- cursor.addRow(new Object[] {
- "app name1", timestamp1, 1, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, true});
- cursor.addRow(new Object[] {
- "app name2", timestamp2, 2, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, false});
- cursor.addRow(new Object[] {
- "app name3", timestamp2, 3, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, false});
- cursor.addRow(new Object[] {
- "app name4", timestamp2, 4, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, false});
+ cursor.addRow(
+ new Object[] {
+ "app name1", timestamp1, 1, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, true
+ });
+ cursor.addRow(
+ new Object[] {
+ "app name2", timestamp2, 2, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, false
+ });
+ cursor.addRow(
+ new Object[] {
+ "app name3", timestamp2, 3, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, false
+ });
+ cursor.addRow(
+ new Object[] {
+ "app name4", timestamp2, 4, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, false
+ });
DatabaseUtils.sFakeSupplier = () -> cursor;
final Map<Long, Map<String, BatteryHistEntry>> batteryHistMap =
@@ -421,8 +445,9 @@
public void getHistoryMap_withWorkProfile_returnExpectedMap()
throws PackageManager.NameNotFoundException {
doReturn("com.fake.package").when(mContext).getPackageName();
- doReturn(mMockContext).when(mContext).createPackageContextAsUser(
- "com.fake.package", /*flags=*/ 0, UserHandle.OWNER);
+ doReturn(mMockContext)
+ .when(mContext)
+ .createPackageContextAsUser("com.fake.package", /* flags= */ 0, UserHandle.OWNER);
doReturn(UserHandle.CURRENT).when(mContext).getUser();
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(true).when(mUserManager).isManagedProfile();
@@ -440,9 +465,8 @@
public void removeUsageSource_hasNoData() {
DatabaseUtils.removeUsageSource(mContext);
assertThat(
- DatabaseUtils
- .getSharedPreferences(mContext)
- .contains(DatabaseUtils.KEY_LAST_USAGE_SOURCE))
+ DatabaseUtils.getSharedPreferences(mContext)
+ .contains(DatabaseUtils.KEY_LAST_USAGE_SOURCE))
.isFalse();
}
@@ -457,9 +481,8 @@
DatabaseUtils.removeUsageSource(mContext);
assertThat(
- DatabaseUtils
- .getSharedPreferences(mContext)
- .contains(DatabaseUtils.KEY_LAST_USAGE_SOURCE))
+ DatabaseUtils.getSharedPreferences(mContext)
+ .contains(DatabaseUtils.KEY_LAST_USAGE_SOURCE))
.isFalse();
}
@@ -482,9 +505,10 @@
assertThat(DatabaseUtils.getUsageSource(mContext, mUsageStatsManager))
.isEqualTo(USAGE_SOURCE_TASK_ROOT_ACTIVITY);
assertThat(
- DatabaseUtils
- .getSharedPreferences(mContext)
- .getInt(DatabaseUtils.KEY_LAST_USAGE_SOURCE, USAGE_SOURCE_CURRENT_ACTIVITY))
+ DatabaseUtils.getSharedPreferences(mContext)
+ .getInt(
+ DatabaseUtils.KEY_LAST_USAGE_SOURCE,
+ USAGE_SOURCE_CURRENT_ACTIVITY))
.isEqualTo(USAGE_SOURCE_TASK_ROOT_ACTIVITY);
}
@@ -495,9 +519,10 @@
assertThat(DatabaseUtils.getUsageSource(mContext, mUsageStatsManager))
.isEqualTo(USAGE_SOURCE_CURRENT_ACTIVITY);
assertThat(
- DatabaseUtils
- .getSharedPreferences(mContext)
- .getInt(DatabaseUtils.KEY_LAST_USAGE_SOURCE, USAGE_SOURCE_CURRENT_ACTIVITY))
+ DatabaseUtils.getSharedPreferences(mContext)
+ .getInt(
+ DatabaseUtils.KEY_LAST_USAGE_SOURCE,
+ USAGE_SOURCE_CURRENT_ACTIVITY))
.isEqualTo(USAGE_SOURCE_CURRENT_ACTIVITY);
}
@@ -506,20 +531,16 @@
final String preferenceKey = "test_preference_key";
DatabaseUtils.recordDateTime(mContext, preferenceKey);
- assertThat(DatabaseUtils.getSharedPreferences(mContext).contains(preferenceKey))
- .isTrue();
+ assertThat(DatabaseUtils.getSharedPreferences(mContext).contains(preferenceKey)).isTrue();
}
@Test
public void dump_dumpExpectedData() {
- DatabaseUtils.recordDateTime(mContext,
- Intent.ACTION_BATTERY_LEVEL_CHANGED);
- DatabaseUtils.recordDateTime(mContext,
- BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
- DatabaseUtils.recordDateTime(mContext,
- DatabaseUtils.KEY_LAST_LOAD_FULL_CHARGE_TIME);
- DatabaseUtils.recordDateTime(mContext,
- DatabaseUtils.KEY_LAST_UPLOAD_FULL_CHARGE_TIME);
+ DatabaseUtils.recordDateTime(mContext, Intent.ACTION_BATTERY_LEVEL_CHANGED);
+ DatabaseUtils.recordDateTime(
+ mContext, BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
+ DatabaseUtils.recordDateTime(mContext, DatabaseUtils.KEY_LAST_LOAD_FULL_CHARGE_TIME);
+ DatabaseUtils.recordDateTime(mContext, DatabaseUtils.KEY_LAST_UPLOAD_FULL_CHARGE_TIME);
final StringWriter stringWriter = new StringWriter();
final PrintWriter printWriter = new PrintWriter(stringWriter);
@@ -570,8 +591,7 @@
.isEqualTo(BatteryManager.BATTERY_STATUS_FULL);
assertThat(deviceBatteryState.getBatteryHealth())
.isEqualTo(BatteryManager.BATTERY_HEALTH_COLD);
- assertThat(values.getAsString("packageName"))
- .isEqualTo(ConvertUtils.FAKE_PACKAGE_NAME);
+ assertThat(values.getAsString("packageName")).isEqualTo(ConvertUtils.FAKE_PACKAGE_NAME);
}
private static Intent getBatteryIntent() {
@@ -586,10 +606,11 @@
private static MatrixCursor getMatrixCursor() {
return new MatrixCursor(
new String[] {
- BatteryHistEntry.KEY_PACKAGE_NAME,
- BatteryHistEntry.KEY_TIMESTAMP,
- BatteryHistEntry.KEY_UID,
- BatteryHistEntry.KEY_CONSUMER_TYPE,
- BatteryHistEntry.KEY_IS_FULL_CHARGE_CYCLE_START});
+ BatteryHistEntry.KEY_PACKAGE_NAME,
+ BatteryHistEntry.KEY_TIMESTAMP,
+ BatteryHistEntry.KEY_UID,
+ BatteryHistEntry.KEY_CONSUMER_TYPE,
+ BatteryHistEntry.KEY_IS_FULL_CHARGE_CYCLE_START
+ });
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManagerTest.java
index efbce12..6990535 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManagerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManagerTest.java
@@ -57,7 +57,7 @@
@Test
public void refreshJob_refreshesAlarmJob() {
- mPeriodicJobManager.refreshJob(/*fromBoot=*/ false);
+ mPeriodicJobManager.refreshJob(/* fromBoot= */ false);
final ShadowAlarmManager.ScheduledAlarm alarm =
mShadowAlarmManager.peekNextScheduledAlarm();
@@ -71,12 +71,13 @@
public void getTriggerAtMillis_withoutOffset_returnsExpectedResult() {
long timeSlotUnit = PeriodicJobManager.DATA_FETCH_INTERVAL_MINUTE;
// Sets the current time.
- Duration currentTimeDuration =
- Duration.ofMinutes(timeSlotUnit * 2);
+ Duration currentTimeDuration = Duration.ofMinutes(timeSlotUnit * 2);
FakeClock fakeClock = new FakeClock();
fakeClock.setCurrentTime(currentTimeDuration);
- assertThat(PeriodicJobManager.getTriggerAtMillis(mContext, fakeClock, /*fromBoot=*/ false))
+ assertThat(
+ PeriodicJobManager.getTriggerAtMillis(
+ mContext, fakeClock, /* fromBoot= */ false))
.isEqualTo(currentTimeDuration.plusMinutes(timeSlotUnit).toMillis());
}
@@ -86,10 +87,9 @@
// Sets the current time.
Duration currentTimeDuration = Duration.ofMinutes(timeSlotUnit * 2);
FakeClock fakeClock = new FakeClock();
- fakeClock.setCurrentTime(
- currentTimeDuration.plusMinutes(1L).plusMillis(51L));
+ fakeClock.setCurrentTime(currentTimeDuration.plusMinutes(1L).plusMillis(51L));
- assertThat(PeriodicJobManager.getTriggerAtMillis(mContext, fakeClock, /*fromBoot=*/ true))
+ assertThat(PeriodicJobManager.getTriggerAtMillis(mContext, fakeClock, /* fromBoot= */ true))
.isEqualTo(currentTimeDuration.plusMinutes(timeSlotUnit).toMillis());
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java
index c9a3e64..d111de2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java
@@ -86,14 +86,14 @@
@Test
public void onReceive_nullIntent_notRefreshesJob() {
- mReceiver.onReceive(mContext, /*intent=*/ null);
+ mReceiver.onReceive(mContext, /* intent= */ null);
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull();
}
@Test
public void onReceive_containsExpiredData_clearsExpiredDataFromDatabase()
throws InterruptedException {
- insertExpiredData(/*shiftDay=*/ DatabaseUtils.DATA_RETENTION_INTERVAL_DAY);
+ insertExpiredData(/* shiftDay= */ DatabaseUtils.DATA_RETENTION_INTERVAL_DAY);
mReceiver.onReceive(mContext, JOB_UPDATE_INTENT);
@@ -104,7 +104,7 @@
@Test
public void onReceive_withoutExpiredData_notClearsExpiredDataFromDatabase()
throws InterruptedException {
- insertExpiredData(/*shiftDay=*/ DatabaseUtils.DATA_RETENTION_INTERVAL_DAY - 1);
+ insertExpiredData(/* shiftDay= */ DatabaseUtils.DATA_RETENTION_INTERVAL_DAY - 1);
mReceiver.onReceive(mContext, JOB_UPDATE_INTENT);
@@ -129,5 +129,4 @@
// Ensures the testing environment is correct.
assertThat(mDao.getAllAfter(0)).hasSize(3);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java
index 22509de..ef4460b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java
@@ -53,8 +53,12 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mRootView = LayoutInflater.from(mContext)
- .inflate(com.android.settingslib.widget.preference.app.R.layout.preference_app, null);
+ mRootView =
+ LayoutInflater.from(mContext)
+ .inflate(
+ com.android.settingslib.widget.preference.app.R.layout
+ .preference_app,
+ null);
mWidgetView =
LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary, null);
final LinearLayout widgetFrame = mRootView.findViewById(android.R.id.widget_frame);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvancedTest.java
index 9753bd2..6c09e78 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvancedTest.java
@@ -55,14 +55,10 @@
private Predicate<PowerAnomalyEvent> mCardFilterPredicate;
private Predicate<PowerAnomalyEvent> mSlotFilterPredicate;
- @Mock
- private BatteryTipsController mBatteryTipsController;
- @Mock
- private BatteryChartPreferenceController mBatteryChartPreferenceController;
- @Mock
- private ScreenOnTimeController mScreenOnTimeController;
- @Mock
- private BatteryUsageBreakdownController mBatteryUsageBreakdownController;
+ @Mock private BatteryTipsController mBatteryTipsController;
+ @Mock private BatteryChartPreferenceController mBatteryChartPreferenceController;
+ @Mock private ScreenOnTimeController mScreenOnTimeController;
+ @Mock private BatteryUsageBreakdownController mBatteryUsageBreakdownController;
@Before
public void setUp() {
@@ -75,10 +71,13 @@
mPowerUsageAdvanced.mBatteryChartPreferenceController = mBatteryChartPreferenceController;
mPowerUsageAdvanced.mScreenOnTimeController = mScreenOnTimeController;
mPowerUsageAdvanced.mBatteryUsageBreakdownController = mBatteryUsageBreakdownController;
- mPowerUsageAdvanced.mBatteryLevelData = Optional.of(new BatteryLevelData(Map.of(
- 1694354400000L, 1, // 2023-09-10 22:00:00
- 1694361600000L, 2, // 2023-09-11 00:00:00
- 1694368800000L, 3))); // 2023-09-11 02:00:00
+ mPowerUsageAdvanced.mBatteryLevelData =
+ Optional.of(
+ new BatteryLevelData(
+ Map.of(
+ 1694354400000L, 1, // 2023-09-10 22:00:00
+ 1694361600000L, 2, // 2023-09-11 00:00:00
+ 1694368800000L, 3))); // 2023-09-11 02:00:00
doReturn(mContext).when(mPowerUsageAdvanced).getContext();
mSlotFilterPredicate = PowerAnomalyEvent::hasWarningItemInfo;
}
@@ -86,15 +85,17 @@
@Test
public void getFilterAnomalyEvent_withEmptyOrNullList_getNull() {
prepareCardFilterPredicate(null);
- assertThat(PowerUsageAdvanced
- .getAnomalyEvent(null, mCardFilterPredicate)).isNull();
- assertThat(PowerUsageAdvanced
- .getAnomalyEvent(null, mSlotFilterPredicate)).isNull();
- assertThat(PowerUsageAdvanced.getAnomalyEvent(
- BatteryTestUtils.createEmptyPowerAnomalyEventList(), mCardFilterPredicate))
+ assertThat(PowerUsageAdvanced.getAnomalyEvent(null, mCardFilterPredicate)).isNull();
+ assertThat(PowerUsageAdvanced.getAnomalyEvent(null, mSlotFilterPredicate)).isNull();
+ assertThat(
+ PowerUsageAdvanced.getAnomalyEvent(
+ BatteryTestUtils.createEmptyPowerAnomalyEventList(),
+ mCardFilterPredicate))
.isNull();
- assertThat(PowerUsageAdvanced.getAnomalyEvent(
- BatteryTestUtils.createEmptyPowerAnomalyEventList(), mSlotFilterPredicate))
+ assertThat(
+ PowerUsageAdvanced.getAnomalyEvent(
+ BatteryTestUtils.createEmptyPowerAnomalyEventList(),
+ mSlotFilterPredicate))
.isNull();
}
@@ -104,12 +105,10 @@
BatteryTestUtils.createNonEmptyPowerAnomalyEventList();
final PowerAnomalyEvent slotEvent =
- PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList,
- mSlotFilterPredicate);
+ PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList, mSlotFilterPredicate);
prepareCardFilterPredicate(slotEvent);
final PowerAnomalyEvent cardEvent =
- PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList,
- mCardFilterPredicate);
+ PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList, mCardFilterPredicate);
assertThat(cardEvent).isEqualTo(BatteryTestUtils.createAdaptiveBrightnessAnomalyEvent());
assertThat(slotEvent).isNull();
@@ -123,12 +122,10 @@
DatabaseUtils.setDismissedPowerAnomalyKeys(mContext, PowerAnomalyKey.KEY_BRIGHTNESS.name());
final PowerAnomalyEvent slotEvent =
- PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList,
- mSlotFilterPredicate);
+ PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList, mSlotFilterPredicate);
prepareCardFilterPredicate(slotEvent);
final PowerAnomalyEvent cardEvent =
- PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList,
- mCardFilterPredicate);
+ PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList, mCardFilterPredicate);
assertThat(cardEvent).isEqualTo(BatteryTestUtils.createScreenTimeoutAnomalyEvent());
assertThat(slotEvent).isNull();
@@ -144,12 +141,10 @@
}
final PowerAnomalyEvent slotEvent =
- PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList,
- mSlotFilterPredicate);
+ PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList, mSlotFilterPredicate);
prepareCardFilterPredicate(slotEvent);
final PowerAnomalyEvent cardEvent =
- PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList,
- mCardFilterPredicate);
+ PowerUsageAdvanced.getAnomalyEvent(powerAnomalyEventList, mCardFilterPredicate);
assertThat(cardEvent).isNull();
assertThat(slotEvent).isNull();
@@ -165,9 +160,10 @@
.isEqualTo(event.getEventId());
verify(mPowerUsageAdvanced.mBatteryTipsController).setOnAnomalyConfirmListener(isNull());
verify(mPowerUsageAdvanced.mBatteryTipsController).setOnAnomalyRejectListener(isNull());
- verify(mPowerUsageAdvanced.mBatteryChartPreferenceController).onHighlightSlotIndexUpdate(
- eq(BatteryChartViewModel.SELECTED_INDEX_INVALID),
- eq(BatteryChartViewModel.SELECTED_INDEX_INVALID));
+ verify(mPowerUsageAdvanced.mBatteryChartPreferenceController)
+ .onHighlightSlotIndexUpdate(
+ eq(BatteryChartViewModel.SELECTED_INDEX_INVALID),
+ eq(BatteryChartViewModel.SELECTED_INDEX_INVALID));
}
@Test
@@ -180,10 +176,14 @@
.isEqualTo(event.getEventId());
verify(mBatteryTipsController).setOnAnomalyConfirmListener(isNull());
verify(mBatteryTipsController).setOnAnomalyRejectListener(isNull());
- assertThat(mPowerUsageAdvanced.mBatteryLevelData.get().getIndexByTimestamps(
- event.getWarningItemInfo().getStartTimestamp(),
- event.getWarningItemInfo().getEndTimestamp()
- )).isEqualTo(Pair.create(1, 0));
+ assertThat(
+ mPowerUsageAdvanced
+ .mBatteryLevelData
+ .get()
+ .getIndexByTimestamps(
+ event.getWarningItemInfo().getStartTimestamp(),
+ event.getWarningItemInfo().getEndTimestamp()))
+ .isEqualTo(Pair.create(1, 0));
verify(mBatteryChartPreferenceController).onHighlightSlotIndexUpdate(eq(1), eq(0));
verify(mBatteryTipsController).setOnAnomalyConfirmListener(notNull());
}
@@ -192,8 +192,7 @@
public void onDisplayAnomalyEventUpdated_withSettingsCardAndAppsSlotEvent_showExpected() {
final PowerAnomalyEvent settingsEvent =
BatteryTestUtils.createAdaptiveBrightnessAnomalyEvent();
- final PowerAnomalyEvent appsEvent =
- BatteryTestUtils.createAppAnomalyEvent();
+ final PowerAnomalyEvent appsEvent = BatteryTestUtils.createAppAnomalyEvent();
mPowerUsageAdvanced.onDisplayAnomalyEventUpdated(settingsEvent, appsEvent);
@@ -207,8 +206,9 @@
private void prepareCardFilterPredicate(PowerAnomalyEvent slotEvent) {
final Set<String> dismissedPowerAnomalyKeys =
DatabaseUtils.getDismissedPowerAnomalyKeys(mContext);
- mCardFilterPredicate = event -> !dismissedPowerAnomalyKeys.contains(
- event.getDismissRecordKey())
- && (event.equals(slotEvent) || !event.hasWarningItemInfo());
+ mCardFilterPredicate =
+ event ->
+ !dismissedPowerAnomalyKeys.contains(event.getDismissRecordKey())
+ && (event.equals(slotEvent) || !event.hasWarningItemInfo());
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageBaseTest.java
index 68766e6..399101b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageBaseTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageBaseTest.java
@@ -52,10 +52,8 @@
@Config(shadows = ShadowDashboardFragment.class)
public class PowerUsageBaseTest {
- @Mock
- private LoaderManager mLoaderManager;
- @Mock
- private Loader<BatteryUsageStats> mBatteryUsageStatsLoader;
+ @Mock private LoaderManager mLoaderManager;
+ @Mock private Loader<BatteryUsageStats> mBatteryUsageStatsLoader;
private TestFragment mFragment;
@Before
@@ -77,16 +75,19 @@
final Bundle bundle = new Bundle();
bundle.putInt(KEY_REFRESH_TYPE, BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_STATUS);
bundle.putBoolean(KEY_INCLUDE_HISTORY, false);
- doReturn(mBatteryUsageStatsLoader).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER);
+ doReturn(mBatteryUsageStatsLoader)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER);
doReturn(false).when(mBatteryUsageStatsLoader).isReset();
mFragment.restartBatteryStatsLoader(
BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_STATUS);
verify(mLoaderManager)
- .restartLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER),
- refEq(bundle), any());
+ .restartLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER),
+ refEq(bundle),
+ any());
}
@Test
@@ -94,16 +95,19 @@
final Bundle bundle = new Bundle();
bundle.putInt(KEY_REFRESH_TYPE, BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_STATUS);
bundle.putBoolean(KEY_INCLUDE_HISTORY, false);
- doReturn(mBatteryUsageStatsLoader).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER);
+ doReturn(mBatteryUsageStatsLoader)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER);
doReturn(true).when(mBatteryUsageStatsLoader).isReset();
mFragment.restartBatteryStatsLoader(
BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_STATUS);
verify(mLoaderManager)
- .initLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER),
- refEq(bundle), any());
+ .initLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER),
+ refEq(bundle),
+ any());
}
@Test
@@ -111,14 +115,18 @@
final Bundle bundle = new Bundle();
bundle.putInt(KEY_REFRESH_TYPE, BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_STATUS);
bundle.putBoolean(KEY_INCLUDE_HISTORY, false);
- doReturn(null).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER);
+ doReturn(null)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER);
mFragment.restartBatteryStatsLoader(
BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_STATUS);
- verify(mLoaderManager).initLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER),
- refEq(bundle), any());
+ verify(mLoaderManager)
+ .initLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_USAGE_STATS_LOADER),
+ refEq(bundle),
+ any());
}
private static class TestFragment extends PowerUsageBase {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
index 579d4a9..19d5e59 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java
@@ -70,9 +70,10 @@
// TODO: Improve this test class so that it starts up the real activity and fragment.
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {
- com.android.settings.testutils.shadow.ShadowFragment.class,
-})
+@Config(
+ shadows = {
+ com.android.settings.testutils.shadow.ShadowFragment.class,
+ })
public class PowerUsageSummaryTest {
private static Intent sAdditionalBatteryInfoIntent;
@@ -81,26 +82,16 @@
sAdditionalBatteryInfoIntent = new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
}
- @Mock
- private SettingsActivity mSettingsActivity;
- @Mock
- private LoaderManager mLoaderManager;
- @Mock
- private Loader<BatteryTip> mBatteryTipLoader;
- @Mock
- private Loader<BatteryInfo> mBatteryInfoLoader;
- @Mock
- private ContentResolver mContentResolver;
- @Mock
- private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
- @Mock
- private VisibilityLoggerMixin mVisibilityLoggerMixin;
- @Mock
- private PreferenceScreen mPreferenceScreen;
- @Mock
- private Preference mBatteryUsagePreference;
- @Mock
- private Preference mHelpPreference;
+ @Mock private SettingsActivity mSettingsActivity;
+ @Mock private LoaderManager mLoaderManager;
+ @Mock private Loader<BatteryTip> mBatteryTipLoader;
+ @Mock private Loader<BatteryInfo> mBatteryInfoLoader;
+ @Mock private ContentResolver mContentResolver;
+ @Mock private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
+ @Mock private VisibilityLoggerMixin mVisibilityLoggerMixin;
+ @Mock private PreferenceScreen mPreferenceScreen;
+ @Mock private Preference mBatteryUsagePreference;
+ @Mock private Preference mHelpPreference;
private Context mRealContext;
private TestFragment mFragment;
@@ -120,8 +111,8 @@
.thenReturn(sAdditionalBatteryInfoIntent);
mFragment.mBatteryUtils = Mockito.spy(new BatteryUtils(mRealContext));
ReflectionHelpers.setField(mFragment, "mVisibilityLoggerMixin", mVisibilityLoggerMixin);
- ReflectionHelpers.setField(mFragment, "mBatteryBroadcastReceiver",
- mBatteryBroadcastReceiver);
+ ReflectionHelpers.setField(
+ mFragment, "mBatteryBroadcastReceiver", mBatteryBroadcastReceiver);
doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
when(mFragment.getContentResolver()).thenReturn(mContentResolver);
when(mFragment.findPreference(KEY_BATTERY_USAGE)).thenReturn(mBatteryUsagePreference);
@@ -157,42 +148,46 @@
@Test
public void restartBatteryTipLoader() {
- //TODO: add policy logic here when BatteryTipPolicy is implemented
- doReturn(mBatteryTipLoader).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER);
+ // TODO: add policy logic here when BatteryTipPolicy is implemented
+ doReturn(mBatteryTipLoader)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER);
doReturn(false).when(mBatteryTipLoader).isReset();
mFragment.restartBatteryTipLoader();
- verify(mLoaderManager).restartLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER),
- eq(Bundle.EMPTY), any());
+ verify(mLoaderManager)
+ .restartLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER), eq(Bundle.EMPTY), any());
}
@Test
public void restartBatteryTipLoader_nullLoader_initLoader() {
- doReturn(null).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER);
+ doReturn(null)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER);
mFragment.restartBatteryTipLoader();
- verify(mLoaderManager).initLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER),
- eq(Bundle.EMPTY), any());
+ verify(mLoaderManager)
+ .initLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER), eq(Bundle.EMPTY), any());
}
@Test
public void restartBatteryTipLoader_loaderReset_initLoader() {
- doReturn(mBatteryTipLoader).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER);
+ doReturn(mBatteryTipLoader)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER);
doReturn(true).when(mBatteryTipLoader).isReset();
mFragment.restartBatteryTipLoader();
-
- verify(mLoaderManager).initLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER),
- eq(Bundle.EMPTY), any());
+ verify(mLoaderManager)
+ .initLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_TIP_LOADER), eq(Bundle.EMPTY), any());
}
-
@Test
public void refreshUi_contextNull_doNothing() {
doReturn(null).when(mFragment).getContext();
@@ -256,18 +251,19 @@
public void onResume_registerContentObserver() {
mFragment.onResume();
- verify(mContentResolver).registerContentObserver(
- Settings.Global.getUriFor(Settings.Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME),
- false,
- mFragment.mSettingsObserver);
+ verify(mContentResolver)
+ .registerContentObserver(
+ Settings.Global.getUriFor(
+ Settings.Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME),
+ false,
+ mFragment.mSettingsObserver);
}
@Test
public void onPause_unregisterContentObserver() {
mFragment.onPause();
- verify(mContentResolver).unregisterContentObserver(
- mFragment.mSettingsObserver);
+ verify(mContentResolver).unregisterContentObserver(mFragment.mSettingsObserver);
}
@Test
@@ -276,9 +272,11 @@
mFragment.restartBatteryInfoLoader();
- verify(mLoaderManager, never()).restartLoader(
- PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER, Bundle.EMPTY,
- mFragment.mBatteryInfoLoaderCallbacks);
+ verify(mLoaderManager, never())
+ .restartLoader(
+ PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER,
+ Bundle.EMPTY,
+ mFragment.mBatteryInfoLoaderCallbacks);
}
@Test
@@ -287,45 +285,59 @@
mFragment.restartBatteryInfoLoader();
- verify(mLoaderManager, never()).restartLoader(
- PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER, Bundle.EMPTY,
- mFragment.mBatteryInfoLoaderCallbacks);
+ verify(mLoaderManager, never())
+ .restartLoader(
+ PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER,
+ Bundle.EMPTY,
+ mFragment.mBatteryInfoLoaderCallbacks);
}
@Test
public void restartBatteryInfoLoader() {
- doReturn(mBatteryInfoLoader).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER);
+ doReturn(mBatteryInfoLoader)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER);
doReturn(false).when(mBatteryTipLoader).isReset();
mFragment.restartBatteryInfoLoader();
- verify(mLoaderManager).restartLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER),
- eq(Bundle.EMPTY), any());
+ verify(mLoaderManager)
+ .restartLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER),
+ eq(Bundle.EMPTY),
+ any());
}
@Test
public void restartBatteryInfoLoader_nullLoader_initLoader() {
- doReturn(null).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER);
+ doReturn(null)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER);
mFragment.restartBatteryInfoLoader();
- verify(mLoaderManager).initLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER),
- eq(Bundle.EMPTY), any());
+ verify(mLoaderManager)
+ .initLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER),
+ eq(Bundle.EMPTY),
+ any());
}
@Test
public void restartBatteryInfoLoader_loaderReset_initLoader() {
mFragment.setIsBatteryPresent(true);
- doReturn(mBatteryInfoLoader).when(mLoaderManager).getLoader(
- PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER);
+ doReturn(mBatteryInfoLoader)
+ .when(mLoaderManager)
+ .getLoader(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER);
doReturn(true).when(mBatteryInfoLoader).isReset();
mFragment.restartBatteryInfoLoader();
- verify(mLoaderManager).initLoader(eq(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER),
- eq(Bundle.EMPTY), any());
+ verify(mLoaderManager)
+ .initLoader(
+ eq(PowerUsageBase.LoaderIndex.BATTERY_INFO_LOADER),
+ eq(Bundle.EMPTY),
+ any());
}
private static class TestFragment extends PowerUsageSummary {
@@ -357,5 +369,4 @@
return mLoaderManager;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeControllerTest.java
index acf4a2e..282ec9e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeControllerTest.java
@@ -46,10 +46,8 @@
private Context mContext;
private ScreenOnTimeController mScreenOnTimeController;
- @Mock
- private PreferenceCategory mRootPreference;
- @Mock
- private TextViewPreference mScreenOnTimeTextPreference;
+ @Mock private PreferenceCategory mRootPreference;
+ @Mock private TextViewPreference mScreenOnTimeTextPreference;
@Before
public void setUp() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreferenceTest.java
index 4c2192c..8050984 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreferenceTest.java
@@ -42,14 +42,13 @@
private Context mContext;
private SpinnerPreference mSpinnerPreference;
- @Mock
- private Spinner mMockSpinner;
+ @Mock private Spinner mMockSpinner;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mSpinnerPreference = new SpinnerPreference(mContext, /*attrs=*/ null);
+ mSpinnerPreference = new SpinnerPreference(mContext, /* attrs= */ null);
}
@Test
@@ -59,7 +58,7 @@
@Test
public void initializeSpinner_returnExpectedResult() {
- final String[] items = new String[]{"item1", "item2"};
+ final String[] items = new String[] {"item1", "item2"};
mSpinnerPreference.initializeSpinner(items, null);
assertThat(mSpinnerPreference.mItems).isEqualTo(items);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TextViewPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TextViewPreferenceTest.java
index ca7e9dd..caccc87 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TextViewPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TextViewPreferenceTest.java
@@ -41,13 +41,13 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mTextViewPreference = new TextViewPreference(mContext, /*attrs=*/ null);
+ mTextViewPreference = new TextViewPreference(mContext, /* attrs= */ null);
}
@Test
public void constructor_returnExpectedResult() {
- assertThat(mTextViewPreference.getLayoutResource()).isEqualTo(
- R.layout.preference_text_view);
+ assertThat(mTextViewPreference.getLayoutResource())
+ .isEqualTo(R.layout.preference_text_view);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TimestampUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TimestampUtilsTest.java
index 23787c7..1aae61c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TimestampUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/TimestampUtilsTest.java
@@ -36,11 +36,9 @@
@Test
public void getNextHourTimestamp_returnExpectedResult() {
// 2021-02-28 06:00:00 => 2021-02-28 07:00:00
- assertThat(TimestampUtils.getNextHourTimestamp(1614463200000L))
- .isEqualTo(1614466800000L);
+ assertThat(TimestampUtils.getNextHourTimestamp(1614463200000L)).isEqualTo(1614466800000L);
// 2021-12-31 23:59:59 => 2022-01-01 00:00:00
- assertThat(TimestampUtils.getNextHourTimestamp(16409663999999L))
- .isEqualTo(16409664000000L);
+ assertThat(TimestampUtils.getNextHourTimestamp(16409663999999L)).isEqualTo(16409664000000L);
}
@Test
@@ -66,11 +64,9 @@
@Test
public void getTimestampOfNextDay_returnExpectedResult() {
// 2021-02-28 06:00:00 => 2021-03-01 00:00:00
- assertThat(TimestampUtils.getNextDayTimestamp(1614463200000L))
- .isEqualTo(1614528000000L);
+ assertThat(TimestampUtils.getNextDayTimestamp(1614463200000L)).isEqualTo(1614528000000L);
// 2021-12-31 16:00:00 => 2022-01-01 00:00:00
- assertThat(TimestampUtils.getNextDayTimestamp(1640937600000L))
- .isEqualTo(1640966400000L);
+ assertThat(TimestampUtils.getNextDayTimestamp(1640937600000L)).isEqualTo(1640966400000L);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProviderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProviderTest.java
index 45d4065..d998106 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProviderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProviderTest.java
@@ -52,7 +52,7 @@
mPrintWriter = new PrintWriter(mStringWriter);
mContext = ApplicationProvider.getApplicationContext();
mBugReportContentProvider = new BugReportContentProvider();
- mBugReportContentProvider.attachInfo(mContext, /*info=*/ null);
+ mBugReportContentProvider.attachInfo(mContext, /* info= */ null);
// Inserts fake data into database for testing.
BatteryTestUtils.setUpBatteryStateDatabase(mContext);
BatteryTestUtils.insertDataToBatteryStateTable(
@@ -60,15 +60,15 @@
BatteryTestUtils.insertDataToBatteryStateTable(
mContext, System.currentTimeMillis(), PACKAGE_NAME2);
BatteryTestUtils.insertDataToAppUsageEventTable(
- mContext, /*userId=*/ 1, System.currentTimeMillis(), PACKAGE_NAME3);
+ mContext, /* userId= */ 1, System.currentTimeMillis(), PACKAGE_NAME3);
BatteryTestUtils.insertDataToAppUsageEventTable(
- mContext, /*userId=*/ 1, System.currentTimeMillis(), PACKAGE_NAME4);
+ mContext, /* userId= */ 1, System.currentTimeMillis(), PACKAGE_NAME4);
}
@Test
public void dump_nullContext_notDumpsBatteryUsageData() {
mBugReportContentProvider = new BugReportContentProvider();
- mBugReportContentProvider.attachInfo(/*context=*/ null, /*info=*/ null);
+ mBugReportContentProvider.attachInfo(/* context= */ null, /* info= */ null);
mBugReportContentProvider.dump(FileDescriptor.out, mPrintWriter, new String[] {});
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDaoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDaoTest.java
index 4883d4f..219120e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDaoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDaoTest.java
@@ -61,13 +61,13 @@
BatteryTestUtils.insertDataToAppUsageEventTable(
mContext, USER_ID2, TIMESTAMP2, PACKAGE_NAME2);
BatteryTestUtils.insertDataToAppUsageEventTable(
- mContext, USER_ID1, TIMESTAMP1, PACKAGE_NAME1, /*multiple=*/ true);
+ mContext, USER_ID1, TIMESTAMP1, PACKAGE_NAME1, /* multiple= */ true);
}
@After
public void closeDb() {
mDatabase.close();
- BatteryStateDatabase.setBatteryStateDatabase(/*database=*/ null);
+ BatteryStateDatabase.setBatteryStateDatabase(/* database= */ null);
}
@Test
@@ -147,7 +147,7 @@
@Test
public void getInstance_createNewInstance() throws Exception {
- BatteryStateDatabase.setBatteryStateDatabase(/*database=*/ null);
+ BatteryStateDatabase.setBatteryStateDatabase(/* database= */ null);
assertThat(BatteryStateDatabase.getInstance(mContext)).isNotNull();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java
index 3cbf845..eb72b96 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java
@@ -35,16 +35,16 @@
final int instanceId = 100001;
final String taskRootPackageName = "com.android.settings2";
- AppUsageEventEntity entity = AppUsageEventEntity
- .newBuilder()
- .setUid(uid)
- .setUserId(userId)
- .setTimestamp(timestamp)
- .setAppUsageEventType(appUsageEventType)
- .setPackageName(packageName)
- .setInstanceId(instanceId)
- .setTaskRootPackageName(taskRootPackageName)
- .build();
+ AppUsageEventEntity entity =
+ AppUsageEventEntity.newBuilder()
+ .setUid(uid)
+ .setUserId(userId)
+ .setTimestamp(timestamp)
+ .setAppUsageEventType(appUsageEventType)
+ .setPackageName(packageName)
+ .setInstanceId(instanceId)
+ .setTaskRootPackageName(taskRootPackageName)
+ .build();
// Verifies the app relative information.
assertThat(entity.uid).isEqualTo(uid);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java
index 3c3e3c3..d36f2b5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java
@@ -57,22 +57,23 @@
@After
public void closeDb() {
mDatabase.close();
- BatteryStateDatabase.setBatteryStateDatabase(/*database=*/ null);
+ BatteryStateDatabase.setBatteryStateDatabase(/* database= */ null);
}
-
@Test
public void getLastFullChargeTimestamp_normalFlow_expectedBehavior() throws Exception {
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(TIMESTAMP1)
- .setBatteryEventType(3)
- .setBatteryLevel(100)
- .build());
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(TIMESTAMP2)
- .setBatteryEventType(4)
- .setBatteryLevel(96)
- .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(TIMESTAMP1)
+ .setBatteryEventType(3)
+ .setBatteryLevel(100)
+ .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(TIMESTAMP2)
+ .setBatteryEventType(4)
+ .setBatteryLevel(96)
+ .build());
final Cursor cursor = mBatteryEventDao.getLastFullChargeTimestamp();
assertThat(cursor.getCount()).isEqualTo(1);
@@ -83,11 +84,12 @@
@Test
public void getLastFullChargeTimestamp_noLastFullChargeTime_returns0() throws Exception {
mBatteryEventDao.clearAll();
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(TIMESTAMP2)
- .setBatteryEventType(4)
- .setBatteryLevel(96)
- .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(TIMESTAMP2)
+ .setBatteryEventType(4)
+ .setBatteryLevel(96)
+ .build());
final Cursor cursor = mBatteryEventDao.getLastFullChargeTimestamp();
@@ -98,26 +100,25 @@
@Test
public void getAllAfter_normalFlow_returnExpectedResult() {
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(100L)
- .setBatteryEventType(1)
- .setBatteryLevel(66)
- .build());
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(200L)
- .setBatteryEventType(2)
- .setBatteryLevel(88)
- .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(100L)
+ .setBatteryEventType(1)
+ .setBatteryLevel(66)
+ .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(200L)
+ .setBatteryEventType(2)
+ .setBatteryLevel(88)
+ .build());
final Cursor cursor = mBatteryEventDao.getAllAfter(160L, List.of(1, 2));
assertThat(cursor.getCount()).isEqualTo(1);
cursor.moveToFirst();
- assertThat(cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP)))
- .isEqualTo(200L);
- assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_EVENT_TYPE)))
- .isEqualTo(2);
- assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_LEVEL)))
- .isEqualTo(88);
+ assertThat(cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP))).isEqualTo(200L);
+ assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_EVENT_TYPE))).isEqualTo(2);
+ assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_LEVEL))).isEqualTo(88);
mBatteryEventDao.clearAll();
assertThat(mBatteryEventDao.getAll()).isEmpty();
@@ -125,26 +126,25 @@
@Test
public void getAllAfter_filterBatteryTypes_returnExpectedResult() {
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(100L)
- .setBatteryEventType(1)
- .setBatteryLevel(66)
- .build());
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(200L)
- .setBatteryEventType(2)
- .setBatteryLevel(88)
- .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(100L)
+ .setBatteryEventType(1)
+ .setBatteryLevel(66)
+ .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(200L)
+ .setBatteryEventType(2)
+ .setBatteryLevel(88)
+ .build());
final Cursor cursor = mBatteryEventDao.getAllAfter(0L, List.of(1));
assertThat(cursor.getCount()).isEqualTo(1);
cursor.moveToFirst();
- assertThat(cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP)))
- .isEqualTo(100L);
- assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_EVENT_TYPE)))
- .isEqualTo(1);
- assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_LEVEL)))
- .isEqualTo(66);
+ assertThat(cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP))).isEqualTo(100L);
+ assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_EVENT_TYPE))).isEqualTo(1);
+ assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_LEVEL))).isEqualTo(66);
mBatteryEventDao.clearAll();
assertThat(mBatteryEventDao.getAll()).isEmpty();
@@ -152,26 +152,25 @@
@Test
public void getAllAfter_filterTimestamp_returnExpectedResult() {
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(100L)
- .setBatteryEventType(1)
- .setBatteryLevel(66)
- .build());
- mBatteryEventDao.insert(BatteryEventEntity.newBuilder()
- .setTimestamp(200L)
- .setBatteryEventType(1)
- .setBatteryLevel(88)
- .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(100L)
+ .setBatteryEventType(1)
+ .setBatteryLevel(66)
+ .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(200L)
+ .setBatteryEventType(1)
+ .setBatteryLevel(88)
+ .build());
final Cursor cursor = mBatteryEventDao.getAllAfter(200L, List.of(1));
assertThat(cursor.getCount()).isEqualTo(1);
cursor.moveToFirst();
- assertThat(cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP)))
- .isEqualTo(200L);
- assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_EVENT_TYPE)))
- .isEqualTo(1);
- assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_LEVEL)))
- .isEqualTo(88);
+ assertThat(cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP))).isEqualTo(200L);
+ assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_EVENT_TYPE))).isEqualTo(1);
+ assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_LEVEL))).isEqualTo(88);
mBatteryEventDao.clearAll();
assertThat(mBatteryEventDao.getAll()).isEmpty();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventEntityTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventEntityTest.java
index a34d651..6aa7157 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventEntityTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventEntityTest.java
@@ -32,12 +32,12 @@
final int batteryEventType = 1;
final int batteryLevel = 66;
- BatteryEventEntity entity = BatteryEventEntity
- .newBuilder()
- .setTimestamp(timestamp)
- .setBatteryEventType(batteryEventType)
- .setBatteryLevel(batteryLevel)
- .build();
+ BatteryEventEntity entity =
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(timestamp)
+ .setBatteryEventType(batteryEventType)
+ .setBatteryLevel(batteryLevel)
+ .build();
// Verifies the app relative information.
assertThat(entity.timestamp).isEqualTo(timestamp);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDaoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDaoTest.java
index b3dba4e..cc1d7b4 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDaoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDaoTest.java
@@ -57,14 +57,17 @@
BatteryTestUtils.insertDataToBatteryStateTable(mContext, TIMESTAMP3, PACKAGE_NAME3);
BatteryTestUtils.insertDataToBatteryStateTable(mContext, TIMESTAMP2, PACKAGE_NAME2);
BatteryTestUtils.insertDataToBatteryStateTable(
- mContext, TIMESTAMP1, PACKAGE_NAME1, /*multiple=*/ true,
- /*isFullChargeStart=*/ true);
+ mContext,
+ TIMESTAMP1,
+ PACKAGE_NAME1,
+ /* multiple= */ true,
+ /* isFullChargeStart= */ true);
}
@After
public void closeDb() {
mDatabase.close();
- BatteryStateDatabase.setBatteryStateDatabase(/*database=*/ null);
+ BatteryStateDatabase.setBatteryStateDatabase(/* database= */ null);
}
@Test
@@ -136,29 +139,25 @@
@Test
public void getInstance_createNewInstance_returnsExpectedResult() throws Exception {
- BatteryStateDatabase.setBatteryStateDatabase(/*database=*/ null);
+ BatteryStateDatabase.setBatteryStateDatabase(/* database= */ null);
assertThat(BatteryStateDatabase.getInstance(mContext)).isNotNull();
}
@Test
public void getDistinctTimestampCount_normalFlow_returnsExpectedResult() {
- assertThat(mBatteryStateDao.getDistinctTimestampCount(/*timestamp=*/ 0))
- .isEqualTo(3);
- assertThat(mBatteryStateDao.getDistinctTimestampCount(TIMESTAMP1))
- .isEqualTo(2);
+ assertThat(mBatteryStateDao.getDistinctTimestampCount(/* timestamp= */ 0)).isEqualTo(3);
+ assertThat(mBatteryStateDao.getDistinctTimestampCount(TIMESTAMP1)).isEqualTo(2);
}
@Test
public void getDistinctTimestamps_normalFlow_returnsExpectedResult() {
- final List<Long> timestamps =
- mBatteryStateDao.getDistinctTimestamps(/*timestamp=*/ 0);
+ final List<Long> timestamps = mBatteryStateDao.getDistinctTimestamps(/* timestamp= */ 0);
assertThat(timestamps).hasSize(3);
assertThat(timestamps).containsExactly(TIMESTAMP1, TIMESTAMP2, TIMESTAMP3);
}
- private static void assertBatteryState(
- BatteryState state, long timestamp, String packageName) {
+ private static void assertBatteryState(BatteryState state, long timestamp, String packageName) {
assertThat(state.timestamp).isEqualTo(timestamp);
assertThat(state.packageName).isEqualTo(packageName);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateTest.java
index 9b9003e..e48f250 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateTest.java
@@ -41,15 +41,13 @@
@Before
public void setUp() {
final DeviceBatteryState deviceBatteryState =
- DeviceBatteryState
- .newBuilder()
+ DeviceBatteryState.newBuilder()
.setBatteryLevel(BATTERY_LEVEL)
.setBatteryStatus(BATTERY_STATUS)
.setBatteryHealth(BATTERY_HEALTH)
.build();
mBatteryInformation =
- BatteryInformation
- .newBuilder()
+ BatteryInformation.newBuilder()
.setDeviceBatteryState(deviceBatteryState)
.setBootTimestamp(101L)
.setIsHidden(true)
@@ -78,8 +76,8 @@
assertThat(state.timestamp).isEqualTo(100001L);
assertThat(state.consumerType).isEqualTo(2);
assertThat(state.isFullChargeCycleStart).isTrue();
- assertThat(state.batteryInformation).isEqualTo(
- ConvertUtils.convertBatteryInformationToString(mBatteryInformation));
+ assertThat(state.batteryInformation)
+ .isEqualTo(ConvertUtils.convertBatteryInformationToString(mBatteryInformation));
}
private static BatteryState create(BatteryInformation batteryInformation) {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDaoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDaoTest.java
index 6f73954..1501bbd 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDaoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDaoTest.java
@@ -61,7 +61,7 @@
@After
public void closeDb() {
mDatabase.close();
- BatteryStateDatabase.setBatteryStateDatabase(/*database=*/ null);
+ BatteryStateDatabase.setBatteryStateDatabase(/* database= */ null);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotEntityTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotEntityTest.java
index ef276eb..4c037b9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotEntityTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotEntityTest.java
@@ -31,11 +31,11 @@
final long timestamp = 10001L;
final String batteryUsageSlotString = "batteryUsageSlotString";
- BatteryUsageSlotEntity entity = BatteryUsageSlotEntity
- .newBuilder()
- .setTimestamp(timestamp)
- .setBatteryUsageSlot(batteryUsageSlotString)
- .build();
+ BatteryUsageSlotEntity entity =
+ BatteryUsageSlotEntity.newBuilder()
+ .setTimestamp(timestamp)
+ .setBatteryUsageSlot(batteryUsageSlotString)
+ .build();
// Verifies the app relative information.
assertThat(entity.timestamp).isEqualTo(timestamp);