summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKOUSHIK PANUGANTI <kpanuganti@google.com>2019-03-28 12:44:29 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-28 12:44:29 -0700
commit0357494df5010e2f41e16b8e9fc85bde302f1ef0 (patch)
tree8b23ac79713372e390f447f8b3dc3cb6f4f9f5f3
parent5746aaa77bd585c8f86cf1aeb0d9587bfaad7032 (diff)
parent766c8fd0db82560e0a0d472d8aa06dabb4f61f44 (diff)
downloadandroid_packages_providers_BlockedNumberProvider-0357494df5010e2f41e16b8e9fc85bde302f1ef0.tar.gz
android_packages_providers_BlockedNumberProvider-0357494df5010e2f41e16b8e9fc85bde302f1ef0.tar.bz2
android_packages_providers_BlockedNumberProvider-0357494df5010e2f41e16b8e9fc85bde302f1ef0.zip
Migrate packages/providers/BlockedNumberProvider to androidx.test
am: 766c8fd0db Change-Id: If82be73a813f83e341992ac0a9989fbecad30bc1
-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>