From 150b8d7d8542f8ebda7ac8c730391a3a768e8fc2 Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Fri, 21 Jul 2023 14:10:06 +0000
Subject: [PATCH] Add TEST_MAPPING for displayservicetests

- Run display tests when either display code is changed or when display
  tests code are changed.

Bug: 290761553
Test: atest --test-mapping services/core/java/com/android/server/display:presubmit

Merged-In: I55bb88ea2ab656d5fbdd3a23fdc2a6371384aec9
Change-Id: I83a7bb3167dc186f638356e909bfdfe03ee30b54
---
 .../com/android/server/display/TEST_MAPPING   | 21 ++++++++++---------
 .../tests/displayservicetests/TEST_MAPPING    | 10 ++-------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/services/core/java/com/android/server/display/TEST_MAPPING b/services/core/java/com/android/server/display/TEST_MAPPING
index c4a566fd7b62d..5e4e27069fb1e 100644
--- a/services/core/java/com/android/server/display/TEST_MAPPING
+++ b/services/core/java/com/android/server/display/TEST_MAPPING
@@ -1,15 +1,7 @@
 {
     "presubmit": [
         {
-            "name": "FrameworksMockingServicesTests",
-            "options": [
-                {"include-filter": "com.android.server.display"},
-                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
-                {"exclude-annotation": "androidx.test.filters.FlakyTest"}
-            ]
-        },
-        {
-            "name": "FrameworksServicesTests",
+            "name": "DisplayServiceTests",
             "options": [
                 {"include-filter": "com.android.server.display"},
                 {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
@@ -31,5 +23,14 @@
                 }
             ]
         }
+    ],
+    "postsubmit": [
+        {
+            "name": "DisplayServiceTests",
+            "options": [
+                {"include-filter": "com.android.server.display"},
+                {"exclude-annotation": "org.junit.Ignore"}
+            ]
+        }
     ]
-}
\ No newline at end of file
+}
diff --git a/services/tests/displayservicetests/TEST_MAPPING b/services/tests/displayservicetests/TEST_MAPPING
index d8655194ab0f1..477860d3a1c5e 100644
--- a/services/tests/displayservicetests/TEST_MAPPING
+++ b/services/tests/displayservicetests/TEST_MAPPING
@@ -1,13 +1,7 @@
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "DisplayServiceTests",
-      "options": [
-        {"include-filter": "com.android.server.display"},
-        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
-        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
-        {"exclude-annotation": "org.junit.Ignore"}
-      ]
+      "path": "frameworks/base/services/core/java/com/android/server/display"
     }
   ]
 }