summaryrefslogtreecommitdiff
path: root/location/tests
diff options
context:
space:
mode:
authorKOUSHIK PANUGANTI <kpanuganti@google.com>2018-12-17 18:40:30 -0800
committerKOUSHIK PANUGANTI <kpanuganti@google.com>2018-12-17 18:40:30 -0800
commit17bc63767f5983df92bfce52b3a123a7b7b59b24 (patch)
tree02bef11b849713e4558e8f5cd170832122c0a8e7 /location/tests
parent77a8a387f05c2051d637fc05a1012309faac8b63 (diff)
Migrate frameworks/base/location/tests/locationtests to androidx.test
See go/jetpack-test-android-migration Test: make checkbuild Change-Id: I95ad03e062e383d09e08c6f80f838d208080970c
Diffstat (limited to 'location/tests')
-rw-r--r--location/tests/locationtests/Android.mk2
-rw-r--r--location/tests/locationtests/AndroidManifest.xml2
-rw-r--r--location/tests/locationtests/AndroidTest.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/location/tests/locationtests/Android.mk b/location/tests/locationtests/Android.mk
index b2fd8ecef734..3dcf69426362 100644
--- a/location/tests/locationtests/Android.mk
+++ b/location/tests/locationtests/Android.mk
@@ -12,7 +12,7 @@ LOCAL_PACKAGE_NAME := FrameworksLocationTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-test \
+ androidx.test.rules \
core-test-rules \
guava \
mockito-target-minus-junit4 \
diff --git a/location/tests/locationtests/AndroidManifest.xml b/location/tests/locationtests/AndroidManifest.xml
index ddb8ea6aa53a..5010d3d56a50 100644
--- a/location/tests/locationtests/AndroidManifest.xml
+++ b/location/tests/locationtests/AndroidManifest.xml
@@ -29,7 +29,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.frameworks.locationtests"
android:label="Frameworks Location Tests" />
</manifest>
diff --git a/location/tests/locationtests/AndroidTest.xml b/location/tests/locationtests/AndroidTest.xml
index bb6547bec0f7..7bddb58f2cf2 100644
--- a/location/tests/locationtests/AndroidTest.xml
+++ b/location/tests/locationtests/AndroidTest.xml
@@ -22,7 +22,7 @@
<option name="test-tag" value="FrameworksLocationTests" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.frameworks.locationtests" />
- <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>