Switch SignatureTest to repackaged junit/android.test
Removes the dependency on junit and android.test classes to allow the
test to work when they are not present.
Tested using:
m -j32 CtsApiSignatureTestCases && \
cts-tradefed run cts -a arm64-v8a -m CtsApiSignatureTestCases
Follow on from If0355a0d50b7540f416d464fdf7ffae0e4766b1c
Bug: 35192974
Bug: 30188076
Test: see above
Change-Id: I414d0500730541b692a20073820fa0566130d16f
diff --git a/tests/signature/api-check/Android.mk b/tests/signature/api-check/Android.mk
index 4c4f537..745aee9 100644
--- a/tests/signature/api-check/Android.mk
+++ b/tests/signature/api-check/Android.mk
@@ -29,5 +29,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
cts-signature-common \
+ repackaged-legacy-test \
+ repackaged.android.test.runner \
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/signature/api-check/AndroidManifest.xml b/tests/signature/api-check/AndroidManifest.xml
index 88930eb..dbeccf5 100644
--- a/tests/signature/api-check/AndroidManifest.xml
+++ b/tests/signature/api-check/AndroidManifest.xml
@@ -24,7 +24,7 @@
<uses-library android:name="android.test.runner"/>
</application>
- <instrumentation android:name="android.test.InstrumentationTestRunner"
+ <instrumentation android:name="repackaged.android.test.InstrumentationTestRunner"
android:targetPackage="android.signature.cts.api"
android:label="API Signature Test"/>
diff --git a/tests/signature/api-check/AndroidTest.xml b/tests/signature/api-check/AndroidTest.xml
index 7c75a7f..997c7ba 100644
--- a/tests/signature/api-check/AndroidTest.xml
+++ b/tests/signature/api-check/AndroidTest.xml
@@ -28,7 +28,7 @@
</target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="android.signature.cts.api" />
- <option name="runner" value="android.test.InstrumentationTestRunner" />
+ <option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
<option name="runtime-hint" value="30s" />
</test>
</configuration>
diff --git a/tests/signature/api-check/src/android/signature/cts/api/SignatureTest.java b/tests/signature/api-check/src/android/signature/cts/api/SignatureTest.java
index 414cdc8..78ae353 100644
--- a/tests/signature/api-check/src/android/signature/cts/api/SignatureTest.java
+++ b/tests/signature/api-check/src/android/signature/cts/api/SignatureTest.java
@@ -38,9 +38,10 @@
import android.signature.cts.JDiffClassDescription.JDiffField;
import android.signature.cts.JDiffClassDescription.JDiffMethod;
import android.signature.cts.ResultObserver;
-import android.test.AndroidTestCase;
import android.util.Log;
+import repackaged.junit.framework.TestCase;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
@@ -54,7 +55,7 @@
/**
* Performs the signature check via a JUnit test.
*/
-public class SignatureTest extends AndroidTestCase {
+public class SignatureTest extends TestCase {
private static final String TAG = SignatureTest.class.getSimpleName();