From 138856dcaf81234254c71abddd89d7477949bbfb Mon Sep 17 00:00:00 2001
From: Felka Chang <felkachang@google.com>
Date: Thu, 14 Oct 2021 23:09:26 +0800
Subject: [PATCH] Organize services/tests/PackageManager* for PackageManager

This patch adds 3 CTS test cases for PackageManager. They are the
following.
presubmit:
* PackageInstallerTests: Pixel 3 takes less than 5 seconds
* PackageManagerServiceUnitTests: Pixel 3 takes less than 5 seconds
* PackageManagerComponentOverrideTests: Pixel 3 takes less than 5
                                        seconds
* AppEnumerationInternalTests(moving location): Pixel 3 takes 10
                                                seconds

postsubmit:
* PackageManagerServiceHostTests: Pixel 4 5G takes 1 hour 17 minutes

When the developers change any code in
frameworks/base/service/core/java/com/android/server/pm and
frameworks/base/service/core/java/android/content/pm, it should invoke
all of the tests under cts/hostsidetests/packagemanager.

Why does this patch change AppEnumerationInternalTests from
frameworks/base/services/core/java/com/android/server/pm/TEST_MAPPING
to
frameworks/base/services/tests/PackageManagerServiceTests/TEST_MAPPING?
When developers uploads the gerrit patches to modify the content of
AppEnumerationInternalTests, presubmit process won't trigger
AppEnumerationInternalTests except for moving to
frameworks/base/services/tests/PackageManagerServiceTests/TEST_MAPPING.

Test: atest -c --dry-run -p \
    frameworks/base/services/tests/PackageManagerServiceTests:presubmit
Test: atest -c --dry-run -p \
    frameworks/base/services/tests/PackageManagerServiceTests
Test: atest -c --dry-run -p \
    frameworks/base/services/tests/PackageManager:presubmit
Test: TEST_BASE="frameworks/base/services" ;\
      atest -c --dry-run -p \
    ${TEST_BASE}/testsPackageManagerComponentOverrideTests:presubmit

Bug: 180650365
Change-Id: I62de692f7b5a33e3737effea622ed3f2460c64c3
---
 core/java/android/content/pm/TEST_MAPPING      |  9 +++++++++
 .../java/com/android/server/pm/TEST_MAPPING    |  3 ---
 services/tests/PackageManager/TEST_MAPPING     |  8 ++++++++
 .../TEST_MAPPING                               |  8 ++++++++
 .../PackageManagerServiceTests/TEST_MAPPING    | 18 ++++++++++++++++++
 5 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 services/tests/PackageManager/TEST_MAPPING
 create mode 100644 services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING
 create mode 100644 services/tests/PackageManagerServiceTests/TEST_MAPPING

diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 0d8fdcc4138fe..cc4782ad4a794 100644
--- 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"
     },
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index c8deffbf257ad..d54acb7d6bd60 100644
--- 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"
     },
diff --git a/services/tests/PackageManager/TEST_MAPPING b/services/tests/PackageManager/TEST_MAPPING
new file mode 100644
index 0000000000000..72d4c828c4529
--- /dev/null
+++ b/services/tests/PackageManager/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "PackageInstallerTests"
+    }
+  ]
+}
+
diff --git a/services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING b/services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING
new file mode 100644
index 0000000000000..528c949f36de5
--- /dev/null
+++ b/services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "PackageManagerComponentOverrideTests"
+    }
+  ]
+}
+
diff --git a/services/tests/PackageManagerServiceTests/TEST_MAPPING b/services/tests/PackageManagerServiceTests/TEST_MAPPING
new file mode 100644
index 0000000000000..af0008c29aafa
--- /dev/null
+++ b/services/tests/PackageManagerServiceTests/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "AppEnumerationInternalTests"
+    }
+  ],
+  "postsubmit": [
+    {
+      "name": "PackageManagerServiceHostTests"
+    }
+  ],
+  "imports": [
+    {
+      "path": "frameworks/base/services/tests/PackageManagerServiceTests/unit"
+    }
+  ]
+}
+