Point TEST MAPPINGs to the new suites.
Bug: 288461387
Bug: 288323752
Test: presubmit
Change-Id: I453a4151100ca42495e0f2473e5599dec38ab70d
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index bc5f7f4..0f66e93 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 dac79e7..01a9373 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 eb9254d..82c47a0 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 3364b7a..6419f8c 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 3703f2e..c2febae 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 e182521..b26a38b 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 98dadce7..ab3abb1 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 2844856..ea0b01e 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 5e23765..e2bbaff 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 648b904..d32364d 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"