Switched luni, okhttp, jsr166 and icu to use AndroidJUnitRunner
Ensured that the same tests were run before and after the
change. One slight change is that okhttp and jsr166 are no
longer running android.test.LoaderTestCase which is ok
because they should not be running that test anyway.
The cts-runner-specific-failures.txt file was removed because a
bug in AndroidJUnitRunner was fixed. The bug meant that while
scanning the APK, classes that implement junit.framework.Test,
but do not extend junit.framework.TestCase would be added to the
list of classes to run but would cause errors as they were
rejected by the RunnerBuilder implementations.
Bug: 28689581
Test: ran CtsLibcoreTestCases CtsLibcoreJsr166TestCases and CtsLibcoreOkHttpTestCases
Change-Id: Idc5cab2b3cfe93eb569e421e909e6909afba4d9c
diff --git a/tests/libcore/jsr166/AndroidTest.xml b/tests/libcore/jsr166/AndroidTest.xml
index 639f365..bdf5643 100644
--- a/tests/libcore/jsr166/AndroidTest.xml
+++ b/tests/libcore/jsr166/AndroidTest.xml
@@ -21,17 +21,15 @@
</target_preparer>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
<option name="cleanup-apks" value="true" />
- <!-- this has the CoreTestRunner which needs to be in a separate APK -->
- <option name="test-file-name" value="CtsLibcoreTestRunner.apk" />
<!-- this has just the instrumentation which acts as the tests we want to run -->
<option name="test-file-name" value="CtsLibcoreJsr166TestCases.apk" />
</target_preparer>
<test class="com.android.compatibility.testtype.LibcoreTest" >
- <!-- override AJUR -->
- <option name="runner" value="com.android.cts.core.runner.CoreTestRunner" />
<option name="package" value="android.libcore.cts.jsr166" />
- <option name="instrumentation-arg" key="core-listener"
- value="com.android.cts.runner.CtsTestRunListener"/>
+ <option name="instrumentation-arg" key="listener"
+ value="com.android.cts.runner.CtsTestRunListener" />
+ <option name="instrumentation-arg" key="filter"
+ value="com.android.cts.core.runner.ExpectationBasedFilter" />
<option name="core-expectation" value="/knownfailures.txt" />
<option name="core-expectation" value="/brokentests.txt" />
<option name="core-expectation" value="/icebox.txt" />