Migrate device/google/cuttlefish_common to androidx.test
See go/jetpack-test-android-migration
Test: mmm device/google/cuttlefish_common/tests
Change-Id: I892b34af4c5cdce6b77d9c132ac48e9aa035966a
diff --git a/tests/ril/Android.mk b/tests/ril/Android.mk
index 178e916..e83837f 100644
--- a/tests/ril/Android.mk
+++ b/tests/ril/Android.mk
@@ -30,7 +30,7 @@
else
LOCAL_JAVA_LIBRARIES := android.test.runner
endif
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test espresso-core
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules androidx.test.espresso.core
LOCAL_STATIC_JAVA_LIBRARIES+=platform-test-annotations
diff --git a/tests/ril/AndroidManifest.xml b/tests/ril/AndroidManifest.xml
index 462daa6..4872109 100644
--- a/tests/ril/AndroidManifest.xml
+++ b/tests/ril/AndroidManifest.xml
@@ -29,7 +29,7 @@
android:targetSdkVersion="25" />
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.cuttlefish.ril.tests" />
<application>
diff --git a/tests/ril/runtests.sh b/tests/ril/runtests.sh
index d271455..2bb4bac 100755
--- a/tests/ril/runtests.sh
+++ b/tests/ril/runtests.sh
@@ -27,4 +27,4 @@
adb uninstall com.android.cuttlefish.ril.tests || true
adb install -r -g "$OUT/data/app/CuttlefishRilTests/CuttlefishRilTests.apk"
# optionally: -e class com.android.cuttlefish.ril.RilE2eTests#testName
-adb shell am instrument -w "$@" 'com.android.cuttlefish.ril.tests/android.support.test.runner.AndroidJUnitRunner'
+adb shell am instrument -w "$@" 'com.android.cuttlefish.ril.tests/androidx.test.runner.AndroidJUnitRunner'
diff --git a/tests/ril/src/com/android/cuttlefish/ril/tests/RilE2eTests.java b/tests/ril/src/com/android/cuttlefish/ril/tests/RilE2eTests.java
index c121884..3927728 100644
--- a/tests/ril/src/com/android/cuttlefish/ril/tests/RilE2eTests.java
+++ b/tests/ril/src/com/android/cuttlefish/ril/tests/RilE2eTests.java
@@ -15,21 +15,21 @@
*/
package com.android.cuttlefish.ril.tests;
+import static org.hamcrest.Matchers.greaterThan;
+
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkInfo;
-import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
-import android.support.test.InstrumentationRegistry;
import android.telephony.CellInfoGsm;
import android.telephony.CellSignalStrengthGsm;
import android.telephony.TelephonyManager;
import android.util.Log;
-import static org.hamcrest.Matchers.greaterThan;
+import androidx.test.InstrumentationRegistry;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/tests/wifi/Android.mk b/tests/wifi/Android.mk
index 50ba909..7695c69 100644
--- a/tests/wifi/Android.mk
+++ b/tests/wifi/Android.mk
@@ -29,7 +29,7 @@
else
LOCAL_JAVA_LIBRARIES := android.test.runner
endif
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test platform-test-annotations
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules platform-test-annotations
include $(BUILD_PACKAGE)
endif
diff --git a/tests/wifi/AndroidManifest.xml b/tests/wifi/AndroidManifest.xml
index 0ff1388..9394ad0 100644
--- a/tests/wifi/AndroidManifest.xml
+++ b/tests/wifi/AndroidManifest.xml
@@ -28,7 +28,7 @@
android:targetSdkVersion="25" />
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.cuttlefish.wifi.tests" />
<application>
diff --git a/tests/wifi/runtests.sh b/tests/wifi/runtests.sh
index c867901..c6642d3 100755
--- a/tests/wifi/runtests.sh
+++ b/tests/wifi/runtests.sh
@@ -27,4 +27,4 @@
adb uninstall com.android.cuttlefish.wifi.tests || true
adb install -r -g "$OUT/data/app/CuttlefishWifiTests/CuttlefishWifiTests.apk"
# optionally: -e class com.android.cuttlefish.wifi.WifiE2eTests#testName
-adb shell am instrument -w "$@" 'com.android.cuttlefish.wifi.tests/android.support.test.runner.AndroidJUnitRunner'
+adb shell am instrument -w "$@" 'com.android.cuttlefish.wifi.tests/androidx.test.runner.AndroidJUnitRunner'
diff --git a/tests/wifi/src/com/android/cuttlefish/wifi/tests/WifiE2eTests.java b/tests/wifi/src/com/android/cuttlefish/wifi/tests/WifiE2eTests.java
index e3d9e70..4eab09c 100644
--- a/tests/wifi/src/com/android/cuttlefish/wifi/tests/WifiE2eTests.java
+++ b/tests/wifi/src/com/android/cuttlefish/wifi/tests/WifiE2eTests.java
@@ -19,14 +19,14 @@
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkInfo;
-import android.net.ConnectivityManager;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
-import android.support.test.InstrumentationRegistry;
import android.util.Log;
+import androidx.test.InstrumentationRegistry;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
