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

Merge "Migrate remaining cts to androidx.test."

Browse Source
This commit is contained in:
Brett Chabot
2019-03-04 06:17:48 +00:00
committed by Gerrit Code Review
parent c4c0bb37cf 44a06a7fbd
commit 40fadc421c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/hostside/app/Android.mk
View File

@@ -21,7 +21,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
#LOCAL_SDK_VERSION := current #LOCAL_SDK_VERSION := current
LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ub-uiautomator \ LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt ctstestrunner-axt ub-uiautomator \
CtsHostsideNetworkTestsAidl CtsHostsideNetworkTestsAidl
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs

2
tests/cts/hostside/app/AndroidManifest.xml
View File

@@ -45,7 +45,7 @@
</application> </application>
<instrumentation <instrumentation
android:name="android.support.test.runner.AndroidJUnitRunner" android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.cts.net.hostside" /> android:targetPackage="com.android.cts.net.hostside" />
</manifest> </manifest>

2
tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java
View File

@@ -128,7 +128,7 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec
protected void runDeviceTests(String packageName, String testClassName, String methodName) protected void runDeviceTests(String packageName, String testClassName, String methodName)
throws DeviceNotAvailableException { throws DeviceNotAvailableException {
RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(packageName, RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(packageName,
"android.support.test.runner.AndroidJUnitRunner", getDevice().getIDevice()); "androidx.test.runner.AndroidJUnitRunner", getDevice().getIDevice());
if (testClassName != null) { if (testClassName != null) {
if (methodName != null) { if (methodName != null) {