Merge "Fix certain BatteryStatsTests and enable presubmit" into sc-dev (fa304e1f) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/TEST_MAPPING

+5 −1

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"file_patterns": ["Battery[^/]*\\.java"],
		"file_patterns": [
		"Battery[^/]*\\.java",
		"Kernel[^/]*\\.java",
		"[^/]Power[^/]\\.java"
		],
		"name": "FrameworksCoreTests",
		"options": [
		{ "include-filter": "com.android.internal.os.BatteryStatsTests" },

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -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());
		}

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

+2 −8

Original line number	Diff line number	Diff line
		@@ -44,7 +44,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(),
		@@ -64,9 +63,7 @@ public class BluetoothPowerCalculatorTest {
		mStatsRule.apply(new BatteryUsageStatsQuery.Builder().powerProfileModeledOnly().build(),
		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);
		@@ -76,7 +73,6 @@ public class BluetoothPowerCalculatorTest {
		}

		@Test
		@SkipPresubmit("b/180015146")
		public void testReportedPowerBasedModel() {
		setDurationsAndPower(mStatsRule.getUidStats(Process.BLUETOOTH_UID)
		.getOrCreateBluetoothControllerActivityLocked(),
		@@ -96,9 +92,7 @@ public class BluetoothPowerCalculatorTest {
		mStatsRule.apply(new BatteryUsageStatsQuery.Builder().powerProfileModeledOnly().build(),
		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);

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ public class CpuPowerCalculatorTest {
		}

		@Test
		@SkipPresubmit("b/180015146")
		public void testTimerBasedModel() {
		when(mMockUserInfoProvider.exists(anyInt())).thenReturn(true);