Merge "Organize services/tests/PackageManager* for PackageManager"

2021-10-27 08:16:45 +00:00
parent 17c5950aea 138856dcaf
commit 410d7f7cbb
5 changed files with 43 additions and 3 deletions
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -1,5 +1,14 @@
 {
  "imports": [
+    {
+      "path": "frameworks/base/services/tests/PackageManagerServiceTests"
+    },
+    {
+      "path": "frameworks/base/services/tests/PackageManager"
+    },
+    {
+      "path": "frameworks/base/services/tests/PackageManagerComponentOverrideTests"
+    },
    {
      "path": "cts/tests/tests/packageinstaller"
    },
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -20,9 +20,6 @@
    {
      "name": "CtsAppEnumerationTestCases"
    },
-    {
-      "name": "AppEnumerationInternalTests"
-    },
    {
      "name": "CtsMatchFlagTestCases"
    },
--- a/services/tests/PackageManager/TEST_MAPPING
+++ b/services/tests/PackageManager/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "PackageInstallerTests"
+    }
+  ]
+}
+
--- a/services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING
+++ b/services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "PackageManagerComponentOverrideTests"
+    }
+  ]
+}
+
--- a/services/tests/PackageManagerServiceTests/TEST_MAPPING
+++ b/services/tests/PackageManagerServiceTests/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "AppEnumerationInternalTests"
+    }
+  ],
+  "postsubmit": [
+    {
+      "name": "PackageManagerServiceHostTests"
+    }
+  ],
+  "imports": [
+    {
+      "path": "frameworks/base/services/tests/PackageManagerServiceTests/unit"
+    }
+  ]
+}
+