commit 32e02950c5a61ea8902bd8d0b2bf5f473ee4c3ac
author Bernardo Rufino <brufino@google.com> Thu Nov 21 18:07:31 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 21 18:07:31 2019 +0000
tree 64746eeb6e3bd0f51c92e11cfd12846d38b39f51
parent 02ed3a92233d9b0720c5e4da013a90c977214549
parent 540ad7a28ff92acdc558106800899dd4e9df02f9

Merge "Add TEST_MAPPINGs for toasts"

core/java/android/app/TEST_MAPPING

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 35c7104..c585b5f 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -35,6 +35,19 @@
                     "include-filter": "android.permission2.cts.RuntimePermissionProperties"
                 }
             ]
+        },
+        {
+            "name": "CtsToastTestCases",
+            "file_patterns": ["INotificationManager\\.aidl"]
+        },
+        {
+            "name": "CtsWindowManagerDeviceTestCases",
+            "options": [
+                {
+                    "include-filter": "android.server.wm.ToastTest"
+                }
+            ],
+            "file_patterns": ["INotificationManager\\.aidl"]
         }
     ],
     "postsubmit": [

core/java/android/widget/TEST_MAPPING

diff --git a/core/java/android/widget/TEST_MAPPING b/core/java/android/widget/TEST_MAPPING
index 99a6cdc..d0b8dbc 100644
--- a/core/java/android/widget/TEST_MAPPING
+++ b/core/java/android/widget/TEST_MAPPING
@@ -3,5 +3,20 @@
     {
       "path": "cts/tests/tests/widget"
     }
+  ],
+  "presubmit": [
+    {
+      "name": "CtsToastTestCases",
+      "file_patterns": ["Toast\\.java"]
+    },
+    {
+      "name": "CtsWindowManagerDeviceTestCases",
+      "options": [
+        {
+          "include-filter": "android.server.wm.ToastTest"
+        }
+      ],
+      "file_patterns": ["Toast\\.java"]
+    }
   ]
 }

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

diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING
index 94793d0..0b723c9 100644
--- a/services/core/java/com/android/server/TEST_MAPPING
+++ b/services/core/java/com/android/server/TEST_MAPPING
@@ -23,6 +23,19 @@
         },
         {
             "name": "CtsLocationNoneTestCases"
+        },
+        {
+            "name": "CtsToastTestCases",
+            "file_patterns": ["NotificationManagerService\\.java"]
+        },
+        {
+            "name": "CtsWindowManagerDeviceTestCases",
+            "options": [
+                {
+                    "include-filter": "android.server.wm.ToastTest"
+                }
+            ],
+            "file_patterns": ["NotificationManagerService\\.java"]
         }
     ]
 }