commit 273a4834f5003e45d02c777ac2f53226a91faf54
author Julien Desprez <jdesprez@google.com> Tue Feb 23 21:47:15 2021 +0000
committer Julien Desprez <jdesprez@google.com> Thu Mar 04 18:17:09 2021 +0000
tree 8d526702a68dd757032d4b818b144afa1c315c36
parent ae3d10cc851bedea5a78aae54ebfb9f1ea899aa3

Run geotz_s2storage_tests as unit tests (go/a-unit-tests)

Instead of relying on explicit TEST_MAPPING config.

Change-Id: I1471906c1dfe257a9c87766391e3f752d847bd63
Test: presubmit
Bug: 180736967
Merged-In: I1471906c1dfe257a9c87766391e3f752d847bd63

s2storage/Android.bp

diff --git a/s2storage/Android.bp b/s2storage/Android.bp
index 663ac07..ddab97f 100644
--- a/s2storage/Android.bp
+++ b/s2storage/Android.bp
@@ -46,7 +46,10 @@
         "geotz_s2storage_rw",
         "junit",
         "mockito",
+        "objenesis",
     ],
-    test_suites: ["general-tests"],
+    test_options: {
+        unit_test: true,
+    },
 }
 

s2storage/TEST_MAPPING

diff --git a/s2storage/TEST_MAPPING b/s2storage/TEST_MAPPING
deleted file mode 100644
index 34c6c87..0000000
--- a/s2storage/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "geotz_s2storage_tests",
-      "host": true
-    }
-  ]
-}