From 0a96efbadd3b64cc5f531063268615b552a2d108 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Thu, 20 Jul 2023 04:16:08 +0000 Subject: [PATCH] Point TEST MAPPINGs to the new suites. Bug: 288461387 Bug: 288323752 Test: presubmit Change-Id: I453a4151100ca42495e0f2473e5599dec38ab70d --- core/java/android/app/TEST_MAPPING | 6 ++---- core/java/android/content/TEST_MAPPING | 6 ++---- core/java/android/content/om/TEST_MAPPING | 6 ++---- core/java/android/content/pm/TEST_MAPPING | 13 +++++-------- core/java/android/content/res/TEST_MAPPING | 6 ++---- core/java/android/util/apk/TEST_MAPPING | 8 +++----- .../com/android/internal/content/om/TEST_MAPPING | 6 ++---- core/jni/TEST_MAPPING | 6 ++---- .../core/java/com/android/server/pm/TEST_MAPPING | 9 ++------- services/incremental/TEST_MAPPING | 8 +++----- 10 files changed, 25 insertions(+), 49 deletions(-) diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING index bc5f7f411af51..0f66e93f7b3cd 100644 --- a/core/java/android/app/TEST_MAPPING +++ b/core/java/android/app/TEST_MAPPING @@ -238,11 +238,9 @@ "file_patterns": [ "(/|^)DeviceFeature[^/]*", "(/|^)Hdmi[^/]*" ] - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsWindowManagerTestCases", "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" diff --git a/core/java/android/content/TEST_MAPPING b/core/java/android/content/TEST_MAPPING index dac79e7124bdc..01a9373dea1f6 100644 --- a/core/java/android/content/TEST_MAPPING +++ b/core/java/android/content/TEST_MAPPING @@ -41,11 +41,9 @@ } ], "file_patterns": ["(/|^)Context.java", "(/|^)ContextWrapper.java", "(/|^)ComponentCallbacksController.java"] - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsWindowManagerTestCases", "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" diff --git a/core/java/android/content/om/TEST_MAPPING b/core/java/android/content/om/TEST_MAPPING index eb9254d7dea98..82c47a03863b3 100644 --- a/core/java/android/content/om/TEST_MAPPING +++ b/core/java/android/content/om/TEST_MAPPING @@ -19,11 +19,9 @@ }, { "name": "CtsOverlayHostTestCases" - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsResourcesTestCases", "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING index 3364b7a2d22c9..6419f8c6f0d92 100644 --- a/core/java/android/content/pm/TEST_MAPPING +++ b/core/java/android/content/pm/TEST_MAPPING @@ -114,23 +114,20 @@ "exclude-annotation":"org.junit.Ignore" } ] - } - ], - "presubmit-large":[ + }, { - "name":"CtsContentTestCases", + "name":"CtsPackageManagerTestCases", "options":[ { "exclude-annotation":"androidx.test.filters.FlakyTest" }, { "exclude-annotation":"org.junit.Ignore" - }, - { - "include-filter":"android.content.pm.cts" } ] - }, + } + ], + "presubmit-large":[ { "name":"CtsUsesNativeLibraryTest", "options":[ diff --git a/core/java/android/content/res/TEST_MAPPING b/core/java/android/content/res/TEST_MAPPING index 3703f2e2152b2..c2febaeec73a1 100644 --- a/core/java/android/content/res/TEST_MAPPING +++ b/core/java/android/content/res/TEST_MAPPING @@ -10,11 +10,9 @@ "presubmit": [ { "name": "CtsResourcesLoaderTests" - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsResourcesTestCases", "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" diff --git a/core/java/android/util/apk/TEST_MAPPING b/core/java/android/util/apk/TEST_MAPPING index e1825210bfd92..b26a38be9ae42 100644 --- a/core/java/android/util/apk/TEST_MAPPING +++ b/core/java/android/util/apk/TEST_MAPPING @@ -7,17 +7,15 @@ "include-filter": "android.util.apk.SourceStampVerifierTest" } ] - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsPackageManagerTestCases", "options": [ { "include-filter": "android.content.pm.cts.PackageManagerShellCommandIncrementalTest" }, { - "include-filter": "android.content.pm.cts.PackageManagerShellCommandTest" + "include-filter": "android.content.pm.cts.PackageManagerShellCommandInstallerTest" } ] } diff --git a/core/java/com/android/internal/content/om/TEST_MAPPING b/core/java/com/android/internal/content/om/TEST_MAPPING index 98dadce7359a2..ab3abb1c935af 100644 --- a/core/java/com/android/internal/content/om/TEST_MAPPING +++ b/core/java/com/android/internal/content/om/TEST_MAPPING @@ -10,11 +10,9 @@ }, { "name": "SelfTargetingOverlayDeviceTests" - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsResourcesTestCases", "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" diff --git a/core/jni/TEST_MAPPING b/core/jni/TEST_MAPPING index 28448561e1358..ea0b01e16bdf5 100644 --- a/core/jni/TEST_MAPPING +++ b/core/jni/TEST_MAPPING @@ -15,11 +15,9 @@ { "name": "SelfTargetingOverlayDeviceTests", "file_patterns": ["Overlay"] - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsResourcesTestCases", "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING index 5e23765df346a..e2bbaffe50583 100644 --- a/services/core/java/com/android/server/pm/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/TEST_MAPPING @@ -102,20 +102,15 @@ "include-filter": "android.appsecurity.cts.EphemeralTest#testGetSearchableInfo" } ] - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsPackageManagerTestCases", "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "exclude-annotation": "org.junit.Ignore" - }, - { - "include-filter": "android.content.pm.cts" } ] } diff --git a/services/incremental/TEST_MAPPING b/services/incremental/TEST_MAPPING index 648b904787ce1..d32364d8dcf8c 100644 --- a/services/incremental/TEST_MAPPING +++ b/services/incremental/TEST_MAPPING @@ -22,14 +22,12 @@ }, { "name": "CtsInstalledLoadingProgressHostTests" - } - ], - "presubmit-large": [ + }, { - "name": "CtsContentTestCases", + "name": "CtsPackageManagerTestCases", "options": [ { - "include-filter": "android.content.pm.cts.PackageManagerShellCommandTest" + "include-filter": "android.content.pm.cts.PackageManagerShellCommandInstallTest" }, { "include-filter": "android.content.pm.cts.PackageManagerShellCommandIncrementalTest"