From 6fbb4bc8649efe27dffa7e972f494a715a89457d Mon Sep 17 00:00:00 2001
From: Sergey Nikolaienkov <sergeynv@google.com>
Date: Mon, 17 Jan 2022 10:02:07 +0100
Subject: [PATCH] Add CDM CTS test modules to Test-Mapping Presubmit

Add CtsCompanionDeviceManagerCoreTestCases and
CtsCompanionDeviceManagerUiAutomationTestCases to the "presubmit"
TEST_MAPPING group.

Bug: 208213276
Bug: 212535524
Test: atest --test-mapping frameworks/base/core/java/android/companion:presubmit
Test: atest --test-mapping frameworks/base/services/companion:presubmit
Change-Id: I50fd495f3fc455932fd915461a7c3b8559ef0e6e
---
 core/java/android/companion/TEST_MAPPING | 9 ++-------
 services/companion/TEST_MAPPING          | 6 ++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/java/android/companion/TEST_MAPPING b/core/java/android/companion/TEST_MAPPING
index 63f54fa351585..b561c29c37c49 100644
--- a/core/java/android/companion/TEST_MAPPING
+++ b/core/java/android/companion/TEST_MAPPING
@@ -1,12 +1,7 @@
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "CtsOsTestCases",
-      "options": [
-        {
-          "include-filter": "android.os.cts.CompanionDeviceManagerTest"
-        }
-      ]
+      "path": "frameworks/base/services/companion"
     }
   ]
 }
diff --git a/services/companion/TEST_MAPPING b/services/companion/TEST_MAPPING
index 63f54fa351585..4a37cb812981e 100644
--- a/services/companion/TEST_MAPPING
+++ b/services/companion/TEST_MAPPING
@@ -1,5 +1,11 @@
 {
   "presubmit": [
+    {
+      "name": "CtsCompanionDeviceManagerCoreTestCases"
+    },
+    {
+      "name": "CtsCompanionDeviceManagerUiAutomationTestCases"
+    },
     {
       "name": "CtsOsTestCases",
       "options": [