summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-03-28 11:08:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-28 11:08:22 +0000
commitc057b2b218c63a0a5977f9daaf8f3a8f5fad9eb3 (patch)
tree6739395c78ad8fb90cb1a207bfcb83e9ed910a0d
parentfe1cb07ae172017968f009b0b55819b078b36d14 (diff)
parent6b5d16ef57f1ae534312a21190736f259317bbc7 (diff)
downloadBlockedNumberProvider-c057b2b218c63a0a5977f9daaf8f3a8f5fad9eb3.tar.gz
Merge "Migrate packages/providers/BlockedNumberProvider to androidx.test"
-rw-r--r--tests/Android.bp2
-rw-r--r--tests/AndroidManifest.xml2
-rw-r--r--tests/AndroidTest.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index e4e57ed..2656ffa 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -2,7 +2,7 @@ android_test {
name: "BlockedNumberProviderTest",
static_libs: [
"mockito-target-minus-junit4",
- "android-support-test",
+ "androidx.test.rules",
],
libs: [
"android.test.runner",
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 4c00887..1535ce4 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -30,7 +30,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.providers.blockednumber"
android:label="Blocked Numbers Tests">
</instrumentation>
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index deec903..b9d5ebe 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -22,7 +22,7 @@
<option name="test-tag" value="BlockedNumberProviderTest" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.providers.blockednumber.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>