diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-12-20 23:53:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-20 23:53:33 +0000 |
| commit | 6634ae2cf375dabe5a7ae8ec35627ae19784ec9c (patch) | |
| tree | d72d578384ce99716a51f3c24a40c0e12f1e22b9 | |
| parent | b93b626cbfaa77f6811e9fdfd3c362b45731661c (diff) | |
| parent | 2d6c5fc3bf19a15ea72b90d15d2313ec0d741319 (diff) | |
Merge "Migrate frameworks/base/packages/ExternalStorageProvider/tests to androidx.test"
4 files changed, 6 insertions, 5 deletions
diff --git a/packages/ExternalStorageProvider/tests/Android.bp b/packages/ExternalStorageProvider/tests/Android.bp index 83427d4ebf00..04cf01af073a 100644 --- a/packages/ExternalStorageProvider/tests/Android.bp +++ b/packages/ExternalStorageProvider/tests/Android.bp @@ -14,7 +14,7 @@ android_test { ], static_libs: [ - "android-support-test", + "androidx.test.rules", "mockito-target", "truth-prebuilt", ], diff --git a/packages/ExternalStorageProvider/tests/AndroidManifest.xml b/packages/ExternalStorageProvider/tests/AndroidManifest.xml index 58b6e86dfc77..f1a6af08ec4c 100644 --- a/packages/ExternalStorageProvider/tests/AndroidManifest.xml +++ b/packages/ExternalStorageProvider/tests/AndroidManifest.xml @@ -6,7 +6,7 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.externalstorage" android:label="ExternalStorageProvider Tests" /> </manifest> diff --git a/packages/ExternalStorageProvider/tests/AndroidTest.xml b/packages/ExternalStorageProvider/tests/AndroidTest.xml index e5fa73f59836..f8438b22b603 100644 --- a/packages/ExternalStorageProvider/tests/AndroidTest.xml +++ b/packages/ExternalStorageProvider/tests/AndroidTest.xml @@ -23,7 +23,7 @@ <option name="test-tag" value="ExternalStorageProviderTests" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.externalstorage.tests" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> <option name="hidden-api-checks" value="false"/> </test> </configuration> diff --git a/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java b/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java index a88b3e146ea1..fbf2e4b8ff19 100644 --- a/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java +++ b/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java @@ -23,8 +23,9 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import android.content.pm.ProviderInfo; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; |