This moves shadows/httpclient tests to the isolation runner. am: dbdf288e02 am: 7a5789c8e8

Change-Id: I30ca8c7b59eacb9b4819111f1ed6eeae71ec622c

12 files changed, 145 insertions, 2 deletions

diff --git a/processor/Android.bp b/processor/Android.bp
index b00d10038..ee9b80c03 100644
--- a/processor/Android.bp
+++ b/processor/Android.bp
@@ -53,6 +53,8 @@ java_test_host {
         "jsr305",
     ],
 
+    test_suites: ["general-tests"],
+
     // Disable annotation processing while compiling tests to avoid executing RobolectricProcessor.
     javacflags: ["-proc:none"],
 }
diff --git a/processor/AndroidTest.xml b/processor/AndroidTest.xml
new file mode 100644
index 000000000..96fc65801
--- /dev/null
+++ b/processor/AndroidTest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 Robolectric_processor_tests">
+    <test class="com.android.tradefed.testtype.IsolatedHostTest" >
+        <option name="jar" value="Robolectric_processor_tests.jar" />
+        <option name="java-flags" value="-Drobolectric.offline=true" />
+        <option name="java-flags" value="-Drobolectric.resourcesMode=binary" />
+        <option name="exclude-paths" value="java/" />
+    </test>
+</configuration>
diff --git a/resources/Android.bp b/resources/Android.bp
index 8887d6f30..76e584cc6 100644
--- a/resources/Android.bp
+++ b/resources/Android.bp
@@ -32,4 +32,5 @@ java_test_host {
         "truth-prebuilt",
         "jsr305",
     ],
+    test_suites: ["general-tests"],
 }
diff --git a/resources/AndroidTest.xml b/resources/AndroidTest.xml
new file mode 100644
index 000000000..5f9540f86
--- /dev/null
+++ b/resources/AndroidTest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 Robolectric_resources_tests">
+    <test class="com.android.tradefed.testtype.IsolatedHostTest" >
+        <option name="jar" value="Robolectric_resources_tests.jar" />
+        <option name="java-flags" value="-Drobolectric.offline=true" />
+        <option name="java-flags" value="-Drobolectric.resourcesMode=binary" />
+        <option name="exclude-paths" value="java/" />
+    </test>
+</configuration>
diff --git a/sandbox/Android.bp b/sandbox/Android.bp
index 8030faf6f..8664c45fc 100644
--- a/sandbox/Android.bp
+++ b/sandbox/Android.bp
@@ -41,4 +41,5 @@ java_test_host {
         "asm-6.0",
         "jsr305",
     ],
+    test_suites: ["general-tests"],
 }
diff --git a/sandbox/AndroidTest.xml b/sandbox/AndroidTest.xml
new file mode 100644
index 000000000..932f08385
--- /dev/null
+++ b/sandbox/AndroidTest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 Robolectric_sandbox_tests">
+    <test class="com.android.tradefed.testtype.IsolatedHostTest" >
+        <option name="jar" value="Robolectric_sandbox_tests.jar" />
+        <option name="java-flags" value="-Drobolectric.offline=true" />
+        <option name="java-flags" value="-Drobolectric.resourcesMode=binary" />
+        <option name="exclude-paths" value="java/" />
+    </test>
+</configuration>
diff --git a/shadowapi/Android.bp b/shadowapi/Android.bp
index 521fc0b2b..c9181807c 100644
--- a/shadowapi/Android.bp
+++ b/shadowapi/Android.bp
@@ -21,4 +21,5 @@ java_test_host {
         "junit",
         "truth-prebuilt",
     ],
+    test_suites: ["general-tests"],
 }
diff --git a/shadowapi/AndroidTest.xml b/shadowapi/AndroidTest.xml
new file mode 100644
index 000000000..16368dd43
--- /dev/null
+++ b/shadowapi/AndroidTest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 Robolectric_shadowapi_tests">
+    <test class="com.android.tradefed.testtype.IsolatedHostTest" >
+        <option name="jar" value="Robolectric_shadowapi_tests.jar" />
+        <option name="java-flags" value="-Drobolectric.offline=true" />
+        <option name="java-flags" value="-Drobolectric.resourcesMode=binary" />
+        <option name="exclude-paths" value="java/" />
+    </test>
+</configuration>
diff --git a/shadows/httpclient/Android.bp b/shadows/httpclient/Android.bp
index 4d7b7e900..7c8bf9a3d 100644
--- a/shadows/httpclient/Android.bp
+++ b/shadows/httpclient/Android.bp
@@ -51,9 +51,8 @@ java_test_host {
         "robolectric-ant-1.8.0",
         "asm-6.0",
         "jsr305",
-    ],
-    libs: [
         "robolectric-host-android_all",
         "robolectric-host-org_apache_http_legacy",
     ],
+    test_suites: ["general-tests"],
 }
diff --git a/shadows/httpclient/AndroidTest.xml b/shadows/httpclient/AndroidTest.xml
new file mode 100644
index 000000000..e98bb67a8
--- /dev/null
+++ b/shadows/httpclient/AndroidTest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 Robolectric_shadows_httpclient_tests">
+    <test class="com.android.tradefed.testtype.IsolatedHostTest" >
+        <option name="jar" value="Robolectric_shadows_httpclient_tests.jar" />
+        <option name="java-flags" value="-Drobolectric.offline=true" />
+        <option name="java-flags" value="-Drobolectric.resourcesMode=binary" />
+        <option name="exclude-paths" value="java/" />
+    </test>
+</configuration>
diff --git a/utils/Android.bp b/utils/Android.bp
index 23b035e8d..dda482454 100644
--- a/utils/Android.bp
+++ b/utils/Android.bp
@@ -21,4 +21,5 @@ java_test_host {
         "junit",
         "truth-prebuilt",
     ],
+    test_suites: ["general-tests"],
 }
diff --git a/utils/AndroidTest.xml b/utils/AndroidTest.xml
new file mode 100644
index 000000000..9f3b35bc5
--- /dev/null
+++ b/utils/AndroidTest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 Robolectric_utils_tests">
+    <test class="com.android.tradefed.testtype.IsolatedHostTest" >
+        <option name="jar" value="Robolectric_utils_tests.jar" />
+        <option name="java-flags" value="-Drobolectric.offline=true" />
+        <option name="java-flags" value="-Drobolectric.resourcesMode=binary" />
+        <option name="exclude-paths" value="java/" />
+    </test>
+</configuration>