commit 0c585efc5ee6665713d3e4bf5a0013cea93050a5
author KOUSHIK PANUGANTI <kpanuganti@google.com> Tue Mar 19 22:50:23 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 19 22:50:23 2019 -0700
tree 9fc0caeedd6cbdf1c06626cb2762db3a075ec87f
parent 1d2f9148ed23daadcb3efde2019f154f7c420f59
parent 5d1a41a719003d9788b4d93408d5b48ccd39b8f1

Merge "Migrate frameworks/opt/net/ike/tests to androidx.test" am: 90d2ba05c9 am: 0e5567094f
am: 5d1a41a719

Change-Id: I66010532c28d70061ef66b494571917de6ececd0

tests/iketests/Android.mk

diff --git a/tests/iketests/Android.mk b/tests/iketests/Android.mk
index 1e96526..a45703c 100644
--- a/tests/iketests/Android.mk
+++ b/tests/iketests/Android.mk
@@ -27,7 +27,7 @@
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_STATIC_JAVA_LIBRARIES := ike \
-        android-support-test \
+        androidx.test.rules \
         frameworks-base-testutils \
         mockito-target-minus-junit4
 

tests/iketests/AndroidManifest.xml

diff --git a/tests/iketests/AndroidManifest.xml b/tests/iketests/AndroidManifest.xml
index 0cca50c..80f54e8 100644
--- a/tests/iketests/AndroidManifest.xml
+++ b/tests/iketests/AndroidManifest.xml
@@ -25,13 +25,13 @@
     <!--
         To run all tests:
             adb shell am instrument -w \
-            com.android.ike.tests/android.support.test.runner.AndroidJUnitRunner
+            com.android.ike.tests/androidx.test.runner.AndroidJUnitRunner
 
         To run a single class test:
             adb shell am instrument -e class com.android.ike.unit.FooUnitTest \
-            -w com.android.ike.tests/android.support.test.runner.AndroidJUnitRunner
+            -w com.android.ike.tests/androidx.test.runner.AndroidJUnitRunner
     -->
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.ike.tests"
         android:label="Frameworks Ike Tests" />
 </manifest>