diff options
| author | Brett Chabot <brettchabot@google.com> | 2019-03-05 20:27:28 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-05 20:27:28 -0800 |
| commit | 44ff65937a969b121383f66e4b2f83c94538004c (patch) | |
| tree | 1025aee33d33052870e7dc66b34d50306d63363a | |
| parent | 7be4d116028262102ea5eafad0561d21ff7f3afb (diff) | |
| parent | 2415a8eaf1d78bd3626119d1c7529ffb875376a3 (diff) | |
| download | ethernet-44ff65937a969b121383f66e4b2f83c94538004c.tar.gz | |
Migrate frameworks/opt/net/ethernet to androidx.test am: f83c1e79ca am: 43faf397c8
am: 2415a8eaf1
Change-Id: Ie933d7d304bc13a80dd1171a761d480f3cb58353
| -rw-r--r-- | tests/Android.bp | 2 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/java/com/android/server/ethernet/EthernetTrackerTest.java | 5 |
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; |