summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@google.com>2019-03-05 09:10:36 -0800
committerBrett Chabot <brettchabot@google.com>2019-03-05 09:10:36 -0800
commitf83c1e79ca2ac081bd6a7b3fe50a0d5737b039ea (patch)
tree1025aee33d33052870e7dc66b34d50306d63363a
parent05be958f788ef86a9d7ce87dcc035cd5877793a5 (diff)
downloadethernet-f83c1e79ca2ac081bd6a7b3fe50a0d5737b039ea.tar.gz
Migrate frameworks/opt/net/ethernet to androidx.test
See go/jetpack-test-android-migration Test: compile Change-Id: I20fc49dd2487af2245f060454e7f32f5e9145a9c
-rw-r--r--tests/Android.bp2
-rw-r--r--tests/AndroidManifest.xml2
-rw-r--r--tests/java/com/android/server/ethernet/EthernetTrackerTest.java5
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index 8c5df21..9c776e6 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -27,7 +27,7 @@ android_test {
],
static_libs: [
- "android-support-test",
+ "androidx.test.rules",
"ethernet-service",
],
}
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 1bc0775..302bb6c 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/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/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/java/com/android/server/ethernet/EthernetTrackerTest.java
index a56c9fe..fa945d6 100644
--- a/tests/java/com/android/server/ethernet/EthernetTrackerTest.java
+++ b/tests/java/com/android/server/ethernet/EthernetTrackerTest.java
@@ -25,8 +25,9 @@ import android.net.IpConfiguration.ProxySettings;
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;