diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-03-20 05:22:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-20 05:22:19 +0000 |
| commit | 90d2ba05c974bc636014523d23a28c9acf4164c5 (patch) | |
| tree | 9fc0caeedd6cbdf1c06626cb2762db3a075ec87f /tests/iketests | |
| parent | ca1edc492cc63971e7f8900a57c178845f88544f (diff) | |
| parent | 96a621c3508226b97831cab8e3026863f99a480c (diff) | |
| download | ike-90d2ba05c974bc636014523d23a28c9acf4164c5.tar.gz | |
Merge "Migrate frameworks/opt/net/ike/tests to androidx.test"
Diffstat (limited to 'tests/iketests')
| -rw-r--r-- | tests/iketests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/iketests/AndroidManifest.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/iketests/Android.mk b/tests/iketests/Android.mk index 1e965262..a45703c1 100644 --- a/tests/iketests/Android.mk +++ b/tests/iketests/Android.mk @@ -27,7 +27,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := ike \ - android-support-test \ + androidx.test.rules \ frameworks-base-testutils \ mockito-target-minus-junit4 diff --git a/tests/iketests/AndroidManifest.xml b/tests/iketests/AndroidManifest.xml index 0cca50cc..80f54e8d 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> |