From 0c1c053956ae75b7ed478b3112320c3b1fbc4aa9 Mon Sep 17 00:00:00 2001
From: Julien Desprez <jdesprez@google.com>
Date: Wed, 24 Feb 2021 02:07:45 +0000
Subject: [PATCH] Attempt to run error_prone_android_framework_test as unit
 tests

* unclear why the test mapping file is not running with host:true since
it's a java_test_host
* See go/a-unit-tests for full details

The test will continue to be part of presubmit but running as part of
the unit tests suite instead of TEST_MAPPING.
For unit tests, explicit test_mapping declaration isn't needed to run.


Change-Id: I9c0b93d6e6eb0b97ff96b1ac7c02d4525b762bd6
Test: presubmit
Bug: 180736967
Merged-In: I9c0b93d6e6eb0b97ff96b1ac7c02d4525b762bd6
---
 errorprone/Android.bp   | 6 +++++-
 errorprone/TEST_MAPPING | 7 -------
 2 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 errorprone/TEST_MAPPING

diff --git a/errorprone/Android.bp b/errorprone/Android.bp
index d1e94dfed4a86..a927f53e3b5f5 100644
--- a/errorprone/Android.bp
+++ b/errorprone/Android.bp
@@ -36,11 +36,12 @@ java_library_host {
 
 java_test_host {
     name: "error_prone_android_framework_test",
-    test_suites: ["general-tests"],
     srcs: ["tests/java/**/*.java"],
     java_resource_dirs: ["tests/res"],
     java_resources: [":error_prone_android_framework_testdata"],
     static_libs: [
+        "truth-prebuilt",
+        "kxml2-2.3.0",
         "error_prone_android_framework_lib",
         "error_prone_test_helpers",
         "hamcrest-library",
@@ -48,6 +49,9 @@ java_test_host {
         "platform-test-annotations",
         "junit",
     ],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 filegroup {
diff --git a/errorprone/TEST_MAPPING b/errorprone/TEST_MAPPING
deleted file mode 100644
index ee4552fb3b331..0000000000000
--- a/errorprone/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "presubmit": [
-        {
-            "name": "error_prone_android_framework_test"
-        }
-    ]
-}