From 3e213cffec5395f602fe9ed7fb987323c6f3ef1a Mon Sep 17 00:00:00 2001
From: easoncylee <easoncylee@google.com>
Date: Thu, 14 May 2020 09:46:22 +0800
Subject: [PATCH] Fix mis-configuration of TEST_MAPPING file.

UidAtomTests:testAppOps is a test class and test method of
CtsStatsdHostTestCases. To run this in Test Mapping, it should
specify CtsStatsdHostTestCases. as the name in TEST_MAPPING file,
and android.cts.statsd.atom.UidAtomTests as the options.

Bug: 155714228
Test: presubmit test.
Change-Id: I7df08ae811425020ebbeae6a8e9f1317065c00c9
---
 core/java/android/app/TEST_MAPPING                       | 7 ++++++-
 services/core/java/com/android/server/appop/TEST_MAPPING | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 344a4d79b766d..28e73a9624ab7 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -20,7 +20,12 @@
         },
         {
             "file_patterns": ["(/|^)AppOpsManager.java"],
-            "name": "UidAtomTests:testAppOps"
+            "name": "CtsStatsdHostTestCases",
+            "options": [
+                {
+                    "include-filter": "android.cts.statsd.atom.UidAtomTests"
+                }
+            ]
         },
         {
             "file_patterns": ["(/|^)AppOpsManager.java"],
diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING
index 9cd903940a834..e242527310864 100644
--- a/services/core/java/com/android/server/appop/TEST_MAPPING
+++ b/services/core/java/com/android/server/appop/TEST_MAPPING
@@ -45,7 +45,12 @@
             ]
         },
         {
-            "name": "UidAtomTests:testAppOps"
+            "name": "CtsStatsdHostTestCases",
+            "options": [
+                {
+                    "include-filter": "android.cts.statsd.atom.UidAtomTests"
+                }
+            ]
         }
     ]
 }