Migrate frameworks/opt/net/ethernet to androidx.test
See go/jetpack-test-android-migration
Test: compile
Change-Id: I20fc49dd2487af2245f060454e7f32f5e9145a9c
diff --git a/tests/ethernet/Android.bp b/tests/ethernet/Android.bp
index 8c5df21..9c776e6 100644
--- a/tests/ethernet/Android.bp
+++ b/tests/ethernet/Android.bp
@@ -27,7 +27,7 @@
],
static_libs: [
- "android-support-test",
+ "androidx.test.rules",
"ethernet-service",
],
}
diff --git a/tests/ethernet/AndroidManifest.xml b/tests/ethernet/AndroidManifest.xml
index 1bc0775..302bb6c 100644
--- a/tests/ethernet/AndroidManifest.xml
+++ b/tests/ethernet/AndroidManifest.xml
@@ -22,7 +22,7 @@
<uses-library android:name="android.test.runner" />
</application>
- <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.server.ethernet.tests"
android:label="Ethernet Service Tests" />
</manifest>
diff --git a/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
index a56c9fe..fa945d6 100644
--- a/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
+++ b/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
@@ -25,8 +25,9 @@
import android.net.LinkAddress;
import android.net.NetworkCapabilities;
import android.net.StaticIpConfiguration;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;