Merge "Enable continuous testing for Battery Saver code." (b89dd3a3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/TEST_MAPPING

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "CtsBatterySavingTestCases",
		"options": [
		{"exclude-annotation": "androidx.test.filters.LargeTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		},
		{
		"name": "FrameworksMockingServicesTests",
		"options": [
		{"include-filter": "com.android.server.power"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		{"include-filter": "com.android.server.power"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{
		"exclude-filter": "com.android.server.power.PowerManagerServiceTest#testWakefulnessAwake_ShouldWakeUpWhenPluggedIn"
		}
		]
		}
		],
		"postsubmit": [
		{
		"name": "CtsBatterySavingTestCases"
		},
		{
		"name": "FrameworksMockingServicesTests",
		"options": [
		{"include-filter": "com.android.server.power"}
		]
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		{"include-filter": "com.android.server.power"}
		]
		}
		]
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ import android.os.PowerManager;
		import android.os.PowerSaveState;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.platform.test.annotations.FlakyTest;
		import android.provider.Settings;
		import android.test.mock.MockContentResolver;
		import android.view.Display;
		@@ -734,6 +735,7 @@ public class PowerManagerServiceTest {
		assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_ASLEEP);
		}

		@FlakyTest
		@Test
		public void testInattentiveSleep_goesToSleepWithWakeLock() throws Exception {
		final String pkg = mContextSpy.getOpPackageName();

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify;
		import android.content.Context;
		import android.os.Handler;
		import android.os.Looper;
		import android.platform.test.annotations.FlakyTest;
		import android.util.ArrayMap;

		import androidx.test.InstrumentationRegistry;
		@@ -328,6 +329,7 @@ public class FileUpdaterTest {
		veriryWtf(0);
		}

		@FlakyTest
		@Test
		public void testAll() throws Exception {
		// Run multiple tests on the single target instance.