Include the entire PowerStatsTests source into the Ravenwood version (9952c7ad) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/stats/BatteryStatsImpl.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -1856,6 +1856,14 @@ public class BatteryStatsImpl extends BatteryStats {
		FrameworkStatsLog.write(
		FrameworkStatsLog.PHONE_SIGNAL_STRENGTH_CHANGED, strengthBin);
		}

		/**
		* Records a statsd event when the batterystats config file is written to disk.
		*/
		public void writeCommitSysConfigFile(String fileName, long durationMs) {
		com.android.internal.logging.EventLogTags.writeCommitSysConfigFile(fileName,
		durationMs);
		}
		}

		private final FrameworkStatsLogger mFrameworkStatsLogger;
		@@ -11396,8 +11404,7 @@ public class BatteryStatsImpl extends BatteryStats {
		memStream.writeTo(stream);
		stream.flush();
		mDailyFile.finishWrite(stream);
		com.android.internal.logging.EventLogTags.writeCommitSysConfigFile(
		"batterystats-daily",
		mFrameworkStatsLogger.writeCommitSysConfigFile("batterystats-daily",
		initialTimeMs + SystemClock.uptimeMillis() - startTimeMs2);
		} catch (IOException e) {
		Slog.w("BatteryStats",
		@@ -14690,9 +14697,10 @@ public class BatteryStatsImpl extends BatteryStats {
		stream.write(parcel.marshall());
		stream.flush();
		mCheckinFile.finishWrite(stream);
		com.android.internal.logging.EventLogTags.writeCommitSysConfigFile(
		"batterystats-checkin", initialTimeMs
		+ SystemClock.uptimeMillis() - startTimeMs2);
		mFrameworkStatsLogger.writeCommitSysConfigFile(
		"batterystats-checkin",
		initialTimeMs + SystemClock.uptimeMillis()
		- startTimeMs2);
		} catch (IOException e) {
		Slog.w("BatteryStats",
		"Error writing checkin battery statistics", e);
		@@ -16165,7 +16173,7 @@ public class BatteryStatsImpl extends BatteryStats {
		+ " duration ms:" + (SystemClock.uptimeMillis() - startTimeMs)
		+ " bytes:" + p.dataSize());
		}
		com.android.internal.logging.EventLogTags.writeCommitSysConfigFile(
		mFrameworkStatsLogger.writeCommitSysConfigFile(
		"batterystats", SystemClock.uptimeMillis() - startTimeMs);
		} catch (IOException e) {
		Slog.w(TAG, "Error writing battery statistics", e);

services/tests/powerstatstests/Android.bp

+7 −65

Original line number	Diff line number	Diff line
		@@ -4,63 +4,6 @@ package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		filegroup {
		name: "power_stats_ravenwood_tests",
		srcs: [
		"src/com/android/server/power/stats/AggregatedPowerStatsProcessorTest.java",
		"src/com/android/server/power/stats/AggregatedPowerStatsTest.java",
		"src/com/android/server/power/stats/AmbientDisplayPowerCalculatorTest.java",
		"src/com/android/server/power/stats/AudioPowerCalculatorTest.java",
		"src/com/android/server/power/stats/BatteryChargeCalculatorTest.java",
		"src/com/android/server/power/stats/BatteryStatsCounterTest.java",
		"src/com/android/server/power/stats/BatteryStatsCpuTimesTest.java",
		"src/com/android/server/power/stats/BatteryStatsDualTimerTest.java",
		"src/com/android/server/power/stats/BatteryStatsDurationTimerTest.java",
		"src/com/android/server/power/stats/BatteryStatsHistoryIteratorTest.java",
		"src/com/android/server/power/stats/BatteryStatsHistoryTest.java",
		"src/com/android/server/power/stats/BatteryStatsImplTest.java",
		"src/com/android/server/power/stats/BatteryStatsNoteTest.java",
		"src/com/android/server/power/stats/BatteryStatsSamplingTimerTest.java",
		"src/com/android/server/power/stats/BatteryStatsSensorTest.java",
		"src/com/android/server/power/stats/BatteryStatsServTest.java",
		"src/com/android/server/power/stats/BatteryStatsStopwatchTimerTest.java",
		"src/com/android/server/power/stats/BatteryStatsTimeBaseTest.java",
		"src/com/android/server/power/stats/BatteryStatsTimerTest.java",
		"src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java",
		"src/com/android/server/power/stats/BatteryUsageStatsTest.java",
		"src/com/android/server/power/stats/BluetoothPowerCalculatorTest.java",
		"src/com/android/server/power/stats/CameraPowerCalculatorTest.java",
		"src/com/android/server/power/stats/CpuAggregatedPowerStatsProcessorTest.java",
		"src/com/android/server/power/stats/CpuPowerStatsCollectorTest.java",
		"src/com/android/server/power/stats/CpuPowerCalculatorTest.java",
		"src/com/android/server/power/stats/CustomEnergyConsumerPowerCalculatorTest.java",
		"src/com/android/server/power/stats/EnergyConsumerSnapshotTest.java",
		"src/com/android/server/power/stats/FlashlightPowerCalculatorTest.java",
		"src/com/android/server/power/stats/GnssPowerCalculatorTest.java",
		"src/com/android/server/power/stats/IdlePowerCalculatorTest.java",
		"src/com/android/server/power/stats/LongSamplingCounterArrayTest.java",
		"src/com/android/server/power/stats/LongSamplingCounterTest.java",
		"src/com/android/server/power/stats/MemoryPowerCalculatorTest.java",
		"src/com/android/server/power/stats/MobileRadioAggregatedPowerStatsProcessorTest.java",
		"src/com/android/server/power/stats/MobileRadioPowerCalculatorTest.java",
		"src/com/android/server/power/stats/MobileRadioPowerStatsCollectorTest.java",
		"src/com/android/server/power/stats/MultiStateStatsTest.java",
		"src/com/android/server/power/stats/PhoneCallAggregatedPowerStatsProcessorTest.java",
		"src/com/android/server/power/stats/PowerStatsAggregatorTest.java",
		"src/com/android/server/power/stats/PowerStatsCollectorTest.java",
		"src/com/android/server/power/stats/PowerStatsExporterTest.java",
		"src/com/android/server/power/stats/PowerStatsSchedulerTest.java",
		"src/com/android/server/power/stats/PowerStatsStoreTest.java",
		"src/com/android/server/power/stats/PowerStatsUidResolverTest.java",
		"src/com/android/server/power/stats/ScreenPowerCalculatorTest.java",
		"src/com/android/server/power/stats/SensorPowerCalculatorTest.java",
		"src/com/android/server/power/stats/UserPowerCalculatorTest.java",
		"src/com/android/server/power/stats/VideoPowerCalculatorTest.java",
		"src/com/android/server/power/stats/WakelockPowerCalculatorTest.java",
		"src/com/android/server/power/stats/WifiPowerCalculatorTest.java",
		],
		}

		android_test {
		name: "PowerStatsTests",

		@@ -84,7 +27,6 @@ android_test {
		"servicestests-utils",
		"platform-test-annotations",
		"flag-junit",
		"ravenwood-junit",
		],

		libs: [
		@@ -117,17 +59,17 @@ android_ravenwood_test {
		name: "PowerStatsTestsRavenwood",
		static_libs: [
		"services.core",
		"modules-utils-binary-xml",
		"coretests-aidl",
		"ravenwood-junit",
		"truth",
		"androidx.annotation_annotation",
		"androidx.test.rules",
		"truth",
		"androidx.test.uiautomator_uiautomator",
		"modules-utils-binary-xml",
		"flag-junit",
		],
		srcs: [
		":power_stats_ravenwood_tests",

		"src/com/android/server/power/stats/BatteryUsageStatsRule.java",
		"src/com/android/server/power/stats/MockBatteryStatsImpl.java",
		"src/com/android/server/power/stats/MockClock.java",
		"src/com/android/server/power/stats/*.java",
		],
		java_resources: [
		"res/xml/power_profile*.xml",

services/tests/powerstatstests/TEST_MAPPING

+5 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,11 @@
		"ravenwood-presubmit": [
		{
		"name": "PowerStatsTestsRavenwood",
		"host": true
		"host": true,
		"options": [
		{"include-filter": "com.android.server.power.stats"},
		{"exclude-annotation": "android.platform.test.annotations.DisabledOnRavenwood"}
		]
		}
		],
		"postsubmit": [

services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.hardware.power.stats.EnergyConsumerType;
		import android.hardware.power.stats.EnergyMeasurement;
		import android.hardware.power.stats.PowerEntity;
		import android.hardware.power.stats.StateResidencyResult;
		import android.platform.test.ravenwood.RavenwoodRule;
		import android.power.PowerStatsInternal;
		import android.util.IntArray;
		import android.util.SparseArray;
		@@ -47,6 +48,7 @@ import com.android.internal.os.CpuScalingPolicies;
		import com.android.internal.os.PowerProfile;

		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;

		import java.util.Arrays;
		@@ -59,7 +61,10 @@ import java.util.concurrent.CompletableFuture;
		* atest FrameworksServicesTests:BatteryExternalStatsWorkerTest
		*/
		@SuppressWarnings("GuardedBy")
		@android.platform.test.annotations.DisabledOnRavenwood
		public class BatteryExternalStatsWorkerTest {
		@Rule
		public final RavenwoodRule mRavenwood = new RavenwoodRule();
		private BatteryExternalStatsWorker mBatteryExternalStatsWorker;
		private TestBatteryStatsImpl mBatteryStatsImpl;
		private TestPowerStatsInternal mPowerStatsInternal;

services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsBackgroundStatsTest.java

+20 −2

Original line number	Diff line number	Diff line
		@@ -18,25 +18,37 @@ package com.android.server.power.stats;

		import static android.os.BatteryStats.STATS_SINCE_CHARGED;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;

		import android.app.ActivityManager;
		import android.os.BatteryStats;
		import android.os.WorkSource;
		import android.platform.test.ravenwood.RavenwoodRule;
		import android.util.ArrayMap;
		import android.view.Display;

		import androidx.test.filters.SmallTest;

		import junit.framework.TestCase;
		import org.junit.Rule;
		import org.junit.Test;

		/**
		* Test BatteryStatsImpl onBatteryBackgroundTimeBase TimeBase.
		*/
		public class BatteryStatsBackgroundStatsTest extends TestCase {
		public class BatteryStatsBackgroundStatsTest {

		@Rule(order = 0)
		public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder()
		.setProvideMainThread(true)
		.build();

		private static final int UID = 10500;

		/** Test that BatteryStatsImpl.Uid.mOnBatteryBackgroundTimeBase works correctly. */
		@SmallTest
		@Test
		public void testBgTimeBase() throws Exception {
		final MockClock clocks = new MockClock(); // holds realtime and uptime in ms
		MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);
		@@ -105,6 +117,7 @@ public class BatteryStatsBackgroundStatsTest extends TestCase {

		/** Test that BatteryStatsImpl.Uid.mOnBatteryScreenOffBackgroundTimeBase works correctly. */
		@SmallTest
		@Test
		public void testScreenOffBgTimeBase() throws Exception {
		final MockClock clocks = new MockClock(); // holds realtime and uptime in ms
		MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);
		@@ -153,6 +166,7 @@ public class BatteryStatsBackgroundStatsTest extends TestCase {
		}

		@SmallTest
		@Test
		public void testWifiScan() throws Exception {
		final MockClock clocks = new MockClock();
		MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);
		@@ -195,11 +209,13 @@ public class BatteryStatsBackgroundStatsTest extends TestCase {
		}

		@SmallTest
		@Test
		public void testAppBluetoothScan() throws Exception {
		doTestAppBluetoothScanInternal(new WorkSource(UID));
		}

		@SmallTest
		@Test
		public void testAppBluetoothScan_workChain() throws Exception {
		WorkSource ws = new WorkSource();
		ws.createWorkChain().addNode(UID, "foo");
		@@ -275,6 +291,7 @@ public class BatteryStatsBackgroundStatsTest extends TestCase {
		}

		@SmallTest
		@Test
		public void testJob() throws Exception {
		final MockClock clocks = new MockClock();
		MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);
		@@ -336,6 +353,7 @@ public class BatteryStatsBackgroundStatsTest extends TestCase {
		}

		@SmallTest
		@Test
		public void testSyncs() throws Exception {
		final MockClock clocks = new MockClock();
		MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);