Revert "Migrate device/google/cuttlefish_common to androidx.test"
This reverts commit 6eb67e7e67d33a91929eb530030196cefb4988be.
Reason for revert: broke git_pi-gce-dev
We can land this later.
Change-Id: I2228a273a766e745cc0eb2c4175a287fefb18f50
diff --git a/tests/ril/Android.mk b/tests/ril/Android.mk
index e83837f..178e916 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 := androidx.test.rules androidx.test.espresso.core
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test espresso-core
LOCAL_STATIC_JAVA_LIBRARIES+=platform-test-annotations
diff --git a/tests/ril/AndroidManifest.xml b/tests/ril/AndroidManifest.xml
index 4872109..462daa6 100644
--- a/tests/ril/AndroidManifest.xml
+++ b/tests/ril/AndroidManifest.xml
@@ -29,7 +29,7 @@
android:targetSdkVersion="25" />
<instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.cuttlefish.ril.tests" />
<application>
diff --git a/tests/ril/runtests.sh b/tests/ril/runtests.sh
index 2bb4bac..d271455 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/androidx.test.runner.AndroidJUnitRunner'
+adb shell am instrument -w "$@" 'com.android.cuttlefish.ril.tests/android.support.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 3927728..c121884 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 androidx.test.InstrumentationRegistry;
-
+import static org.hamcrest.Matchers.greaterThan;
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 7695c69..50ba909 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 := androidx.test.rules platform-test-annotations
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test platform-test-annotations
include $(BUILD_PACKAGE)
endif
diff --git a/tests/wifi/AndroidManifest.xml b/tests/wifi/AndroidManifest.xml
index 9394ad0..0ff1388 100644
--- a/tests/wifi/AndroidManifest.xml
+++ b/tests/wifi/AndroidManifest.xml
@@ -28,7 +28,7 @@
android:targetSdkVersion="25" />
<instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.cuttlefish.wifi.tests" />
<application>
diff --git a/tests/wifi/runtests.sh b/tests/wifi/runtests.sh
index c6642d3..c867901 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/androidx.test.runner.AndroidJUnitRunner'
+adb shell am instrument -w "$@" 'com.android.cuttlefish.wifi.tests/android.support.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 4eab09c..e3d9e70 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;
