LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate frameworks/opt/net/ethernet to androidx.test

Browse Source 
am: e9eff7a450

Change-Id: Ibd005ade7b4aa33335f81ac5386d6cffca8bc0cf
This commit is contained in:
Brett Chabot
2019-03-05 20:16:27 -08:00
committed by android-build-merger
parent 1206467ba2 e9eff7a450
commit da5fc01718
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ethernet/Android.bp
View File

@@ -27,7 +27,7 @@ android_test {
], ],
static_libs: [ static_libs: [
"android-support-test", "androidx.test.rules",
"ethernet-service", "ethernet-service",
], ],
} }

2
tests/ethernet/AndroidManifest.xml
View File

@@ -22,7 +22,7 @@
<uses-library android:name="android.test.runner" /> <uses-library android:name="android.test.runner" />
</application> </application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.server.ethernet.tests" android:targetPackage="com.android.server.ethernet.tests"
android:label="Ethernet Service Tests" /> android:label="Ethernet Service Tests" />
</manifest> </manifest>

5
tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
View File

@@ -25,8 +25,9 @@ import android.net.IpConfiguration.ProxySettings;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.StaticIpConfiguration; 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.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;