Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix certain BatteryStatsTests and enable presubmit

Browse Source 
Bug: 180015146
Test: atest BatteryStatsTests

Change-Id: I57ba9e750c97f2e5d6a514b81d4cd537028b31ac
This commit is contained in:
Dmitri Plotnikov
2021-03-16 17:03:44 -07:00
parent 1c97b8d767
commit 33510a27c8
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/os/TEST_MAPPING
View File

@@ -1,7 +1,11 @@
{
"presubmit": [
{
"file_patterns": ["Battery[^/]*\\.java"],
"file_patterns": [
"Battery[^/]*\\.java",
"Kernel[^/]*\\.java",
"[^/]*Power[^/]*\\.java"
],
"name": "FrameworksCoreTests",
"options": [
{ "include-filter": "com.android.internal.os.BatteryStatsTests" },

2
core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
View File

@@ -60,6 +60,7 @@ import org.junit.runners.Suite;
KernelCpuUidFreqTimeReaderTest.class,
KernelCpuUidUserSysTimeReaderTest.class,
KernelMemoryBandwidthStatsTest.class,
KernelSingleProcessCpuThreadReaderTest.class,
KernelSingleUidTimeReaderTest.class,
KernelWakelockReaderTest.class,
LongSamplingCounterTest.class,
@@ -69,6 +70,7 @@ import org.junit.runners.Suite;
PowerProfileTest.class,
ScreenPowerCalculatorTest.class,
SensorPowerCalculatorTest.class,
SystemServerCpuThreadReaderTest.class,
SystemServicePowerCalculatorTest.class,
UserPowerCalculatorTest.class,
VideoPowerCalculatorTest.class,

7
core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java
View File

@@ -35,7 +35,6 @@ import org.junit.runner.RunWith;
import java.util.List;
@SmallTest
@SkipPresubmit("b/180015146")
@RunWith(AndroidJUnit4.class)
public class BatteryUsageStatsTest {
@@ -102,7 +101,7 @@ public class BatteryUsageStatsTest {
}
public void validateBatteryUsageStats(BatteryUsageStats batteryUsageStats) {
assertThat(batteryUsageStats.getConsumedPower()).isEqualTo(100);
assertThat(batteryUsageStats.getConsumedPower()).isEqualTo(21500);
assertThat(batteryUsageStats.getDischargePercentage()).isEqualTo(20);
assertThat(batteryUsageStats.getDischargedPowerRange().getLower()).isEqualTo(1000);
assertThat(batteryUsageStats.getDischargedPowerRange().getUpper()).isEqualTo(2000);
@@ -128,7 +127,7 @@ public class BatteryUsageStatsTest {
BatteryConsumer.TIME_COMPONENT_CPU_FOREGROUND)).isEqualTo(700);
assertThat(uidBatteryConsumer.getUsageDurationForCustomComponentMillis(
BatteryConsumer.FIRST_CUSTOM_TIME_COMPONENT_ID)).isEqualTo(800);
assertThat(uidBatteryConsumer.getConsumedPower()).isEqualTo(1710);
assertThat(uidBatteryConsumer.getConsumedPower()).isEqualTo(1200);
} else {
fail("Unexpected UID " + uidBatteryConsumer.getUid());
}
@@ -146,7 +145,7 @@ public class BatteryUsageStatsTest {
BatteryConsumer.TIME_COMPONENT_CPU)).isEqualTo(10300);
assertThat(systemBatteryConsumer.getUsageDurationForCustomComponentMillis(
BatteryConsumer.FIRST_CUSTOM_TIME_COMPONENT_ID)).isEqualTo(10400);
assertThat(systemBatteryConsumer.getConsumedPower()).isEqualTo(30510);
assertThat(systemBatteryConsumer.getConsumedPower()).isEqualTo(20300);
} else {
fail("Unexpected drain type " + systemBatteryConsumer.getDrainType());
}

10
core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java
View File

@@ -43,7 +43,6 @@ public class BluetoothPowerCalculatorTest {
.setAveragePower(PowerProfile.POWER_BLUETOOTH_CONTROLLER_TX, 100.0);
@Test
@SkipPresubmit("b/180015146")
public void testTimerBasedModel() {
setDurationsAndPower(mStatsRule.getUidStats(Process.BLUETOOTH_UID)
.getOrCreateBluetoothControllerActivityLocked(),
@@ -62,9 +61,7 @@ public class BluetoothPowerCalculatorTest {
mStatsRule.apply(calculator);
assertBluetoothPowerAndDuration(
mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID),
0.11388, 6000);
assertThat(mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID)).isNull();
assertBluetoothPowerAndDuration(
mStatsRule.getUidBatteryConsumer(APP_UID),
0.24722, 15000);
@@ -74,7 +71,6 @@ public class BluetoothPowerCalculatorTest {
}
@Test
@SkipPresubmit("b/180015146")
public void testReportedPowerBasedModel() {
setDurationsAndPower(mStatsRule.getUidStats(Process.BLUETOOTH_UID)
.getOrCreateBluetoothControllerActivityLocked(),
@@ -93,9 +89,7 @@ public class BluetoothPowerCalculatorTest {
mStatsRule.apply(calculator);
assertBluetoothPowerAndDuration(
mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID),
0.1, 6000);
assertThat(mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID)).isNull();
assertBluetoothPowerAndDuration(
mStatsRule.getUidBatteryConsumer(APP_UID),
0.2, 15000);

1
core/tests/coretests/src/com/android/internal/os/CpuPowerCalculatorTest.java
View File

@@ -101,7 +101,6 @@ public class CpuPowerCalculatorTest {
}
@Test
@SkipPresubmit("b/180015146")
public void testTimerBasedModel() {
when(mMockUserInfoProvider.exists(anyInt())).thenReturn(true);

13
core/tests/coretests/src/com/android/internal/os/CustomMeasuredPowerCalculatorTest.java
View File

@@ -42,9 +42,12 @@ public class CustomMeasuredPowerCalculatorTest {
public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule();
@Test
@SkipPresubmit("b/180015146")
public void testMeasuredEnergyCopiedIntoBatteryConsumers() {
final BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats();
// For side-effect of creating a BatteryStats.Uid
batteryStats.getUidStatsLocked(APP_UID);
SparseLongArray uidEnergies = new SparseLongArray();
uidEnergies.put(APP_UID, 30_000_000);
batteryStats.updateCustomMeasuredEnergyStatsLocked(0, 100_000_000, uidEnergies);
@@ -60,18 +63,18 @@ public class CustomMeasuredPowerCalculatorTest {
UidBatteryConsumer uid = mStatsRule.getUidBatteryConsumer(APP_UID);
assertThat(uid.getConsumedPowerForCustomComponent(
BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID))
.isWithin(PRECISION).of(2.252252);
.isWithin(PRECISION).of(8.333333);
assertThat(uid.getConsumedPowerForCustomComponent(
BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 1))
.isWithin(PRECISION).of(9.009009);
.isWithin(PRECISION).of(33.33333);
SystemBatteryConsumer systemConsumer = mStatsRule.getSystemBatteryConsumer(
SystemBatteryConsumer.DRAIN_TYPE_CUSTOM);
assertThat(systemConsumer.getConsumedPowerForCustomComponent(
BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID))
.isWithin(PRECISION).of(7.5075075);
.isWithin(PRECISION).of(27.77777);
assertThat(systemConsumer.getConsumedPowerForCustomComponent(
BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 1))
.isWithin(PRECISION).of(15.015015);
.isWithin(PRECISION).of(55.55555);
}
}

3
core/tests/coretests/src/com/android/internal/os/SystemServicePowerCalculatorTest.java
View File

@@ -78,7 +78,6 @@ public class SystemServicePowerCalculatorTest {
}
@Test
@SkipPresubmit("b/180015146")
public void testPowerProfileBasedModel() {
when(mMockUserInfoProvider.exists(anyInt())).thenReturn(true);
@@ -154,7 +153,7 @@ public class SystemServicePowerCalculatorTest {
}
@Override
public void readDelta(@Nullable Callback<long[]> cb) {
public void readDelta(boolean forcedRead, @Nullable Callback<long[]> cb) {
if (cb != null) {
cb.onUidCpuTime(Process.SYSTEM_UID, mSystemServerCpuTimes);
}