From 44a06a7fbd3b124e7c918b66883ca4d74a2b4410 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 1 Mar 2019 13:25:23 -0800 Subject: [PATCH] Migrate remaining cts to androidx.test. See go/jetpack-test-android-migration Exempt-From-Owner-Approval: automated package name refactoring; already reviewed+merged internally Test: m cts Change-Id: I6877435bf0436b8ef1dd252b225eac2908e78b71 Merged-In: I092c369229f8cb4c13827cbad4fd162622ac7849 --- tests/cts/hostside/app/Android.mk | 2 +- tests/cts/hostside/app/AndroidManifest.xml | 2 +- .../src/com/android/cts/net/HostsideNetworkTestCase.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/cts/hostside/app/Android.mk b/tests/cts/hostside/app/Android.mk index 62e0172817..11f6bb1460 100644 --- a/tests/cts/hostside/app/Android.mk +++ b/tests/cts/hostside/app/Android.mk @@ -21,7 +21,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests #LOCAL_SDK_VERSION := current 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 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/tests/cts/hostside/app/AndroidManifest.xml b/tests/cts/hostside/app/AndroidManifest.xml index 2553f475aa..ba0e242ab9 100644 --- a/tests/cts/hostside/app/AndroidManifest.xml +++ b/tests/cts/hostside/app/AndroidManifest.xml @@ -45,7 +45,7 @@ diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java index 7c9ce8f833..a2443b391a 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java @@ -128,7 +128,7 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec protected void runDeviceTests(String packageName, String testClassName, String methodName) throws DeviceNotAvailableException { RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(packageName, - "android.support.test.runner.AndroidJUnitRunner", getDevice().getIDevice()); + "androidx.test.runner.AndroidJUnitRunner", getDevice().getIDevice()); if (testClassName != null) { if (methodName != null) {