From 454a8cc8f830629c6fb8c30aafa23e74975385a5 Mon Sep 17 00:00:00 2001
From: Ahmad Khalil <khalilahmad@google.com>
Date: Wed, 26 Jul 2023 23:28:29 +0000
Subject: [PATCH] Move tests for frameworks-base-testutils lib into their own
 target

The test modules that include these util classes are running the util tests as well, because they're in the same java library. This change separates the util classes from their tests, with a new separate test mapping.

Fix: 292212651
Test: atest frameworks-base-testutils-tests
Change-Id: Ic8309a303307457e0e642370bc2a0a0335e4e8f6
---
 tests/utils/testutils/TEST_MAPPING            | 32 +++++++++++++
 tests/utils/testutils/tests/Android.bp        | 47 +++++++++++++++++++
 .../utils/testutils/tests/AndroidManifest.xml | 29 ++++++++++++
 .../src}/android/os/test/TestLooperTest.java  |  0
 .../android/test/filters/SelectTestTests.java |  0
 5 files changed, 108 insertions(+)
 create mode 100644 tests/utils/testutils/TEST_MAPPING
 create mode 100644 tests/utils/testutils/tests/Android.bp
 create mode 100644 tests/utils/testutils/tests/AndroidManifest.xml
 rename tests/utils/testutils/{java => tests/src}/android/os/test/TestLooperTest.java (100%)
 rename tests/utils/testutils/{java => tests/src}/com/android/test/filters/SelectTestTests.java (100%)

diff --git a/tests/utils/testutils/TEST_MAPPING b/tests/utils/testutils/TEST_MAPPING
new file mode 100644
index 0000000000000..d9eb44fc42227
--- /dev/null
+++ b/tests/utils/testutils/TEST_MAPPING
@@ -0,0 +1,32 @@
+{
+  "presubmit": [
+    {
+      "name": "frameworks-base-testutils-tests",
+      "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": "frameworks-base-testutils-tests",
+      "options": [
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
+    }
+  ]
+}
+
diff --git a/tests/utils/testutils/tests/Android.bp b/tests/utils/testutils/tests/Android.bp
new file mode 100644
index 0000000000000..b901b18023834
--- /dev/null
+++ b/tests/utils/testutils/tests/Android.bp
@@ -0,0 +1,47 @@
+//
+// 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.
+//
+
+package {
+    default_applicable_licenses: ["frameworks_base_license"],
+}
+
+android_test {
+    name: "frameworks-base-testutils-tests",
+
+    srcs: [
+        "src/**/*.java",
+    ],
+
+    static_libs: [
+        "junit",
+        "hamcrest-library",
+        "androidx.test.runner",
+        "mockito-target-minus-junit4",
+        "frameworks-base-testutils",
+    ],
+
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+        "android.test.mock",
+    ],
+
+    certificate: "platform",
+    test_suites: [
+        "device-tests",
+        "automotive-tests",
+    ],
+}
diff --git a/tests/utils/testutils/tests/AndroidManifest.xml b/tests/utils/testutils/tests/AndroidManifest.xml
new file mode 100644
index 0000000000000..9e7e2752f1d5e
--- /dev/null
+++ b/tests/utils/testutils/tests/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.frameworks.tests.utils.testutils.tests">
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.frameworks.tests.utils.testutils.tests"
+        android:label="Test Utils Tests"/>
+</manifest>
diff --git a/tests/utils/testutils/java/android/os/test/TestLooperTest.java b/tests/utils/testutils/tests/src/android/os/test/TestLooperTest.java
similarity index 100%
rename from tests/utils/testutils/java/android/os/test/TestLooperTest.java
rename to tests/utils/testutils/tests/src/android/os/test/TestLooperTest.java
diff --git a/tests/utils/testutils/java/com/android/test/filters/SelectTestTests.java b/tests/utils/testutils/tests/src/com/android/test/filters/SelectTestTests.java
similarity index 100%
rename from tests/utils/testutils/java/com/android/test/filters/SelectTestTests.java
rename to tests/utils/testutils/tests/src/com/android/test/filters/SelectTestTests.java