From 1cde7070dbcdf86968766fc7bd6d8e42625f8723 Mon Sep 17 00:00:00 2001
From: Lais Andrade <lsandrade@google.com>
Date: Tue, 18 Jul 2023 12:51:28 +0100
Subject: [PATCH] Add vibrator service test mapping to source folder

Move TEST_MAPPING for FrameworksVibratorServicesTests to the
source code at services/core/java/com/android/server/vibrator.

This ensures that any changes in this source folder will also trigger
FrameworksVibratorServicesTests.

Uodate TEST_MAPPING at the test folder to import the new one, since
changes in test files should also trigger the tests.

This change also removes AndroidTest.xml, since it can use the
auto-generated one.

Test: atest --test-mapping \
       services/core/java/com/android/server/vibrator:presubmit
Bug: 290745798
Change-Id: I664f952035379000aedfa0a0339f3d0b8f2c16e0
---
 .../com/android/server/vibrator/TEST_MAPPING  | 21 ++++++++++++
 services/tests/vibrator/AndroidManifest.xml   |  3 +-
 services/tests/vibrator/AndroidTest.xml       | 34 -------------------
 services/tests/vibrator/TEST_MAPPING          | 18 ++--------
 4 files changed, 24 insertions(+), 52 deletions(-)
 create mode 100644 services/core/java/com/android/server/vibrator/TEST_MAPPING
 delete mode 100644 services/tests/vibrator/AndroidTest.xml

diff --git a/services/core/java/com/android/server/vibrator/TEST_MAPPING b/services/core/java/com/android/server/vibrator/TEST_MAPPING
new file mode 100644
index 0000000000000..f0a7e470f8fda
--- /dev/null
+++ b/services/core/java/com/android/server/vibrator/TEST_MAPPING
@@ -0,0 +1,21 @@
+{
+  "presubmit": [
+    {
+      "name": "FrameworksVibratorServicesTests",
+      "options": [
+        {"exclude-annotation": "android.platform.test.annotations.LargeTest"},
+        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
+        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
+        {"exclude-annotation": "org.junit.Ignore"}
+      ]
+    }
+  ],
+  "postsubmit": [
+    {
+      "name": "FrameworksVibratorServicesTests",
+      "options": [
+        {"exclude-annotation": "org.junit.Ignore"}
+      ]
+    }
+  ]
+}
diff --git a/services/tests/vibrator/AndroidManifest.xml b/services/tests/vibrator/AndroidManifest.xml
index 2a15c15fce41c..a14ea5598758c 100644
--- a/services/tests/vibrator/AndroidManifest.xml
+++ b/services/tests/vibrator/AndroidManifest.xml
@@ -31,8 +31,7 @@
     <!-- Required to set always-on vibrations -->
     <uses-permission android:name="android.permission.VIBRATE_ALWAYS_ON" />
 
-    <application android:debuggable="true"
-        android:testOnly="true">
+    <application android:debuggable="true">
         <uses-library android:name="android.test.mock" android:required="true" />
         <uses-library android:name="android.test.runner" />
     </application>
diff --git a/services/tests/vibrator/AndroidTest.xml b/services/tests/vibrator/AndroidTest.xml
deleted file mode 100644
index d5ee3afaedb6d..0000000000000
--- a/services/tests/vibrator/AndroidTest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<configuration description="Runs Frameworks Vibrator Services Tests.">
-    <option name="test-suite-tag" value="apct" />
-    <option name="test-suite-tag" value="apct-instrumentation" />
-
-    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="install-arg" value="-t" />
-        <option name="test-file-name" value="FrameworksVibratorServicesTests.apk" />
-    </target_preparer>
-
-    <option name="test-tag" value="FrameworksVibratorServicesTests" />
-
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
-        <option name="package" value="com.android.framework.services.tests.vibrator" />
-        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
-        <option name="hidden-api-checks" value="false" />
-    </test>
-</configuration>
diff --git a/services/tests/vibrator/TEST_MAPPING b/services/tests/vibrator/TEST_MAPPING
index f0a7e470f8fda..22b72fa4ff9ee 100644
--- a/services/tests/vibrator/TEST_MAPPING
+++ b/services/tests/vibrator/TEST_MAPPING
@@ -1,21 +1,7 @@
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "FrameworksVibratorServicesTests",
-      "options": [
-        {"exclude-annotation": "android.platform.test.annotations.LargeTest"},
-        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
-        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
-        {"exclude-annotation": "org.junit.Ignore"}
-      ]
-    }
-  ],
-  "postsubmit": [
-    {
-      "name": "FrameworksVibratorServicesTests",
-      "options": [
-        {"exclude-annotation": "org.junit.Ignore"}
-      ]
+      "path": "frameworks/base/services/core/java/com/android/server/vibrator"
     }
   ]
 }