From 540ad7a28ff92acdc558106800899dd4e9df02f9 Mon Sep 17 00:00:00 2001
From: Bernardo Rufino <brufino@google.com>
Date: Wed, 20 Nov 2019 19:12:13 +0000
Subject: [PATCH] Add TEST_MAPPINGs for toasts

Following revert of ag/9699132 due to related broken tests that weren't
executed in presubmit.

Test: croot frameworks/base/core/java/android/app && atest --dry-run --test-mapping
Test: croot frameworks/base/core/java/android/widget && atest --dry-run --test-mapping
Test: croot frameworks/base/services/core/java/com/android/server && atest --dry-run --test-mapping
Change-Id: I819cf354315e240b28dba294c08cf08bba6aada2
---
 core/java/android/app/TEST_MAPPING                | 13 +++++++++++++
 core/java/android/widget/TEST_MAPPING             | 15 +++++++++++++++
 .../core/java/com/android/server/TEST_MAPPING     | 13 +++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 35c7104584862..c585b5fcdc19d 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": [
diff --git a/core/java/android/widget/TEST_MAPPING b/core/java/android/widget/TEST_MAPPING
index 99a6cdcbe60cc..d0b8dbcf83398 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"]
+    }
   ]
 }
diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING
index 94793d0fb717d..0b723c997a83d 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"]
         }
     ]
 }