diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk index 245fc54eec87443447aeebd54c65d2826b1831fd..3208ee533f7184b097ead701c1a22d27efcc49a7 100644 --- a/apps/CtsVerifier/Android.mk +++ b/apps/CtsVerifier/Android.mk @@ -34,7 +34,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2 \ compatibility-common-util-devicesidelib \ cts-sensors-tests \ cts-location-tests \ - ctstestrunner \ + ctstestrunner-axt \ apache-commons-math \ androidplot \ ctsverifier-opencv \ @@ -42,7 +42,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2 \ androidx.legacy_legacy-support-v4 \ mockito-target-minus-junit4 \ mockwebserver \ - compatibility-device-util \ + compatibility-device-util-axt \ platform-test-annotations \ cts-security-test-support-library @@ -89,7 +89,7 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 \ compatibility-common-util-devicesidelib \ - compatibility-device-util \ + compatibility-device-util-axt \ include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/apps/CtsVerifier/proguard.flags b/apps/CtsVerifier/proguard.flags index e4249c4ef3dd11d16c4c0157b144334f9b25b4ad..1bf1a0b6296645604824497bca0b957df8864099 100644 --- a/apps/CtsVerifier/proguard.flags +++ b/apps/CtsVerifier/proguard.flags @@ -38,6 +38,6 @@ -dontwarn com.android.org.bouncycastle.** -dontwarn com.android.okhttp.** -dontwarn org.opencv.** --dontwarn android.support.test.internal.runner.hidden.ExposedInstrumentationApi +-dontwarn androidx.test.internal.runner.hidden.ExposedInstrumentationApi -dontwarn java.lang.management.** diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/location/base/GnssCtsTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/location/base/GnssCtsTestActivity.java index 20a618c7f4a0b33a489c59433b0caa42b6350d83..e62c21f4de17831ad711b0501119a4aba2f5aab1 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/location/base/GnssCtsTestActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/location/base/GnssCtsTestActivity.java @@ -99,7 +99,7 @@ public class GnssCtsTestActivity extends BaseGnssTestActivity { /** * For reference on the implementation of this test executor see: - * android.support.test.runner.AndroidJUnitRunner + * androidx.test.runner.AndroidJUnitRunner */ @Override protected GnssTestDetails executeTests() { diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/SensorCtsTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/SensorCtsTestActivity.java index 6512fd3baf5d1ecbb3bfb34f27acc8c5f8c38f8e..580ea58b94fa04223ec4f14ce34f84392949984f 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/SensorCtsTestActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/SensorCtsTestActivity.java @@ -17,6 +17,11 @@ package com.android.cts.verifier.sensors.base; +import android.content.Context; +import android.hardware.cts.SensorTestCase; +import android.os.PowerManager; +import android.view.WindowManager; + import com.android.cts.verifier.R; import com.android.cts.verifier.sensors.helpers.SensorTestScreenManipulator; import com.android.cts.verifier.sensors.reporting.SensorTestDetails; @@ -37,11 +42,6 @@ import org.junit.runner.notification.RunListener; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; -import android.content.Context; -import android.hardware.cts.SensorTestCase; -import android.os.PowerManager; -import android.view.WindowManager; - import java.util.concurrent.TimeUnit; /** @@ -109,7 +109,7 @@ public abstract class SensorCtsTestActivity extends BaseSensorTestActivity { /** * For reference on the implementation of this test executor see: - * android.support.test.runner.AndroidJUnitRunner + * androidx.test.runner.AndroidJUnitRunner */ @Override protected SensorTestDetails executeTests() { diff --git a/build/device_info_package.mk b/build/device_info_package.mk index 5cc7cb595650d149e4f990697f226fb3eceeffff..1973ef91f65063cfec4ecb1f4032e7910ab4d197 100644 --- a/build/device_info_package.mk +++ b/build/device_info_package.mk @@ -17,7 +17,7 @@ # DEVICE_INFO_PACKAGE := com.android.compatibility.common.deviceinfo -DEVICE_INFO_INSTRUMENT := android.support.test.runner.AndroidJUnitRunner +DEVICE_INFO_INSTRUMENT := androidx.test.runner.AndroidJUnitRunner DEVICE_INFO_USES_LIBRARY := android.test.runner DEVICE_INFO_PERMISSIONS += \ android.permission.READ_PHONE_STATE \ @@ -49,7 +49,7 @@ DEVICE_INFO_TARGET_SDK := 17 endif # Add the base device info -LOCAL_STATIC_JAVA_LIBRARIES += compatibility-device-info compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES += compatibility-device-info compatibility-device-util-axt # Generator of APK manifests. MANIFEST_GENERATOR_JAR := $(HOST_OUT_JAVA_LIBRARIES)/compatibility-manifest-generator.jar diff --git a/common/device-side/device-info/Android.mk b/common/device-side/device-info/Android.mk index df95d9a9c8fc6859766b77c3e6a88f458ac8eb9e..90836d10104031198b806f3ee420da1cf15fc478 100644 --- a/common/device-side/device-info/Android.mk +++ b/common/device-side/device-info/Android.mk @@ -21,8 +21,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := \ - compatibility-device-util \ - android-support-test \ + compatibility-device-util-axt \ + androidx.test.rules \ junit LOCAL_JAVA_LIBRARIES := \ diff --git a/common/device-side/test-app/Android.mk b/common/device-side/test-app/Android.mk index 6adce974b17c74452be834a5b22f3089bca7475e..b6660e8d69dcc031bc26c093432bb7add7f65876 100755 --- a/common/device-side/test-app/Android.mk +++ b/common/device-side/test-app/Android.mk @@ -31,7 +31,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test\ compatibility-device-info-tests\ compatibility-device-info\ compatibility-device-util-tests\ - compatibility-device-util + compatibility-device-util-axt LOCAL_PACKAGE_NAME := CompatibilityTestApp diff --git a/common/device-side/test-app/AndroidManifest.xml b/common/device-side/test-app/AndroidManifest.xml index 883b4395555f99f8a24a15c5115c682afc6d2548..3aa5dc5a9f5e38cdb303249e26d366630ac90d29 100755 --- a/common/device-side/test-app/AndroidManifest.xml +++ b/common/device-side/test-app/AndroidManifest.xml @@ -27,7 +27,7 @@ - diff --git a/common/device-side/test-app/run_tests.sh b/common/device-side/test-app/run_tests.sh index 56402603fbc87fc0b6d6ca4ff2f516a94d683a1b..e4afd12b5fc859cacd51f4644b1a5f460a1dc20a 100755 --- a/common/device-side/test-app/run_tests.sh +++ b/common/device-side/test-app/run_tests.sh @@ -35,7 +35,7 @@ APK=${ANDROID_PRODUCT_OUT}/data/app/CompatibilityTestApp/CompatibilityTestApp.ap checkFile ${APK} COMMON_PACKAGE=com.android.compatibility.common -RUNNER=android.support.test.runner.AndroidJUnitRunner +RUNNER=androidx.test.runner.AndroidJUnitRunner # TODO [2015-12-09 kalle] Fail & exit on failing install? adb -s ${SERIAL} install -r -g ${APK} build_jar_path ${JAR_DIR} "${JARS}" diff --git a/hostsidetests/abioverride/app/Android.mk b/hostsidetests/abioverride/app/Android.mk index 9dd8d1fc98cfab1558aaa1bbafec80e111f7cc2e..d6016ddde4ae556f4d8eb8e964852d75ebe40ced 100755 --- a/hostsidetests/abioverride/app/Android.mk +++ b/hostsidetests/abioverride/app/Android.mk @@ -28,8 +28,8 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_MULTILIB := both LOCAL_STATIC_JAVA_LIBRARIES := \ - compatibility-device-util \ - ctstestrunner \ + compatibility-device-util-axt \ + ctstestrunner-axt \ LOCAL_JNI_SHARED_LIBRARIES := libctsabioverride diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/KeySetHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/KeySetHostTest.java index 28061f66ea8883ca9cffbcffcb2d5ae54bef93ec..88c82f732f725d3947004b47bf4041248b0a44bf 100644 --- a/hostsidetests/appsecurity/src/android/appsecurity/cts/KeySetHostTest.java +++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/KeySetHostTest.java @@ -17,6 +17,7 @@ package android.appsecurity.cts; import android.platform.test.annotations.AppModeFull; + import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper; import com.android.ddmlib.testrunner.RemoteAndroidTestRunner; import com.android.ddmlib.testrunner.TestResult.TestStatus; @@ -40,7 +41,7 @@ import java.util.Map; @AppModeFull // TODO: Needs porting to instant public class KeySetHostTest extends DeviceTestCase implements IBuildReceiver { - private static final String RUNNER = "android.support.test.runner.AndroidJUnitRunner"; + private static final String RUNNER = "androidx.test.runner.AndroidJUnitRunner"; /* package with device-side tests */ private static final String KEYSET_TEST_PKG = "com.android.cts.keysets.testapp"; diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/Utils.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/Utils.java index f39a537b3e00e5c8fcfc409643fb4c7931a97ede..fda65515a69b8f4e62bf50c24a4c0ca788ff9ec4 100644 --- a/hostsidetests/appsecurity/src/android/appsecurity/cts/Utils.java +++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/Utils.java @@ -77,7 +77,7 @@ public class Utils { testClassName = packageName + testClassName; } RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(packageName, - "android.support.test.runner.AndroidJUnitRunner", device.getIDevice()); + "androidx.test.runner.AndroidJUnitRunner", device.getIDevice()); // timeout_msec is the timeout per test for instrumentation testRunner.addInstrumentationArg("timeout_msec", Long.toString(unit.toMillis(timeout))); if (testClassName != null && testMethodName != null) { diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.mk b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.mk index bfb88f0870fdfcb7566eb59de13febd1dac65bf4..190dd076012fe70e8920cc883b66d13ebb342e23 100644 --- a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.mk +++ b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/AndroidManifest.xml index 6976c56858dd573350f6f3732bd33ccc8b1e3f01..858747441c8f85c1b97e1faa92556fa5faa45dd8 100644 --- a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/AndroidManifest.xml @@ -22,7 +22,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk b/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk index 4bdb346f39a2301ab377d98c91733ac041c76a5a..dd893aadacf30fd66a57c463596675b5fb510b89 100644 --- a/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk +++ b/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk @@ -20,8 +20,8 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - compatibility-device-util \ - android-support-test \ + compatibility-device-util-axt \ + androidx.test.rules \ LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialModern/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/AccessSerialModern/AndroidManifest.xml index 2eb5777e41f292788609433a7a15a8cdc4a983c7..eef7a8fe863a3cb6cd02830ebdbcef82c97e12c1 100644 --- a/hostsidetests/appsecurity/test-apps/AccessSerialModern/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/AccessSerialModern/AndroidManifest.xml @@ -26,7 +26,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialModern/src/android/os/cts/AccessSerialModernTest.java b/hostsidetests/appsecurity/test-apps/AccessSerialModern/src/android/os/cts/AccessSerialModernTest.java index acbb30c76f12dd018e77ccbfb61d593f1679a2b3..47832cf2cafa838b376f84a5a0faec51bbcfea50 100644 --- a/hostsidetests/appsecurity/test-apps/AccessSerialModern/src/android/os/cts/AccessSerialModernTest.java +++ b/hostsidetests/appsecurity/test-apps/AccessSerialModern/src/android/os/cts/AccessSerialModernTest.java @@ -20,7 +20,8 @@ import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import android.os.Build; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import org.junit.Test; diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk index 615492c8c4b25e3a3184a0706f7c789770b6608a..b55656e4e9309f8d5315ef09dac33e12605c5b46 100644 --- a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk +++ b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/AppAccessData/AndroidManifest.xml index 6a846fc37187b4debfbf8d9dd5bceb55c2a35d03..d47b4bdc5e83121850f5897887629d61cd6e6407 100644 --- a/hostsidetests/appsecurity/test-apps/AppAccessData/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/AppAccessData/AndroidManifest.xml @@ -28,7 +28,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk index c71966546b9d43fc9a083d21640aa6ba9b0be709..2966c48055bc9f900029c7374eb90d631f3d8a5f 100644 --- a/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk +++ b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/AppWithData/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/AppWithData/AndroidManifest.xml index 2accec1332f11b3142230c5850006d8493c592d2..cf9d4046c13be60fcf557b3d919003b538ae75d5 100644 --- a/hostsidetests/appsecurity/test-apps/AppWithData/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/AppWithData/AndroidManifest.xml @@ -33,7 +33,7 @@ android:exported="true" /> - diff --git a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.mk b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.mk index 0668860b88ccdaf929941a554d44a216e41736ef..d70de420b7509e71f6a14e998c67cef6689af128 100644 --- a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test + androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/AndroidManifest.xml index d9a1f369f0c676c4a419cc2cdd43dcec1a5eac81..b95ae26f55543b8b4929babefe346e8334067cce 100644 --- a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/AndroidManifest.xml @@ -21,7 +21,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/src/com/android/cts/applicationvisibility/ApplicationVisibilityCrossUserTest.java b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/src/com/android/cts/applicationvisibility/ApplicationVisibilityCrossUserTest.java index 1737817962523f9064a8fcbd935afb9b3b7b5e38..84dfad922ce3e143c1886e26d08e062aacab72b2 100644 --- a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/src/com/android/cts/applicationvisibility/ApplicationVisibilityCrossUserTest.java +++ b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/src/com/android/cts/applicationvisibility/ApplicationVisibilityCrossUserTest.java @@ -15,17 +15,19 @@ */ package com.android.cts.applicationvisibility; +import static android.content.pm.PackageManager.MATCH_KNOWN_PACKAGES; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static android.content.pm.PackageManager.MATCH_KNOWN_PACKAGES; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/Android.mk index 1adf0f85a303dc6ae0589de6bcf8202ad832c5d7..761fce89cde6cc6e577e06ea69f2538f8366f660 100644 --- a/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/Android.mk @@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_EXPORT_PACKAGE_RESOURCES := true -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/AndroidManifest.xml index 05f45732083d99be54a28f16a56d32fcf59066ff..2383f0b2e1a3216b1722f458f341580564946e24 100644 --- a/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/AndroidManifest.xml @@ -36,7 +36,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/src/com/android/cts/classloadersplitapp/SplitAppTest.java b/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/src/com/android/cts/classloadersplitapp/SplitAppTest.java index 54482a877e2dfbd396ea95e06ce973bdcdea29fa..cbe3338dd78b9961b48604e8a97dc3c3f31ca597 100644 --- a/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/src/com/android/cts/classloadersplitapp/SplitAppTest.java +++ b/hostsidetests/appsecurity/test-apps/ClassLoaderSplitApp/src/com/android/cts/classloadersplitapp/SplitAppTest.java @@ -24,12 +24,11 @@ import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.res.Configuration; -import android.content.res.Resources; import android.os.Bundle; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.Rule; import org.junit.Test; @@ -38,7 +37,6 @@ import org.junit.runner.Description; import org.junit.runner.RunWith; import org.junit.runners.model.Statement; -import java.util.Locale; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk index ad50a579666320f7ba832abfd69393bff72a9693..04e18701d2ec2979ceb28368989465f859208c78 100644 --- a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk +++ b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules compatibility-device-util-axt ctstestrunner-axt ub-uiautomator LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/DocumentClient/AndroidManifest.xml index 0064e154624ab3cd9202ed93cd6198b5a2b6c66a..c90a6f68626619c543af9bbb6acd605769eeae67 100644 --- a/hostsidetests/appsecurity/test-apps/DocumentClient/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/DocumentClient/AndroidManifest.xml @@ -21,6 +21,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk index 42aa0740e1f159a14f97f501ec9ca622240ac0e8..a445466686705edbf14f23fda94a8c5ba2c62c00 100644 --- a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk +++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk @@ -21,9 +21,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ - ctstestrunner \ + androidx.test.rules \ + compatibility-device-util-axt \ + ctstestrunner-axt \ ub-uiautomator \ diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk index 973411248ea41ae4678a6c10cd8682f1d8f81405..44aa2426d58e2a01590e1c7488449f5ef06c511a 100644 --- a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules compatibility-device-util-axt ctstestrunner-axt ub-uiautomator LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EncryptionApp/AndroidManifest.xml index da3c9e4727336117290e88d08e9d50107aabc327..12318749dbe8d732f2add1090ec96a8d8b9e1934 100644 --- a/hostsidetests/appsecurity/test-apps/EncryptionApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/AndroidManifest.xml @@ -82,7 +82,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk index 90b7866a9ec06b9f1a9607c0d235af4d76358bed..777bd6516d6363ad0745eecceb2d7d300626186c 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk @@ -21,9 +21,9 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ cts-aia-util \ - android-support-test \ - ctsdeviceutillegacy \ - ctstestrunner + androidx.test.rules \ + ctsdeviceutillegacy-axt \ + ctstestrunner-axt # tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml index 2dc1b023a538c4879ebaca994a33c849f7ba02a9..f966b3dcc7c491410ba58667b17b3a21ed08456e 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml @@ -125,6 +125,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/ClientTest.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/ClientTest.java index 9e231a1aeaf6fe8aece1c5925ca723b6524e86a8..58565eaecfd6481523ab83e0cae34345dc99529f 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/ClientTest.java +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/ClientTest.java @@ -19,9 +19,10 @@ package com.android.cts.ephemeralapp1; import static android.media.AudioFormat.CHANNEL_IN_MONO; import static android.media.AudioFormat.ENCODING_PCM_16BIT; import static android.media.MediaRecorder.AudioSource.MIC; -import static org.hamcrest.CoreMatchers.is; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertSame; @@ -58,19 +59,16 @@ import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; -import android.os.Looper; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.os.VibrationEffect; import android.os.Vibrator; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; -import android.telephony.CellLocation; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; -import com.android.compatibility.common.util.SystemUtil; -import com.android.compatibility.common.util.TestThread; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import com.android.cts.util.TestResult; import org.junit.After; diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk index 78c797065d07e7441c41ec1888017c3b7e73cd72..535d67cab067ff535a07f1a8450d9e8091233940 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk @@ -21,9 +21,9 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ cts-aia-util \ - android-support-test \ - ctsdeviceutillegacy \ - ctstestrunner + androidx.test.rules \ + ctsdeviceutillegacy-axt \ + ctstestrunner-axt # tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml index 0350cc636c8512eafab6cf19e4e860534a995737..4e83c349412c3c580aa7289b65f0dea135f565cb 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml @@ -78,6 +78,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk index 8b04f9b7e38fb541a4a909e330df08e45d7fee2a..85000771069340df858654a27f74903ad12b3256 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ cts-aia-util \ - android-support-test + androidx.test.rules # tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml index f202a0add1b851f5829cfaea7f54b8de92b41064..d9136d5e58f31faee616f8e28226f7381210fca1 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml @@ -38,6 +38,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk index d2c3667011dc11cbeec05a709d87bd7bfab478d8..3e41c1b802b79eec0f58219b15dc9d761ec4a08f 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ cts-aia-util \ - android-support-test + androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml index 51b570049af79a6de8649b86073ee74123ce21b3..e577260d9ef3638a38f2a76ab66503be83326fd9 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml @@ -132,6 +132,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ClientTest.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ClientTest.java index 48a1b5d1da272f686417ba31325dcf8aabc497d2..3a99f3254d7f933ba4dd855a8424304674b2b97a 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ClientTest.java +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ClientTest.java @@ -34,8 +34,9 @@ import android.content.pm.ResolveInfo; import android.database.Cursor; import android.net.Uri; import android.provider.Settings.Secure; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import com.android.cts.util.TestResult; diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk index 7ceaff3408efc1e43e563fc2c46e90cbccdcd76e..d8e92348ad56f1c3cc55451b30b763627d6a61ac 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules # tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/AndroidManifest.xml index 39c698171b0af38c4af8833bf517ec094c679519..1820eb0fb5802322420f6deedcbb10739dbacde7 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/AndroidManifest.xml @@ -25,6 +25,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk index 28560d3f8e5f24cd13b2666711f27a36c94bd99a..6d58891ae459033f5e90622fe5588da265212d36 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ cts-aia-util \ - android-support-test + androidx.test.rules # tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml index fbacf95335dfd68e549812d9d6b151925949df1b..941c4b060c93993d2f684c9a2b9b6c6c4bcad03d 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml @@ -34,6 +34,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk index 64f02cb48c2eaab7e74dc120dab898be81462558..afb016ca4b5a5bd732317b95ecb3ae55de1b2609 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test + androidx.test.rules # tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/AndroidManifest.xml index 0e59a1df7acd2034aa773aa54eb0dd59154d1ba8..09bac4cbdd395a64328a4a2bf5f7a3bd66825584 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/AndroidManifest.xml @@ -27,6 +27,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/src/com/android/cts/userapptest/ClientTest.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/src/com/android/cts/userapptest/ClientTest.java index ed038ee2fbbffff250a061f6b1a23f71a630a30d..86ecafa8884bed4fd8ac97d3083effa4090fe1b2 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/src/com/android/cts/userapptest/ClientTest.java +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/src/com/android/cts/userapptest/ClientTest.java @@ -22,8 +22,9 @@ import static org.junit.Assert.fail; import android.content.Intent; import android.content.pm.ResolveInfo; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk index 5945188edabb4dda97d113f7c9ffb5f166ecd64b..c82648c3b44018ca18d222096950764ad4550d15 100644 --- a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/AndroidManifest.xml index 198bb399e2dd28d7922fc5a11514d3930d969b88..1ac279047699dc2930041955505034fed4319a9c 100644 --- a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/AndroidManifest.xml @@ -32,7 +32,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/src/com/android/cts/escalatepermission/PermissionEscalationTest.java b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/src/com/android/cts/escalatepermission/PermissionEscalationTest.java index bbe8e026627fc5fb1a7b3bef626b413cc4329c6e..cfccc7872960b230881211caf6ea384cdc6dbf77 100644 --- a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/src/com/android/cts/escalatepermission/PermissionEscalationTest.java +++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/src/com/android/cts/escalatepermission/PermissionEscalationTest.java @@ -16,17 +16,19 @@ package com.android.cts.escalatepermission; +import static org.junit.Assert.assertSame; + import android.content.Context; import android.content.pm.PermissionInfo; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; -import org.junit.Test; -import org.junit.runner.RunWith; -import static org.junit.Assert.assertSame; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import com.android.cts.escalate.permission.Manifest; +import org.junit.Test; +import org.junit.runner.RunWith; + @RunWith(AndroidJUnit4.class) public class PermissionEscalationTest { @Test diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk index 2fcbc208da07384baba0febd795d3e0b28ee5391..0b232fbd906d36d0f16bfc203819c99390fb3097 100644 --- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/AndroidManifest.xml index 958ff61b0e017146acc82231b99ca8247fb45759..37d423fc60048200b8022769fb917e32ad849742 100644 --- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/AndroidManifest.xml @@ -20,7 +20,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk index 78eb61920d64e08c8e0ef7b9f7e0be073bf9e9e7..b113f8f76df49399f4b82d40597c5b3d8e05c8d7 100644 --- a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsInstantCookieApp LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/InstantCookieApp/AndroidManifest.xml index 31f653d62edfe6b3f4da5de2d994bdd6a198c091..d9b20c16c870877bacd5e9dc284456a6f1f8fd3f 100644 --- a/hostsidetests/appsecurity/test-apps/InstantCookieApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/AndroidManifest.xml @@ -23,7 +23,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/src/test/instant/cookie/CookieTest.java b/hostsidetests/appsecurity/test-apps/InstantCookieApp/src/test/instant/cookie/CookieTest.java index 774296bb53346f73da2cb8a1d87c3bf12fb0173d..ec41bf3b1e535f3f62f8e3709071b330b75d8bf5 100644 --- a/hostsidetests/appsecurity/test-apps/InstantCookieApp/src/test/instant/cookie/CookieTest.java +++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/src/test/instant/cookie/CookieTest.java @@ -16,17 +16,19 @@ package test.instant.cookie; -import android.content.pm.PackageManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; -import org.junit.Test; -import org.junit.runner.RunWith; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import android.content.pm.PackageManager; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + @RunWith(AndroidJUnit4.class) public class CookieTest { @Test diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.mk b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.mk index 638512342653b5f6674085d1e1bce541f440005e..7c1d709509be77170f27ac47717f9b9716a3540f 100644 --- a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.mk +++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsInstantCookieApp2 LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/AndroidManifest.xml index 31f653d62edfe6b3f4da5de2d994bdd6a198c091..d9b20c16c870877bacd5e9dc284456a6f1f8fd3f 100644 --- a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/AndroidManifest.xml @@ -23,7 +23,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/src/test/instant/cookie/CookieTest.java b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/src/test/instant/cookie/CookieTest.java index da1492faf209680079f3b82fda8461b8940cc275..c4366822e0fed96e3be01aabc5de5cd24d9032b0 100644 --- a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/src/test/instant/cookie/CookieTest.java +++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/src/test/instant/cookie/CookieTest.java @@ -16,17 +16,16 @@ package test.instant.cookie; +import static org.junit.Assert.assertEquals; + import android.content.pm.PackageManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - @RunWith(AndroidJUnit4.class) public class CookieTest { @Test diff --git a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.mk b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.mk index e0bc1cf96fcb8939ea371e23cdc590b86ac70581..be0752adab6c9654367bedca31cf1c9bf5ff0047 100644 --- a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.mk @@ -21,9 +21,9 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ cts-aia-util \ - android-support-test \ - ctsdeviceutillegacy \ - ctstestrunner + androidx.test.rules \ + ctsdeviceutillegacy-axt \ + ctstestrunner-axt # tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/AndroidManifest.xml index d068af5bf16bb9dd2001a410d1319624b5dd523d..c57c2a7f908948124396e31ed66cec7c489dad6f 100644 --- a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/AndroidManifest.xml @@ -28,6 +28,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/src/com/android/cts/instantupgradeapp/ClientTest.java b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/src/com/android/cts/instantupgradeapp/ClientTest.java index 473f4b9ca650480fb319690efce300b21f3eb7cd..b9eff1aacfdef9a95bc83fd92e9c8c1770831c3e 100644 --- a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/src/com/android/cts/instantupgradeapp/ClientTest.java +++ b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/src/com/android/cts/instantupgradeapp/ClientTest.java @@ -17,28 +17,21 @@ package com.android.cts.instantupgradeapp; import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import android.app.Activity; import android.content.Context; -import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.ResolveInfo; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; -import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.util.List; @RunWith(AndroidJUnit4.class) public class ClientTest { diff --git a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk index b99597b30c33111280da60e16e66c3199fb92215..a977416d125290aef8b07dbafe7638bcc9a1f6c2 100644 --- a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk +++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/AndroidManifest.xml index a958c4c9103b6ed19213f8af7fcc5496b0bc5e4d..49c10dafc64b64b85d43c4063e558344f28e29f0 100644 --- a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/AndroidManifest.xml @@ -34,7 +34,7 @@ A self-instrumenting test runner, that will try to start the above instrumentation and verify it fails. --> - diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk index 3231710fadebe7606937a17c84bbbc86cf9309c3..8373d9ecfcbc54aceb7939b3820ff39e65b2aa97 100644 --- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk @@ -30,7 +30,7 @@ LOCAL_EXPORT_PACKAGE_RESOURCES := true # Make sure our test locale polish is not stripped. LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) # Generate a locale split. diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml index 2f3a37455762f9911dfcd963216a55f72680a95d..50c1a4dc17fb6b0e2b476b917637c317faef294b 100644 --- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml @@ -39,7 +39,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/SplitAppTest.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/SplitAppTest.java index b85e21bb647cf172ad8d7a6c9e0c2c7c5ac3e279..300f9783533b1ed8a6c937c42970b82af8d219c3 100644 --- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/SplitAppTest.java +++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/SplitAppTest.java @@ -27,9 +27,10 @@ import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.Rule; import org.junit.Test; diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.mk b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.mk index db83bb0bab975b73a0b026ba4f537fc443ca6736..a0646965b8e446688a974e7e7ef7b1914da74499 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.mk +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, ../src-common) $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/AndroidManifest.xml index 2a63cd749e50c79a2887b309b7584b60aff2d032..7469dfa21afc102e19db1c199db8b9cb78bc0559 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/AndroidManifest.xml @@ -20,7 +20,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.mk b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.mk index dd32f5916e3e4c4c3e9d1f4d2cc1bc98ddb3d22b..b5e5ceb3b11c72bb685253e3150e4d574f503899 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.mk +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, ../src-common) $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/AndroidManifest.xml index 934deecd3616f8def75eb535cd45c505831f77f2..ab9fc9e200dddc4ee4ac06618f16345cfca61dd4 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/AndroidManifest.xml @@ -20,7 +20,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.mk b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.mk index d534b7b5d8608c750cfe862e3c2815a25a230a12..d6117a94b7bb68fe9c6577174ee684dbd67ce398 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.mk +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, ../src-common) $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/AndroidManifest.xml index c7b9dd0731003b1f9fc2f9b9d7ba07c7f9c89e23..1cafa920d9599fddba3e4f8c1367e626a58054b5 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/AndroidManifest.xml @@ -20,7 +20,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.mk b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.mk index 72c99146c4b2b18baa104b70dabb2667a4528a10..0f80843435ccc4423827b314c120c40b427b39f3 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.mk +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, ../src-common) $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/AndroidManifest.xml index 91d4e39af3c87603d77dd778c9bbb608541f8789..24a6d63f1f02558df2a379709c365a59ff949714 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/AndroidManifest.xml @@ -20,7 +20,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/src-common/com/android/cts/majorversion/VersionTest.java b/hostsidetests/appsecurity/test-apps/MajorVersionApp/src-common/com/android/cts/majorversion/VersionTest.java index e69e14b2b71d08c46c8d17a085f80ad0386e3e8c..921a724dda9bc2c88789c809d1a0c0e57555d2fd 100644 --- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/src-common/com/android/cts/majorversion/VersionTest.java +++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/src-common/com/android/cts/majorversion/VersionTest.java @@ -16,18 +16,17 @@ package com.android.cts.majorversion; +import static org.junit.Assert.assertEquals; + import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - @RunWith(AndroidJUnit4.class) public class VersionTest { @Test diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk index e08ac6fdc7aaef501cde2e373125fb4ff2778f34..a5807f08dbb9de5216982bab11620eced766a4a2 100644 --- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/AndroidManifest.xml index 8b599f23c22e4cce1dc56375e86dbba81fb0fe74..cb7cf5cbd9868085c357eca583a0d2932bbe19e5 100644 --- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/AndroidManifest.xml @@ -20,7 +20,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.mk b/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.mk index 656f54a9a6b43f49e81c674ba974a355927f8bad..1797c7532c07041cffc80bd9c56d373d290b5b19 100644 --- a/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsNoRestartBase LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/NoRestartApp/AndroidManifest.xml index a8aa04237eb04bf5eb992a601ff18d161fd77aed..0d2ded5f71e06984e22ae49ad31d81ba9bd293cf 100644 --- a/hostsidetests/appsecurity/test-apps/NoRestartApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/AndroidManifest.xml @@ -39,7 +39,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/src/com/android/cts/norestart/NoRestartTest.java b/hostsidetests/appsecurity/test-apps/NoRestartApp/src/com/android/cts/norestart/NoRestartTest.java index 7c9dc2cda0f0c89dbfc93104be1afe490837d321..3582ed73c918800853a79100ec6d95c374841d11 100644 --- a/hostsidetests/appsecurity/test-apps/NoRestartApp/src/com/android/cts/norestart/NoRestartTest.java +++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/src/com/android/cts/norestart/NoRestartTest.java @@ -17,8 +17,9 @@ package com.android.cts.norestart; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.mk b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.mk index 67fe9f4878bcaebc457aaa1714e8afb3092e8959..9784c608f7395fd3e47cbbeb82c02f5fc6f78f5a 100644 --- a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules # tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/AndroidManifest.xml index 383f00017b2d1055ed6a5d1d9f954a5d2231c7b6..faefff2ac7b312477237d70de75204fc71d8f2b7 100644 --- a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/AndroidManifest.xml @@ -130,6 +130,6 @@ - diff --git a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/src/android/appsecurity/cts/orderedactivity/PackageResolutionTest.java b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/src/android/appsecurity/cts/orderedactivity/PackageResolutionTest.java index e7ff989d357292c7b3205046d49c25571bf21054..6ce3fa24d7e52bf7e78151543670389954d569c6 100644 --- a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/src/android/appsecurity/cts/orderedactivity/PackageResolutionTest.java +++ b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/src/android/appsecurity/cts/orderedactivity/PackageResolutionTest.java @@ -16,18 +16,16 @@ package android.appsecurity.cts.orderedactivity; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import android.app.Activity; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; -import android.os.Bundle; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk index dfa703aa29c383023feedc0edfb7817b72cf1788..e2f9e1279278a46e147fad12368e7d3b62241702 100644 --- a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ ub-uiautomator LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/PackageAccessApp/AndroidManifest.xml index 8558b73907f8501fe04ca01c55d0070460c46f36..0e416d9e43e1b41fa811cd6dcea495f789b34d81 100644 --- a/hostsidetests/appsecurity/test-apps/PackageAccessApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/AndroidManifest.xml @@ -20,7 +20,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/src/com/android/cts/packageaccessapp/PackageAccessTest.java b/hostsidetests/appsecurity/test-apps/PackageAccessApp/src/com/android/cts/packageaccessapp/PackageAccessTest.java index ad6480611993ae88a95d30fe50d6341c0230839f..dc33ee343b509fcfb5549cbce455cb24c9139723 100644 --- a/hostsidetests/appsecurity/test-apps/PackageAccessApp/src/com/android/cts/packageaccessapp/PackageAccessTest.java +++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/src/com/android/cts/packageaccessapp/PackageAccessTest.java @@ -15,8 +15,6 @@ */ package com.android.cts.packageaccessapp; -import static junit.framework.Assert.assertFalse; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; @@ -24,12 +22,12 @@ import static org.junit.Assert.fail; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.UiDevice; +import androidx.test.InstrumentationRegistry; + import org.junit.Before; import org.junit.Test; -import org.junit.internal.runners.statements.Fail; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk index 184b73fc07c281e098aab59f16edcfa10bbf5644..8521093ea980ebd649b24dcc440e1314e84a3dc9 100644 --- a/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsPermissionDeclareApp diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.mk b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.mk index a5c227aada885d6dbd5bb1e915034907648ce662..5f48099f89f1bb39fa5fe4b6301b59a58cb188f8 100644 --- a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := 16 -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsPermissionDeclareAppCompat diff --git a/hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.mk b/hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.mk index a8d659b2cc755fdf918c4b9d4b1283ccc560327f..d93dc250fb11699ddb284c8e7702c8d3c6c69674 100644 --- a/hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.mk @@ -21,9 +21,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ - ctstestrunner \ + androidx.test.rules \ + compatibility-device-util-axt \ + ctstestrunner-axt \ LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/appsecurity/test-apps/PermissionPolicy25/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/PermissionPolicy25/AndroidManifest.xml index 10484fb5b618bbbe2df99d53dc2f221f57ee7b53..5733f893a61faa162d3718e7b793ae982d2a0733 100644 --- a/hostsidetests/appsecurity/test-apps/PermissionPolicy25/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/PermissionPolicy25/AndroidManifest.xml @@ -24,7 +24,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/PermissionPolicy25/src/com/android/cts/permission/policy/PermissionPolicyTest25.java b/hostsidetests/appsecurity/test-apps/PermissionPolicy25/src/com/android/cts/permission/policy/PermissionPolicyTest25.java index 2db1f4196bfd81566a4aae4c2891695981f02786..d9dde12c695b1196c824c0a4abc2feaf2a821002 100644 --- a/hostsidetests/appsecurity/test-apps/PermissionPolicy25/src/com/android/cts/permission/policy/PermissionPolicyTest25.java +++ b/hostsidetests/appsecurity/test-apps/PermissionPolicy25/src/com/android/cts/permission/policy/PermissionPolicyTest25.java @@ -22,7 +22,9 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PermissionInfo; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; + import org.junit.Test; /** diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk index d998a77b5a38bacb9da3910b5f2913b46b1be34b..4c8dcd52797c81bf900f3ae6593f0078ac60b400 100644 --- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk @@ -23,7 +23,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules compatibility-device-util-axt ctstestrunner-axt LOCAL_JAVA_LIBRARIES := android.test.base.stubs # Tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/AndroidManifest.xml index 58f34b9051de43b7c1f3dc245ac188151f339976..95169b6f9a132180c80231cf5f7ab01397778d7c 100644 --- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/AndroidManifest.xml @@ -23,7 +23,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk index 51699ddd82049e02af572730cbc78fad5975b6f3..1ecc5a40bd4823aa451868ad8b7e06584e0480d5 100644 --- a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/AndroidManifest.xml index 03884c903b5115c9519df964040d1760dffae51b..4713beb63f293ae2c80638c8baca24e0038507de 100644 --- a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/AndroidManifest.xml @@ -20,7 +20,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk index 22464bdc3c508f310188db0162aa2efba38dbb8c..331dc2eaa6b6b507a07f62aa07cf5aea4699f714 100644 --- a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsSharedUidInstall diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk index a73d0fc4051b054eb70d554f456281172a4c0dff..9dc335e2b951e16d7992b1ca9702349ab94d75cc 100644 --- a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsSharedUidInstallDiffCert diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk index 7180a10256770182cd28f4b2d5ec93755efd2b35..13a0b6332a4e3415773ad54a90c756cc2c62ade5 100644 --- a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsSimpleAppInstall diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk index bcd8a4e10e0deb01e5423078ea89d8a78791ad74..21e83c2c8160c9a9c2da7dfd959603c9203554b0 100644 --- a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsSimpleAppInstallDiffCert diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk index c63bcb6f5d474540743da1d0858cda6c2a6b958a..0e77a2dbd97e253922145141143eb5901c622840 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk @@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs @@ -52,7 +52,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs @@ -83,7 +83,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs @@ -113,7 +113,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml index f56398eca2864e21e6ce4ffbf50910724ff8cf3b..cb01d2b6c3eda46be3325fe1fc0c30800c10b293 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml @@ -53,7 +53,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/revision/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/revision/AndroidManifest.xml index a17d4706944c7c485cca8c5b208364b01b70cb35..d2bd1da1e82ef759a4e278566f1f6121d77d5b13 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/revision/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/SplitApp/revision/AndroidManifest.xml @@ -39,7 +39,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk b/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk index ebbc892189f4b2e03099f4f4cfd9a0a336fdb1cc..f2b711750efb396e55e52b9c11f3a42852b04dad 100644 --- a/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk +++ b/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := test_current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/StorageAppA/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/StorageAppA/AndroidManifest.xml index 688bb9d47afc0fa6a28423966b7da26f21b39f38..bb5054ef41519da871f93e923c88dd8810e55985 100644 --- a/hostsidetests/appsecurity/test-apps/StorageAppA/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/StorageAppA/AndroidManifest.xml @@ -25,7 +25,7 @@ android:exported="true" /> - diff --git a/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk b/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk index 3a5462e025028b892e315d70c5b2388cb07939cc..76bfce6776131a3d3b7da5e2355d191bd3078271 100644 --- a/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk +++ b/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := test_current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/StorageAppB/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/StorageAppB/AndroidManifest.xml index 2e7739c4ef52d1d12fbb2230ccfa121e6774bb4c..aa09a249a6144efcd2c5258be571fc468035369c 100644 --- a/hostsidetests/appsecurity/test-apps/StorageAppB/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/StorageAppB/AndroidManifest.xml @@ -25,7 +25,7 @@ android:exported="true" /> - diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk index 16d78d71556e50f24559660afc58f49e7f2b09df..2e9f00e21635ca8d7690c1f89dd702d750dd7b4a 100644 --- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := test_current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules ub-uiautomator LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/StorageStatsApp/AndroidManifest.xml index 0c4d9d206406df15934f28a0ca0a3351f98f39c0..371e436169f9b34b41df9a7e41c2a5c59058e592 100644 --- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/AndroidManifest.xml @@ -20,7 +20,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk index fea0878f862453102b6ba42269ec7305e1ac7265..49bb31a4f24db076c7bb5c26adc858170f5ac2c4 100644 --- a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsTargetInstrumentationApp diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk index 7a62f09a64525adc420f92f6acdea4b7b89aa27d..f7386a38f3577fc0e3809eaa243ee831e7f6f83c 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk @@ -20,9 +20,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ - ctstestrunner \ + androidx.test.rules \ + compatibility-device-util-axt \ + ctstestrunner-axt \ ub-uiautomator LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/AndroidManifest.xml index ebb0cbfa1a84f7c112964440f143ca966ed05c5d..1424c7c6dbd19e80acd055222c170f3e7a69ae0c 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/AndroidManifest.xml @@ -71,7 +71,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk index 58ee1c7987a4e609492c5aac0dc1175133d2cafd..7380ad1004b2646132934dcef20001b0ff7b7803 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk @@ -20,9 +20,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ - ctstestrunner \ + androidx.test.rules \ + compatibility-device-util-axt \ + ctstestrunner-axt \ ub-uiautomator LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/AndroidManifest.xml index 9d258264b57a058c83dd5cfac3c728e3683198dc..fc9feddefd59966d8f473e5c0760ae9d5fa770f2 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/AndroidManifest.xml @@ -72,7 +72,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java index c26cabaffb63ff0def67435845c8685a65fe7120..62a05c8c14b81ba0c192f1a8bcc8e93fc40ef9ee 100755 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java @@ -17,6 +17,7 @@ package com.android.cts.usepermission; import static junit.framework.Assert.assertEquals; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @@ -31,8 +32,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.SystemClock; import android.provider.Settings; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject; @@ -47,13 +46,19 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import android.widget.ScrollView; import android.widget.Switch; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + +import junit.framework.Assert; + +import org.junit.Before; +import org.junit.runner.RunWith; + import java.util.List; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; -import junit.framework.Assert; -import org.junit.Before; -import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public abstract class BasePermissionsTest { diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk index 8528752f2df3af780eceae666d8a2193a2eda85b..94d3c0a4fa251a06b0292526a8fe4737c719a485 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk @@ -20,9 +20,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ - ctstestrunner \ + androidx.test.rules \ + compatibility-device-util-axt \ + ctstestrunner-axt \ ub-uiautomator LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp25/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/UsePermissionApp25/AndroidManifest.xml index c6a6316f147a2e2c405b5b8abd6b665dcac61059..2a844e503eea56371898806f9f1f2d7f69cf34be 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp25/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp25/AndroidManifest.xml @@ -73,7 +73,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk index 52c8ba4fd9995a95769d884fde579ce073358a07..0796d45957b36c43110ac28a00780b65a36f5752 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk @@ -20,9 +20,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ - ctstestrunner \ + androidx.test.rules \ + compatibility-device-util-axt \ + ctstestrunner-axt \ ub-uiautomator LOCAL_SRC_FILES := $(call all-java-files-under, src) \ diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp26/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/UsePermissionApp26/AndroidManifest.xml index 9458db304ee8dd6d57414f4e0da049e72f14234c..863946401eb1d5809fcc4923f01a9fdac6ed730b 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp26/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp26/AndroidManifest.xml @@ -30,7 +30,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk index 62a15e42496889584d0aa90464ff174438439780..b084ce7fe77cb67ae282f1aee539ef08f9d143ab 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk @@ -20,9 +20,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ - ctstestrunner \ + androidx.test.rules \ + compatibility-device-util-axt \ + ctstestrunner-axt \ ub-uiautomator LOCAL_SRC_FILES := $(call all-java-files-under, ../UsePermissionApp26/src) \ diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/AndroidManifest.xml index 57a58abad9e2cb2d24af3a6680dd315b01ef04e3..0b8f9af154d97ded0c57b9fc28c1945097ea86be 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/AndroidManifest.xml @@ -29,7 +29,7 @@ diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk index 93d8ddd5ed873b4c12959c95f0796182b4f8c996..9233605339f816b4a74899ba86b65afc4280d026 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk @@ -22,7 +22,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ ../PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/UtilsProvider.java LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/AndroidManifest.xml index 7acf98fb6f8ae5393eabe51113dad8d54fc0fef7..e587e094303bf8882c598f7141455db4123b0ce9 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/AndroidManifest.xml @@ -38,5 +38,5 @@ + android:name="androidx.test.runner.AndroidJUnitRunner"/> diff --git a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk index df12f82619b87c39c43668d5966e2273e62f536d..f3d3d3121584ca8e56ac6d49838a0ee4b8bb60c3 100644 --- a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules compatibility-device-util-axt ctstestrunner-axt ub-uiautomator LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/AndroidManifest.xml index 4557af0d846132ebb1450565991fcabdcc7344dd..4b37d082cbd52ae76314b55833f82f46f43b6941 100644 --- a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/AndroidManifest.xml @@ -21,6 +21,6 @@ diff --git a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.mk b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.mk index 235a95534d43ab7c084067d458c0969be6cdaf66..356f296a21153bb9c77d54612754d36342817f7f 100644 --- a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.mk +++ b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs LOCAL_PACKAGE_NAME := CtsV3SigningSchemeRotationTest LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/AndroidManifest.xml index 677757f83240404ed36c6668e3b844a7d43430b4..0afffcddef6f0f6540c6c6415f444557c7569c1c 100644 --- a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/AndroidManifest.xml @@ -21,5 +21,5 @@ + android:name="androidx.test.runner.AndroidJUnitRunner" /> diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk index b1e84cb15b9e5642d1c367565419c995663bc624..9adb60b44113993a12aeb7aec36b559a33ad5772 100644 --- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk @@ -19,8 +19,8 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util + androidx.test.rules \ + compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/AndroidManifest.xml index 37e39e95e95c21a2d253c6ff173efd16d88a9a27..47fb8c10cc6900b84e70669317231a88699a7f7e 100644 --- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/AndroidManifest.xml @@ -20,7 +20,7 @@ - diff --git a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.mk index 46a6b37567c57d09e6e86290cf5ea510ab984f8e..8e05b6305e592cba4487a589a18ff91d07dfb74c 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningABadUpgradeB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.mk index 9018fdbe23ba527ec62dad53c3cb2d1d75a62132..a5db503cf4727dce1fcea358f51023c341ca38f2 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningANoDefUpgradeB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.mk index 98a31b9b970c9e0005059596deab54ead8a5d3c1..4e4ee5c7707b0f17a16d922343941860e83e8a29 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningCBadAUpgradeAB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-c LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.mk index 5cf21b45bdb4809d2b12a8d85fd48f939f6d710f..76ca560e423d8715b3b7173c0a44d6805c8f72c0 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetPermDefSigningA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false @@ -33,7 +33,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetPermDefSigningB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.mk index 10c4101765c3b8aa3b3552640dac40847f9d3b50..19dba6126325eef390800c2058c3feb76af14ea9 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetPermUseSigningA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false @@ -34,7 +34,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetPermUseSigningB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk index 619f1ce41e28d880b8b995ce4b67eb42d97f37be..fe22777d5715ef01e5f80854abd6230c6ae2d34b 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs LOCAL_PACKAGE_NAME := CtsKeySetTestApp LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/testApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/keysets/testApp/AndroidManifest.xml index 38edf5f03a8090b62860de1fc8e4fc3360c1ec74..e4f6567cb56a902dae304a66be597790487e44b1 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/testApp/AndroidManifest.xml +++ b/hostsidetests/appsecurity/test-apps/keysets/testApp/AndroidManifest.xml @@ -21,5 +21,5 @@ + android:name="androidx.test.runner.AndroidJUnitRunner" /> diff --git a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.mk index d47f6bcab80e36294ed5fefb50e94fb645df577c..cb08b44eb58bd538853a5bfcc9a6afe2555d214f 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningAUpgradeA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false @@ -31,7 +31,7 @@ include $(BUILD_CTS_SUPPORT_PACKAGE) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningBUpgradeA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b LOCAL_DEX_PREOPT := false @@ -44,7 +44,7 @@ include $(BUILD_CTS_SUPPORT_PACKAGE) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningEcAUpgradeA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-ec-a LOCAL_DEX_PREOPT := false @@ -57,7 +57,7 @@ include $(BUILD_CTS_SUPPORT_PACKAGE) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningAAndBUpgradeA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_ADDITIONAL_CERTIFICATES := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.mk index 87655dd90c5417f2505834691f145321ee1fe0d5..3dd47470bcf0642d3b7544224ff1aa7e18016bd4 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningAUpgradeAAndB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.mk index 764886af40cc6f3e9f31c84c8077682aebb10822..7598c5bd379a7af3c6ff1afdfaf0238f95f8b1c7 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningAUpgradeAOrB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.mk index d0960c4ed03273e1af7881818e506d64bd335672..82efc2c1d05b84483c03df3e10ba25ecb4e4d536 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningAUpgradeB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false @@ -34,7 +34,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningBUpgradeB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b LOCAL_DEX_PREOPT := false @@ -49,7 +49,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningAAndCUpgradeB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_ADDITIONAL_CERTIFICATES := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-c diff --git a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.mk index c6cec137358caf8206895456acfe523022cdd956..c65637f524ec7e8d14a3b609b1f7771b2b842693 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSharedUserSigningAUpgradeB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false @@ -34,7 +34,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSharedUserSigningBUpgradeB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.mk index e7de0193fa1e8df4c0543c02d75e2a5c59198537..e7c9b6d616510d5621effcce3f3b48602c4dd08c 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningAUpgradeEcA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.mk index d54a59b01c24479da125ea546eccc7fbecd87daf..e6c830be95bc98ade6f15e198c3d8e904e5968ca 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.mk @@ -22,7 +22,7 @@ LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsKeySetSigningAUpgradeNone LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/atrace/AtraceTestApp/Android.mk b/hostsidetests/atrace/AtraceTestApp/Android.mk index 4b550db944184d93f5a7445268cf2dc7a09e4b95..33e077313619dbf18bdce4ce00f2e35b15f0ef0e 100644 --- a/hostsidetests/atrace/AtraceTestApp/Android.mk +++ b/hostsidetests/atrace/AtraceTestApp/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsAtraceTestApp diff --git a/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.mk b/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.mk index aa9a22c7ab737d189fe615fa2e2fda359a0f63fd..bcdb256ac554e834375f92d3e4ebb429dcba1968 100644 --- a/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.mk +++ b/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, ../src) diff --git a/hostsidetests/backup/AllowBackup/BackupAllowedApp/AndroidManifest.xml b/hostsidetests/backup/AllowBackup/BackupAllowedApp/AndroidManifest.xml index d4de01d007c4c633144785f7e4d3429aee53b044..c79b87ca8cc6f999d205e2153e3e449b036bde52 100644 --- a/hostsidetests/backup/AllowBackup/BackupAllowedApp/AndroidManifest.xml +++ b/hostsidetests/backup/AllowBackup/BackupAllowedApp/AndroidManifest.xml @@ -23,7 +23,7 @@ diff --git a/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.mk b/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.mk index c218a287762fca6d5b492950b8a5cf246650c720..a2a040cc01411e64e4ccef5af77e471cdbced620 100644 --- a/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.mk +++ b/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, ../src) diff --git a/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/AndroidManifest.xml b/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/AndroidManifest.xml index 5fc71a14f9f5dcae8bf852788c775330438591ac..57efe7cd6916e2edb24499e4d54e89ccd4342646 100644 --- a/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/AndroidManifest.xml +++ b/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/AndroidManifest.xml @@ -24,7 +24,7 @@ diff --git a/hostsidetests/backup/AllowBackup/src/AllowBackupTest.java b/hostsidetests/backup/AllowBackup/src/AllowBackupTest.java index 643b594b180539c322ed9e45830c3b3e04f20230..f0c34d581ca2c6d62582b3a4b15fa9ec86028496 100644 --- a/hostsidetests/backup/AllowBackup/src/AllowBackupTest.java +++ b/hostsidetests/backup/AllowBackup/src/AllowBackupTest.java @@ -16,15 +16,16 @@ package android.cts.backup.backupnotallowedapp; -import static android.support.test.InstrumentationRegistry.getTargetContext; +import static androidx.test.InstrumentationRegistry.getTargetContext; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.content.Context; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.mk b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.mk index 6155ffb3d04e7f201630af6850ad3c108f4a869e..b2ec23d6671a39e95f8463eb553ba9d88ba51b8d 100644 --- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.mk +++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, ../src) diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/AndroidManifest.xml b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/AndroidManifest.xml index c00671f8a93687048b56dffdacdd1c07f648c2fb..b4b1caefc998ffb5c56c807218c88f0991717be5 100644 --- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/AndroidManifest.xml +++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/AndroidManifest.xml @@ -25,7 +25,7 @@ diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.mk b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.mk index 62b9860fce1b5d989b334a6ec6351031bac6132e..eaeafe85154ec07da5822bc34a5866945a5b2a3f 100644 --- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.mk +++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, ../src) diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/AndroidManifest.xml b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/AndroidManifest.xml index 03555d4c6eb5515f9fa4649267e950cfa38b9f9e..d00a984b36575da45562931a6aa6d7d813914edb 100644 --- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/AndroidManifest.xml +++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/AndroidManifest.xml @@ -26,7 +26,7 @@ diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.mk b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.mk index 8257ea7073166e07a584786153fad91fcb2a3235..89d16e88707773b13e2cab725603e6ba988de6a8 100644 --- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.mk +++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, ../src) diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/AndroidManifest.xml b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/AndroidManifest.xml index 9b9059237a9a63428a7efeebb6f9b89be7dbc148..04d3a3f721527d244f47ba5bb3619e226cd75011 100644 --- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/AndroidManifest.xml +++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/AndroidManifest.xml @@ -27,7 +27,7 @@ diff --git a/hostsidetests/backup/FullBackupOnly/src/FullBackupOnlyTest.java b/hostsidetests/backup/FullBackupOnly/src/FullBackupOnlyTest.java index 17a7e2c07c984cb41a586f1c6c096078849433c3..bafd87fff1a4347311d365a0e1f04b7ddcd04cfe 100644 --- a/hostsidetests/backup/FullBackupOnly/src/FullBackupOnlyTest.java +++ b/hostsidetests/backup/FullBackupOnly/src/FullBackupOnlyTest.java @@ -16,15 +16,16 @@ package android.cts.backup.fullbackuponlyapp; -import static android.support.test.InstrumentationRegistry.getTargetContext; +import static androidx.test.InstrumentationRegistry.getTargetContext; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.content.Context; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/backup/KeyValueApp/Android.mk b/hostsidetests/backup/KeyValueApp/Android.mk index d03f85fe837425de08bd92d4d8118fb8c6a23d00..7671dcf662a1fc830a8ed9d17c453f10febafaa9 100644 --- a/hostsidetests/backup/KeyValueApp/Android.mk +++ b/hostsidetests/backup/KeyValueApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/backup/KeyValueApp/AndroidManifest.xml b/hostsidetests/backup/KeyValueApp/AndroidManifest.xml index cca91a5f3f289425186f6d371e5e1921fbfe6869..262d7ccdde1b719b8f6dc483380df75fb7fa707c 100644 --- a/hostsidetests/backup/KeyValueApp/AndroidManifest.xml +++ b/hostsidetests/backup/KeyValueApp/AndroidManifest.xml @@ -26,7 +26,7 @@ diff --git a/hostsidetests/backup/KeyValueApp/src/android/cts/backup/keyvaluerestoreapp/KeyValueBackupRestoreTest.java b/hostsidetests/backup/KeyValueApp/src/android/cts/backup/keyvaluerestoreapp/KeyValueBackupRestoreTest.java index 807f5ae18a834cc30d7b98e11c1b09760a3d1621..a6d825a27adf2483b5bed292d70992f837c10dd7 100644 --- a/hostsidetests/backup/KeyValueApp/src/android/cts/backup/keyvaluerestoreapp/KeyValueBackupRestoreTest.java +++ b/hostsidetests/backup/KeyValueApp/src/android/cts/backup/keyvaluerestoreapp/KeyValueBackupRestoreTest.java @@ -17,7 +17,8 @@ package android.cts.backup.keyvaluerestoreapp; import static android.content.Context.MODE_PRIVATE; -import static android.support.test.InstrumentationRegistry.getTargetContext; + +import static androidx.test.InstrumentationRegistry.getTargetContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -30,9 +31,10 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.mk b/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.mk index 0a0efba1be57b0f54195b363adb85f2971adeb69..c5bb10a1efd5cbbe6a621eeac678771c77719199 100644 --- a/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.mk +++ b/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, ../src) diff --git a/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/AndroidManifest.xml b/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/AndroidManifest.xml index c9284ba2b674c316c5ad28549538f9867eaa0867..f26431f498ba7cb3a16c4140fbd6d4c537ed2f0d 100644 --- a/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/AndroidManifest.xml +++ b/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/AndroidManifest.xml @@ -27,7 +27,7 @@ diff --git a/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.mk b/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.mk index 94d9376a9236ca15e8805f7fc2117dd7115c23d9..8b0eeedecda58611b2c2bf851fb395b07035998c 100644 --- a/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.mk +++ b/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, ../src) diff --git a/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/AndroidManifest.xml b/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/AndroidManifest.xml index 0d05b994d240da85be4b9f512fbc0a2e34c17ed0..6f99f103c3b8f35858fe8220839bc866fee5e9b7 100644 --- a/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/AndroidManifest.xml +++ b/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/AndroidManifest.xml @@ -27,7 +27,7 @@ diff --git a/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.mk b/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.mk index 81652a7832afe7f20b4cfb8c8b0445db4770b7e8..0728535c3dc17c9dd0fb12ab07987509a2f2204c 100644 --- a/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.mk +++ b/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, ../src) diff --git a/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/AndroidManifest.xml b/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/AndroidManifest.xml index 57fdf1f1877dbcf5769c1fb54e0300838561a332..a4a5e9c8a72369c7ac5e0401e4fc166583e1363f 100644 --- a/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/AndroidManifest.xml +++ b/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/AndroidManifest.xml @@ -28,7 +28,7 @@ diff --git a/hostsidetests/backup/RestoreAnyVersion/src/RestoreAnyVersionTest.java b/hostsidetests/backup/RestoreAnyVersion/src/RestoreAnyVersionTest.java index 1dbdb058420a5a8d4555156b2b2e5f6833140495..364624750d6e9e9038c7bb2612bd1b73ecd5a21f 100644 --- a/hostsidetests/backup/RestoreAnyVersion/src/RestoreAnyVersionTest.java +++ b/hostsidetests/backup/RestoreAnyVersion/src/RestoreAnyVersionTest.java @@ -17,28 +17,24 @@ package android.cts.backup.restoreanyversionapp; import static android.content.Context.MODE_PRIVATE; -import static android.support.test.InstrumentationRegistry.getTargetContext; + +import static androidx.test.InstrumentationRegistry.getTargetContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - /** * Device side routines to be invoked by the host side RestoreAnyVersionHostSideTest. These * are not designed to be called in any other way, as they rely on state set up by the host side diff --git a/hostsidetests/backup/SharedPreferencesRestoreApp/Android.mk b/hostsidetests/backup/SharedPreferencesRestoreApp/Android.mk index 4e4f0beadadeb1072f8accc0c7c155f7df5dc93c..1966414abb2640ac54be85395e6660a01d592071 100644 --- a/hostsidetests/backup/SharedPreferencesRestoreApp/Android.mk +++ b/hostsidetests/backup/SharedPreferencesRestoreApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/backup/SharedPreferencesRestoreApp/AndroidManifest.xml b/hostsidetests/backup/SharedPreferencesRestoreApp/AndroidManifest.xml index 1cf6da5a4d9d24bcb339361fab023eebf3cf3bf8..e2eb7c53936c39afa2e640e6e816b9fbd9cf8ad2 100644 --- a/hostsidetests/backup/SharedPreferencesRestoreApp/AndroidManifest.xml +++ b/hostsidetests/backup/SharedPreferencesRestoreApp/AndroidManifest.xml @@ -35,7 +35,7 @@ diff --git a/hostsidetests/backup/SuccessNotificationApp/Android.mk b/hostsidetests/backup/SuccessNotificationApp/Android.mk index 853122521a2d08cbf0fc4cf0cf5a99a166d7f03b..12db13d1f713b1962fff95826fca584dfe70b1a4 100644 --- a/hostsidetests/backup/SuccessNotificationApp/Android.mk +++ b/hostsidetests/backup/SuccessNotificationApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/backup/SuccessNotificationApp/AndroidManifest.xml b/hostsidetests/backup/SuccessNotificationApp/AndroidManifest.xml index b7f8c2c7820f3b95519dc42c9b05ff9eb9add679..307b0e153630f7b8b4cee2fe07383a789ee2b4d7 100644 --- a/hostsidetests/backup/SuccessNotificationApp/AndroidManifest.xml +++ b/hostsidetests/backup/SuccessNotificationApp/AndroidManifest.xml @@ -27,6 +27,6 @@ diff --git a/hostsidetests/backup/SuccessNotificationApp/src/android/cts/backup/successnotificationapp/SuccessNotificationTest.java b/hostsidetests/backup/SuccessNotificationApp/src/android/cts/backup/successnotificationapp/SuccessNotificationTest.java index 3fb8ef2c969a88d1210e5adf40303426b112b12b..96c935c1552c2ec9a23e47db1b502724c0f915c2 100644 --- a/hostsidetests/backup/SuccessNotificationApp/src/android/cts/backup/successnotificationapp/SuccessNotificationTest.java +++ b/hostsidetests/backup/SuccessNotificationApp/src/android/cts/backup/successnotificationapp/SuccessNotificationTest.java @@ -16,11 +16,13 @@ package android.cts.backup.successnotificationapp; -import static android.support.test.InstrumentationRegistry.getTargetContext; +import static androidx.test.InstrumentationRegistry.getTargetContext; + import static org.junit.Assert.assertTrue; import android.content.Context; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/backup/fullbackupapp/Android.mk b/hostsidetests/backup/fullbackupapp/Android.mk index 40a90d6057cebfc4f2f425e296d5c473ca14212b..91c6d5ef3b60ea3172cbfc02758c560c46b92cb8 100644 --- a/hostsidetests/backup/fullbackupapp/Android.mk +++ b/hostsidetests/backup/fullbackupapp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/backup/fullbackupapp/AndroidManifest.xml b/hostsidetests/backup/fullbackupapp/AndroidManifest.xml index 58f93061a6b0767672b0d3da233d835df835f5d8..6ab3f68bbc4ddceed5495d0c9d212180aaabdf04 100644 --- a/hostsidetests/backup/fullbackupapp/AndroidManifest.xml +++ b/hostsidetests/backup/fullbackupapp/AndroidManifest.xml @@ -22,7 +22,7 @@ diff --git a/hostsidetests/backup/fullbackupapp/src/android/cts/backup/fullbackupapp/FullbackupTest.java b/hostsidetests/backup/fullbackupapp/src/android/cts/backup/fullbackupapp/FullbackupTest.java index ee49b870d890e4f910a0517164b780516cc6f4e5..fc07ad6e26cc9fc80743b287276f4c792d674235 100644 --- a/hostsidetests/backup/fullbackupapp/src/android/cts/backup/fullbackupapp/FullbackupTest.java +++ b/hostsidetests/backup/fullbackupapp/src/android/cts/backup/fullbackupapp/FullbackupTest.java @@ -16,15 +16,16 @@ package android.cts.backup.fullbackupapp; -import static android.support.test.InstrumentationRegistry.getTargetContext; +import static androidx.test.InstrumentationRegistry.getTargetContext; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import android.content.Context; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/backup/includeexcludeapp/Android.mk b/hostsidetests/backup/includeexcludeapp/Android.mk index 2043a147e94f6c3914c4472dfc093815c9dede91..08ddbd8cad390cdb42d418b28d057ead8c8ae80b 100644 --- a/hostsidetests/backup/includeexcludeapp/Android.mk +++ b/hostsidetests/backup/includeexcludeapp/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/backup/includeexcludeapp/AndroidManifest.xml b/hostsidetests/backup/includeexcludeapp/AndroidManifest.xml index 3726eca1b92c8f0117cd3eef271dc630898214ac..03673974aae71d09c245ad8f8fe225ecc570b09e 100644 --- a/hostsidetests/backup/includeexcludeapp/AndroidManifest.xml +++ b/hostsidetests/backup/includeexcludeapp/AndroidManifest.xml @@ -23,7 +23,7 @@ diff --git a/hostsidetests/backup/includeexcludeapp/src/android/cts/backup/includeexcludeapp/IncludeExcludeTest.java b/hostsidetests/backup/includeexcludeapp/src/android/cts/backup/includeexcludeapp/IncludeExcludeTest.java index 286d7a3e78cc24d5021cdb471f52016245881662..f46e3f2aa6206f3b5df5bb59190f9f23bdeccc3f 100644 --- a/hostsidetests/backup/includeexcludeapp/src/android/cts/backup/includeexcludeapp/IncludeExcludeTest.java +++ b/hostsidetests/backup/includeexcludeapp/src/android/cts/backup/includeexcludeapp/IncludeExcludeTest.java @@ -16,16 +16,17 @@ package android.cts.backup.includeexcludeapp; -import static android.support.test.InstrumentationRegistry.getTargetContext; +import static androidx.test.InstrumentationRegistry.getTargetContext; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.content.Context; import android.content.SharedPreferences; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.mk b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.mk index 3069bac81b24203a05c73ea3b836dd610d88783b..196e6c88f7afe6842743c063fffadcfbccdc6c6f 100644 --- a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.mk +++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctstestrunner +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules ctstestrunner-axt LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml index 46c34f6a1261b436b5239c6126552f47d6c24ec5..ed2d8dcfa36713e537b09f03e42df24618ac3756 100644 --- a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml +++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml @@ -39,6 +39,6 @@ diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/InvalidSyncAuthoritiesDeviceTest.java b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/InvalidSyncAuthoritiesDeviceTest.java index f91a3581072cb59ff4cb02265232e1e7c87230cc..735745646f0e7e8f37cf992dcf1a629e41ca8aad 100644 --- a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/InvalidSyncAuthoritiesDeviceTest.java +++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/InvalidSyncAuthoritiesDeviceTest.java @@ -23,8 +23,9 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.content.ContentResolver; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk index 5746089e931bb92c50994a7a276ed1b2949cafad..b223b379377de510ebad57f57a8768f16c3b0f05 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk @@ -29,9 +29,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ + ctstestrunner-axt \ ub-uiautomator \ - android-support-test + androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Auth/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AccountCheck/Auth/AndroidManifest.xml index 97659b36081e56759d02ca9ec24d94b3d91bef2e..7af6546c76a1018284a169645fada3881559278d 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/Auth/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/AccountCheck/Auth/AndroidManifest.xml @@ -41,7 +41,7 @@ diff --git a/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/Android.mk index 84eb38ccea39da6580a1a318e0cd90229cd553af..00658e1d56276e2caa4a51dc54e12ffa67c48c26 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/Android.mk @@ -27,7 +27,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, ../src-owner) -LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 ctstestrunner ub-uiautomator android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 ctstestrunner-axt ub-uiautomator androidx.test.rules LOCAL_SDK_VERSION := current diff --git a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/Android.mk index 869d9064409a122a0088e9ffbccaf8759208106c..0cc8debb03a466137a55e52674b6ad8595bd378c 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/Android.mk @@ -27,7 +27,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, ../src-owner) -LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 ctstestrunner ub-uiautomator android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 ctstestrunner-axt ub-uiautomator androidx.test.rules LOCAL_SDK_VERSION := current diff --git a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/Android.mk index 9ebfbc8492e4146d5dd3176be50f95382441dd23..fd4049810eca8b6e7ef61c767609ec8decd9860f 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/Android.mk @@ -27,7 +27,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, ../src-owner) -LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 ctstestrunner ub-uiautomator android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 ctstestrunner-axt ub-uiautomator androidx.test.rules LOCAL_SDK_VERSION := current diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk index b3adc7057d781756203c7e2190bfe60c4411685b..a84b5bcb1b5d598eac1de0607e11531aa62225a4 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk @@ -27,7 +27,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 ctstestrunner ub-uiautomator android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.legacy_legacy-support-v4 ctstestrunner-axt ub-uiautomator androidx.test.rules LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AccountCheck/Tester/AndroidManifest.xml index a6ea4aae329454d80c4c2da97dee4e5041de1d62..fe5fb2dc4d70a05241e2b3f986d8c68c50a83211 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/Tester/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/AndroidManifest.xml @@ -38,7 +38,7 @@ diff --git a/hostsidetests/devicepolicy/app/AccountManagement/Android.mk b/hostsidetests/devicepolicy/app/AccountManagement/Android.mk index 55e93c346bf11552820d9497c241fac4658982b6..2ce6c5d0080cd3fa2d23d23ea2b45383ca059400 100644 --- a/hostsidetests/devicepolicy/app/AccountManagement/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountManagement/Android.mk @@ -29,9 +29,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ + ctstestrunner-axt \ ub-uiautomator \ - android-support-test + androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/AccountManagement/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AccountManagement/AndroidManifest.xml index 9c31a62e9c5fd706914df8d60b18fcf56d5efc15..c951d2a371b67a76e543e64b0beee72924b6b08d 100644 --- a/hostsidetests/devicepolicy/app/AccountManagement/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/AccountManagement/AndroidManifest.xml @@ -35,7 +35,7 @@ diff --git a/hostsidetests/devicepolicy/app/Assistant/Android.mk b/hostsidetests/devicepolicy/app/Assistant/Android.mk index efd6cd132c3a3e9b1d039a8942e25b70f455e721..6b16d40d2635f4e2f3f74a528efee3fdb47fe98d 100644 --- a/hostsidetests/devicepolicy/app/Assistant/Android.mk +++ b/hostsidetests/devicepolicy/app/Assistant/Android.mk @@ -31,8 +31,8 @@ LOCAL_PACKAGE_NAME := CtsDevicePolicyAssistApp LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.legacy_legacy-support-v4 \ - compatibility-device-util \ - android-support-test \ + compatibility-device-util-axt \ + androidx.test.rules \ LOCAL_SDK_VERSION := current diff --git a/hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml b/hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml index 17ca6426643da25189d08ac3c5a7382ec33fc190..f4d42aa1191f0c6589062759237e666fc016534c 100644 --- a/hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml @@ -43,7 +43,7 @@ diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk index 020d0bd9e1a93f2f186cc133d4c3920cc1f9a23e..c2fdb5fabd7b531a77ec773beab3347d952beceb 100644 --- a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk +++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk @@ -34,7 +34,7 @@ LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit android.test.base.stubs -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt compatibility-device-util-axt LOCAL_SDK_VERSION := test_current @@ -59,7 +59,7 @@ LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit android.test.base.stubs -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt compatibility-device-util-axt LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml index 820f1beeff62bdaaaebe18167ca8cd49925d35b8..f23a692ffc87d7006e908e668f3c93a0a22c3cb6 100644 --- a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml @@ -47,7 +47,7 @@ - diff --git a/hostsidetests/devicepolicy/app/CrossProfileAppsTest/Android.mk b/hostsidetests/devicepolicy/app/CrossProfileAppsTest/Android.mk index 8ff609d3f5fcf2d66dc7f21aa8ba56f7eeaeef83..0239f6ca7b5e2fbe7cfe11d8d9bcf916670b40b6 100644 --- a/hostsidetests/devicepolicy/app/CrossProfileAppsTest/Android.mk +++ b/hostsidetests/devicepolicy/app/CrossProfileAppsTest/Android.mk @@ -28,8 +28,8 @@ LOCAL_JAVA_LIBRARIES := cts-junit LOCAL_STATIC_JAVA_LIBRARIES = \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ - android-support-test \ + ctstestrunner-axt \ + androidx.test.rules \ truth-prebuilt \ ub-uiautomator diff --git a/hostsidetests/devicepolicy/app/CrossProfileAppsTest/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CrossProfileAppsTest/AndroidManifest.xml index 79093d66a219c4ce0018764b734521e8aabae405..289f54cc2d90f3236faf2bfc29b8da87ad161fc0 100644 --- a/hostsidetests/devicepolicy/app/CrossProfileAppsTest/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/CrossProfileAppsTest/AndroidManifest.xml @@ -40,7 +40,7 @@ - diff --git a/hostsidetests/devicepolicy/app/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsNonTargetUserTest.java b/hostsidetests/devicepolicy/app/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsNonTargetUserTest.java index ee7af515619e5032dbf0b88b53f960d586c3b198..554259ed068e3e919fb27bb0ceb3bf5a5698e9bb 100644 --- a/hostsidetests/devicepolicy/app/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsNonTargetUserTest.java +++ b/hostsidetests/devicepolicy/app/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsNonTargetUserTest.java @@ -22,8 +22,9 @@ import android.content.pm.CrossProfileApps; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsTargetUserTest.java b/hostsidetests/devicepolicy/app/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsTargetUserTest.java index 31baa79f7669c5c2848a8913a1b1ae98c6732e7a..2aa1ae80a6261dff65bdcf324c6d4c4175525ef8 100644 --- a/hostsidetests/devicepolicy/app/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsTargetUserTest.java +++ b/hostsidetests/devicepolicy/app/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsTargetUserTest.java @@ -27,13 +27,14 @@ import android.content.pm.CrossProfileApps; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk b/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk index 81d98f1d583be47ff64cb3e9ffa94a343a96984c..c06a98423fb64705aa1996412a49769343af6e22 100644 --- a/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk +++ b/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk @@ -27,8 +27,8 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ + androidx.test.rules \ + compatibility-device-util-axt \ LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/CustomizationApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CustomizationApp/AndroidManifest.xml index be6249fde5b7c249b3b7cd164958746830bc30fd..a3b0507aba77091b85226c126312245f0fd60b87 100644 --- a/hostsidetests/devicepolicy/app/CustomizationApp/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/CustomizationApp/AndroidManifest.xml @@ -27,7 +27,7 @@ diff --git a/hostsidetests/devicepolicy/app/DelegateApp/Android.mk b/hostsidetests/devicepolicy/app/DelegateApp/Android.mk index 1d0be1d397924e6270e365107811c026c7080472..0eb904a6f17e93e4405c7638891080510101727b 100644 --- a/hostsidetests/devicepolicy/app/DelegateApp/Android.mk +++ b/hostsidetests/devicepolicy/app/DelegateApp/Android.mk @@ -28,8 +28,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit android.test.base.st LOCAL_STATIC_JAVA_LIBRARIES = \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ - android-support-test + ctstestrunner-axt \ + androidx.test.rules LOCAL_SDK_VERSION := current diff --git a/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml index cc139a41d135add875c43d0cac6503a39562c7b7..a3f8157dc29018a3aaf3294de695183ed4b60e16 100644 --- a/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml @@ -24,7 +24,7 @@ android:exported="true"> - diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk index 5cf7f051784c8576fa0e2df6b8dc3216609f5b1a..0663e7c29e070d94c6b0f249be752a817b84b025 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util + ctstestrunner-axt \ + compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/AndroidManifest.xml index d70b22d6eb8452a24074b94c23166cdb6295b316..8e2fdc2662df04e168efb0885fcfc3caa4c137ac 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/AndroidManifest.xml @@ -46,7 +46,7 @@ - diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk index a7c7470162a33297a18e7bcf19d2e381d0fdd575..a7da46176be23fff07da4c9b33806c8d4363ed4f 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util + ctstestrunner-axt \ + compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/AndroidManifest.xml index e2d785c2af9ecb473665293f864300db965ab41f..30bd6dc20661703a702bfd413ab891847704c8c6 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/AndroidManifest.xml @@ -46,7 +46,7 @@ - diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk index 55cf2b3011ce5d0f7ea2ab3cd06914403d96cb6b..2689607d1f217b52b078c16cf971b7658d36a0a1 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml index 47f3c6a638c4591a90eea8b9c9c45b680792b4e0..d2b4b0cd6602c139f76862ab0724d443014c74cf 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml @@ -41,6 +41,6 @@ - diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk index 8725fb784ce0a6e8cd568a7d570ebc2f679cb1b4..4726b8dce61a52af3ad1268347b862f55bc72598 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml index 0ff8e6889b36bec46a7c67d71b4581c1e5ecf6d7..c57eb8e8fadbb67cf2264e3303afe2722aed730c 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml @@ -41,6 +41,6 @@ - diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk index fdc7e7ac59c5d4a3c33bdc94fe1820f70af8d600..8ac63077a955eb4198f1d2a2550689522d6247e1 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml index 5d637942d55caa7792d03698d3912ce5503769aa..46a5fee4d88806d4e97c962312858f507355d22e 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml @@ -40,6 +40,6 @@ - diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk index 02bf1e5a34cb57597a9768f4656fae9e83f5fe77..32c061ad895ae32072abe0804568148553bba6ea 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml index b43d086396d903428bd5b66ebe409dfa1dfad124..3a98de5b13e8ccebd5f0b680cc784585fd9690fc 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml @@ -46,6 +46,6 @@ - diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk index cf21905974333f92bd639d3ece622508b0cd7f0c..54493f2f057f6a930e349b2de1ae5903c3db1482 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml index 95d203ad694cbe8ad9520b70162521d48a0c0f79..beb23a84cc735b2c400502eb10961671cbc46b76 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml @@ -39,6 +39,6 @@ - diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk index 1599d60fff17977410051cd76790c56feb75954b..00023336dba340ba70079654a75d3651c9dac984 100644 --- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk @@ -32,8 +32,8 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_USE_AAPT2 := true LOCAL_STATIC_JAVA_LIBRARIES := \ - compatibility-device-util \ - ctstestrunner \ + compatibility-device-util-axt \ + ctstestrunner-axt \ ub-uiautomator \ cts-security-test-support-library diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml index d92d44017122821ae5ab35d6284a237f607cf2bd..793233ac334ae79846c39fe96cc74aa9900242ce 100644 --- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml @@ -40,7 +40,7 @@ - diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/src/com/android/cts/intent/receiver/ClearApplicationDataTest.java b/hostsidetests/devicepolicy/app/IntentReceiver/src/com/android/cts/intent/receiver/ClearApplicationDataTest.java index 0d2a990bca4fc2326d526a56bd4bd5db6ed97086..e132a2547527d7f485b612a3b431160207bd5a18 100644 --- a/hostsidetests/devicepolicy/app/IntentReceiver/src/com/android/cts/intent/receiver/ClearApplicationDataTest.java +++ b/hostsidetests/devicepolicy/app/IntentReceiver/src/com/android/cts/intent/receiver/ClearApplicationDataTest.java @@ -21,8 +21,9 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.SharedPreferences; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/IntentSender/Android.mk b/hostsidetests/devicepolicy/app/IntentSender/Android.mk index 5cc3b7a177d75095f1b1208b8fe81aae2d108b87..196e192202b27759f2e5fcc2ab9aa33546330f94 100644 --- a/hostsidetests/devicepolicy/app/IntentSender/Android.mk +++ b/hostsidetests/devicepolicy/app/IntentSender/Android.mk @@ -29,7 +29,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_USE_AAPT2 := true LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ + ctstestrunner-axt \ ub-uiautomator LOCAL_STATIC_ANDROID_LIBRARIES := \ diff --git a/hostsidetests/devicepolicy/app/IntentSender/AndroidManifest.xml b/hostsidetests/devicepolicy/app/IntentSender/AndroidManifest.xml index 6562b29abf6afa923360995ea999faf2f0556ae4..59f9a9c6c782fe37f1f3aebcdd9b129fa79de713 100644 --- a/hostsidetests/devicepolicy/app/IntentSender/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/IntentSender/AndroidManifest.xml @@ -52,7 +52,7 @@ diff --git a/hostsidetests/devicepolicy/app/LauncherTests/Android.mk b/hostsidetests/devicepolicy/app/LauncherTests/Android.mk index 0475e309e60a67f619d24d99d342c4861a05e083..131aee1f88727fc0bfd05058ede45140e3bd0ceb 100644 --- a/hostsidetests/devicepolicy/app/LauncherTests/Android.mk +++ b/hostsidetests/devicepolicy/app/LauncherTests/Android.mk @@ -28,9 +28,9 @@ LOCAL_JAVA_LIBRARIES := cts-junit android.test.base.stubs LOCAL_STATIC_JAVA_LIBRARIES = \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ - android-support-test \ - compatibility-device-util \ + ctstestrunner-axt \ + androidx.test.rules \ + compatibility-device-util-axt \ ShortcutManagerTestUtils \ testng diff --git a/hostsidetests/devicepolicy/app/LauncherTests/AndroidManifest.xml b/hostsidetests/devicepolicy/app/LauncherTests/AndroidManifest.xml index abf4c52713b4d0ced2429461dc10315b6e662bf9..cc87b4f9902e2ac60e9b892f71c3f34dd50f81be 100644 --- a/hostsidetests/devicepolicy/app/LauncherTests/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/LauncherTests/AndroidManifest.xml @@ -23,7 +23,7 @@ - diff --git a/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/LauncherAppsTests.java b/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/LauncherAppsTests.java index e8a1291061a9bbcd82c5b6c0ad8def42de14392b..afb97f9c6a2346670025533b7c4e5376423316b0 100644 --- a/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/LauncherAppsTests.java +++ b/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/LauncherAppsTests.java @@ -35,9 +35,10 @@ import android.os.Message; import android.os.Messenger; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.InstrumentationRegistry; import android.test.AndroidTestCase; +import androidx.test.InstrumentationRegistry; + import java.util.List; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; diff --git a/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/QuietModeTest.java b/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/QuietModeTest.java index 0349594855c0a421d3037d8220692cc11ed13ac4..9e5f05d32fde18cb99ecabe7f198921027053019 100644 --- a/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/QuietModeTest.java +++ b/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/QuietModeTest.java @@ -30,11 +30,12 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.text.TextUtils; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import com.android.compatibility.common.util.BlockingBroadcastReceiver; import org.junit.After; diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk b/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk index 6a02fd146f4da097e03df071ac25573fff7ca0fd..5e4a57597f8ea2655b1c75073571ab245a5b9e1c 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk +++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk @@ -29,10 +29,10 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit android.test.base.st LOCAL_USE_AAPT2 := true LOCAL_STATIC_JAVA_LIBRARIES = \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ ub-uiautomator \ - android-support-test \ + androidx.test.rules \ guava LOCAL_STATIC_ANDROID_LIBRARIES := \ diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml index 58e232b0abbe513682ac5794f50bab5701653b3f..76e872fa46f5776c1b05d6e7f53a05b3317cbd19 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml @@ -200,7 +200,7 @@ - diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ManagedProfileTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ManagedProfileTest.java index a21d9e6786d948e92ae12d4a1c085a952d58b56b..91f2046e549d7c228563ee88db0f8ad29c238f68 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ManagedProfileTest.java +++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ManagedProfileTest.java @@ -15,15 +15,16 @@ */ package com.android.cts.managedprofile; +import static com.android.cts.managedprofile.BaseManagedProfileTest.ADMIN_RECEIVER_COMPONENT; + import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; -import android.support.test.InstrumentationRegistry; import android.test.ActivityInstrumentationTestCase2; -import static com.android.cts.managedprofile.BaseManagedProfileTest.ADMIN_RECEIVER_COMPONENT; +import androidx.test.InstrumentationRegistry; /** * Test for {@link DevicePolicyManager#addCrossProfileIntentFilter} API. diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/NotificationListenerTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/NotificationListenerTest.java index 6986c396cb2390f7fc0b3aa53ec6d4663b8948b1..ea06ef98ebc11307897b37d085cb131cb3da75a9 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/NotificationListenerTest.java +++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/NotificationListenerTest.java @@ -18,10 +18,6 @@ package com.android.cts.managedprofile; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.app.Notification; -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.app.UiAutomation; import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -29,12 +25,13 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.support.test.uiautomator.UiDevice; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserTest.java index 4163ba8b7c2814bd1db333f6bc347bdcc8463f03..0a7e7f9ceae6930581020fc41b9fa3f23bf1767b 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserTest.java +++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserTest.java @@ -20,7 +20,8 @@ import android.app.admin.DevicePolicyManager; import android.content.Intent; import android.content.pm.PackageManager; import android.test.ActivityInstrumentationTestCase2; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; /** * Test for {@link DevicePolicyManager#addCrossProfileIntentFilter} API, for diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningTest.java index 23de82372a106bd5fb4199ec7763deb88023ea71..8cf156b4439bc8a2be5a2b5ab4cc373a4f1acc62 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningTest.java +++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningTest.java @@ -21,6 +21,7 @@ import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXT import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME; import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION; import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_SKIP_ENCRYPTION; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -35,11 +36,13 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.PersistableBundle; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; + import com.android.compatibility.common.util.devicepolicy.provisioning.SilentProvisioningTestManager; + import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/SanityTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/SanityTest.java index 683d465e7bd5ea79d38e183a9a1a07b2e1b91820..6a8b87a67a074178ce7afb67df5aaae643865595 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/SanityTest.java +++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/SanityTest.java @@ -15,19 +15,20 @@ */ package com.android.cts.managedprofile; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; + import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import com.android.compatibility.common.util.BlockingBroadcastReceiver; import org.junit.Before; import org.junit.Test; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; - /** * Basic sanity test to ensure some basic functionalities of work profile are working. */ diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/WipeDataWithReasonVerificationTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/WipeDataWithReasonVerificationTest.java index 3b35cb46e5a68386f20b74f648226f4938174123..077fbd35efa5790142a0d5fad5f657169b4713f2 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/WipeDataWithReasonVerificationTest.java +++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/WipeDataWithReasonVerificationTest.java @@ -1,12 +1,13 @@ package com.android.cts.managedprofile; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObjectNotFoundException; import android.support.test.uiautomator.Until; import android.test.AndroidTestCase; +import androidx.test.InstrumentationRegistry; + /** * Test wipeDataWithReason() has indeed shown the notification. * The function wipeDataWithReason() is called and executed in another test. diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk b/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk index a1514ff491d80cce6b63e16c37da0447a055f6fc..1d4f8aef38ad58af628ab98c13e5361577f3fb9d 100644 --- a/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk +++ b/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk @@ -28,7 +28,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ + ctstestrunner-axt \ ub-uiautomator LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml b/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml index 4b69ba6181efc9a137956674a7b71fe548264e13..f4dfcaf92db431f47ec2039c0dae6dc8203a4161 100644 --- a/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml @@ -38,7 +38,7 @@ diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk b/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk index dd765581716ee50f0c770f6489f7a7751bd0c8e2..e4b41716469f65f398f205856c7a72cd53ccd66a 100644 --- a/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk +++ b/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk @@ -32,8 +32,8 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ ub-uiautomator # tag this module as a cts test artifact diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml index 26efd97d636b002a5fe28ffd5cc6ab5c621e4f27..a494ed618fab0606761d2cd6ca31e063a7033d5e 100644 --- a/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml @@ -36,7 +36,7 @@ - diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/AppUsageObserverTest.java b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/AppUsageObserverTest.java index 533e925550fcf6af09dacc277b2162f0095488ce..2597a640542137203e830e51621c95a82291a6fb 100644 --- a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/AppUsageObserverTest.java +++ b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/AppUsageObserverTest.java @@ -18,7 +18,8 @@ package com.android.cts.profileowner; import android.app.PendingIntent; import android.app.usage.UsageStatsManager; import android.content.Intent; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import java.util.concurrent.TimeUnit; diff --git a/hostsidetests/devicepolicy/app/SingleAdminApp/Android.mk b/hostsidetests/devicepolicy/app/SingleAdminApp/Android.mk index 4cdbeee07b34d7c4c56cf863bcdc2a75c8931acc..5d9c1fc36906b9a77b915ed5156bb52deeaf38c3 100644 --- a/hostsidetests/devicepolicy/app/SingleAdminApp/Android.mk +++ b/hostsidetests/devicepolicy/app/SingleAdminApp/Android.mk @@ -28,10 +28,10 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES = \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ ub-uiautomator \ - android-support-test + androidx.test.rules LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/devicepolicy/app/SingleAdminApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SingleAdminApp/AndroidManifest.xml index 6ae1eb4efdd24296713bce9e69b663ab551118a3..daf7862d93f37d6de4854cae6376f31e45dac95f 100644 --- a/hostsidetests/devicepolicy/app/SingleAdminApp/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/SingleAdminApp/AndroidManifest.xml @@ -36,7 +36,7 @@ - diff --git a/hostsidetests/devicepolicy/app/SingleAdminApp/src/com/android/cts/devicepolicy/singleadmin/ProvisioningSingleAdminTest.java b/hostsidetests/devicepolicy/app/SingleAdminApp/src/com/android/cts/devicepolicy/singleadmin/ProvisioningSingleAdminTest.java index 2828b3de1e449fda82434de3a50cd8254dd73c9a..c090d507e0c580467a7a0dafd36061413358aa2d 100644 --- a/hostsidetests/devicepolicy/app/SingleAdminApp/src/com/android/cts/devicepolicy/singleadmin/ProvisioningSingleAdminTest.java +++ b/hostsidetests/devicepolicy/app/SingleAdminApp/src/com/android/cts/devicepolicy/singleadmin/ProvisioningSingleAdminTest.java @@ -25,8 +25,9 @@ import android.app.admin.DeviceAdminReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; import com.android.compatibility.common.util.devicepolicy.provisioning.SilentProvisioningTestManager; diff --git a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.mk b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.mk index 8f391554d36605425fe8d34c9e8c109fe8fc5abf..62467af88f1a0c0b6d3a524d38a0379c70c5f5e4 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.mk +++ b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.mk @@ -28,10 +28,10 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ ub-uiautomator \ - android-support-test \ + androidx.test.rules \ testng LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/AndroidManifest.xml index b7212924e685a4aa33880eb9076ee0eb1d9a19f5..c7e9a0229e756987c5c1ed03516cf72d880f74f7 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/AndroidManifest.xml @@ -45,7 +45,7 @@ - diff --git a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/DeviceAndProfileOwnerTransferIncomingTest.java b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/DeviceAndProfileOwnerTransferIncomingTest.java index 7a598d9a5538a9e882ac9f3c2945d31c412d9579..952aebc5f103572844a0831db90497bada5f088d 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/DeviceAndProfileOwnerTransferIncomingTest.java +++ b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/DeviceAndProfileOwnerTransferIncomingTest.java @@ -25,8 +25,9 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.os.PersistableBundle; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/TransferDeviceOwnerIncomingTest.java b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/TransferDeviceOwnerIncomingTest.java index b33da048096273458127c36e2bd0d098589d2f61..f39dbbe3c970702a37072283804d74e9ae14733b 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/TransferDeviceOwnerIncomingTest.java +++ b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/TransferDeviceOwnerIncomingTest.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertEquals; import static org.testng.Assert.assertThrows; import android.app.admin.SystemUpdatePolicy; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/TransferProfileOwnerIncomingTest.java b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/TransferProfileOwnerIncomingTest.java index ef7e8ac3f2013db67adf519ef421f5f04af7498b..0fadc10cc6a4701066f0e570b15e4b48017fb495 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/TransferProfileOwnerIncomingTest.java +++ b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/src/com/android/cts/transferowner/TransferProfileOwnerIncomingTest.java @@ -20,7 +20,8 @@ import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertEquals; import android.app.admin.DevicePolicyManager; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.mk b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.mk index aeacb40a1113698ec43cc896f6c02715f7ab2e5b..c046da24a5d6292e103bc54889b9724afef21a19 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.mk +++ b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.mk @@ -28,10 +28,10 @@ LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.legacy_legacy-support-v4 \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ ub-uiautomator \ - android-support-test \ + androidx.test.rules \ testng LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/AndroidManifest.xml index 59feeb338e0508ca40108af6a8ce24adfc601d19..e1a6dbbbb7d62d1f0519fe6d603dd99ea1a17dbf 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/AndroidManifest.xml +++ b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/AndroidManifest.xml @@ -36,7 +36,7 @@ - diff --git a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/DeviceAndProfileOwnerTransferOutgoingTest.java b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/DeviceAndProfileOwnerTransferOutgoingTest.java index d0073e1d5c2ad7bd8078e01de1bcba2c08b0d5b0..6aedd1ba287abf2004dfae9c8903aadddcf9539e 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/DeviceAndProfileOwnerTransferOutgoingTest.java +++ b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/DeviceAndProfileOwnerTransferOutgoingTest.java @@ -16,10 +16,8 @@ package com.android.cts.transferowner; import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertEquals; -import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertThrows; @@ -32,7 +30,8 @@ import android.content.SharedPreferences; import android.os.PersistableBundle; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import com.android.compatibility.common.util.BlockingBroadcastReceiver; diff --git a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/TransferDeviceOwnerOutgoingTest.java b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/TransferDeviceOwnerOutgoingTest.java index 9e0cd936c8a4ba8d5aef747e5bcf8ba044332031..b42b2bd9cf64c7ee26bd753573133415fd5b28e0 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/TransferDeviceOwnerOutgoingTest.java +++ b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/TransferDeviceOwnerOutgoingTest.java @@ -23,7 +23,8 @@ import static org.testng.Assert.assertThrows; import android.app.admin.DevicePolicyManager; import android.app.admin.SystemUpdatePolicy; import android.os.PersistableBundle; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/TransferProfileOwnerOutgoingTest.java b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/TransferProfileOwnerOutgoingTest.java index dc4c63da2c86964aeb2efd5293d586d063a44ff9..157e840d1f3735c4064953a4b79981d904060d08 100644 --- a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/TransferProfileOwnerOutgoingTest.java +++ b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/src/com/android/cts/transferowner/TransferProfileOwnerOutgoingTest.java @@ -22,7 +22,8 @@ import static org.testng.Assert.assertThrows; import android.app.admin.DevicePolicyManager; import android.os.PersistableBundle; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk b/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk index b03cf953c37f62950da1d2644949888d5c4343d2..6ec2c8d0868884f13012db95927a0cdca3313c9d 100644 --- a/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk +++ b/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsWifiConfigCreator -LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt LOCAL_SDK_VERSION := current diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java index 6589b224b58d38fa5323017e0749e37f85fccd28..eecf6dffe364cd82657f15a942fc64ef29b63840 100644 --- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java +++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java @@ -63,7 +63,7 @@ public class BaseDevicePolicyTest extends DeviceTestCase implements IBuildReceiv ) private boolean mSkipDeviceAdminFeatureCheck = false; - private static final String RUNNER = "android.support.test.runner.AndroidJUnitRunner"; + private static final String RUNNER = "androidx.test.runner.AndroidJUnitRunner"; protected static final int USER_SYSTEM = 0; // From the UserHandle class. diff --git a/hostsidetests/dexmetadata/app/Android.mk b/hostsidetests/dexmetadata/app/Android.mk index bb1581de55b68926669c0b4161a6e3337b6d8011..8d17ebd7a9c3c3e5516c7f74ad1a7ac3df6b9600 100644 --- a/hostsidetests/dexmetadata/app/Android.mk +++ b/hostsidetests/dexmetadata/app/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules compatibility-device-util-axt # Tag this module as test artifact for cts, LOCAL_COMPATIBILITY_SUITE := cts vts general-tests diff --git a/hostsidetests/dexmetadata/app/AndroidManifest.xml b/hostsidetests/dexmetadata/app/AndroidManifest.xml index 88a8c121ed4e45ae22673d4fee4f845ffd0fc800..136e4033cfb395fdd5111d26f7bbd89376474890 100644 --- a/hostsidetests/dexmetadata/app/AndroidManifest.xml +++ b/hostsidetests/dexmetadata/app/AndroidManifest.xml @@ -21,7 +21,7 @@ diff --git a/hostsidetests/dexmetadata/app/src/com/android/cts/dexmetadata/InstallDexMetadataTest.java b/hostsidetests/dexmetadata/app/src/com/android/cts/dexmetadata/InstallDexMetadataTest.java index 8d6e148f85fedc4da75bc32b6d320f31aaee2d9b..fc38c4e5f991e8be3517c8e7b76122cce2afaa51 100644 --- a/hostsidetests/dexmetadata/app/src/com/android/cts/dexmetadata/InstallDexMetadataTest.java +++ b/hostsidetests/dexmetadata/app/src/com/android/cts/dexmetadata/InstallDexMetadataTest.java @@ -25,23 +25,24 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Build.VERSION_CODES; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.util.ArrayMap; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import com.android.compatibility.common.util.ApiLevelUtil; +import org.junit.Assume; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - /** * Device-side test for verifying dex metadata installs. */ diff --git a/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk index ff34e63661cf4eea0a6aa2f4c6d23e1f64625490..a772a050af4ae2ea18a459842a58ce98409fe2aa 100644 --- a/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk +++ b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_PACKAGE_NAME := CtsFramestatsTestApp diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk index c6e8104a5ef6448d0bb9756a07577ad7b90fad15..a3df725f9bed55c4752ee7d85beb4237cfd5b250 100644 --- a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk +++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk index dd0fb9cf4a19c867eecddc41c257d3b68a7d47dd..24e72ab07858555ff9dfa63745eb10a0f816b7e5 100644 --- a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk +++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/AndroidManifest.xml b/hostsidetests/dumpsys/apps/ProcStatsTestApp/AndroidManifest.xml index 56cacb5027e5cc8d9d32388b979b646b214c48c1..1a7288638777b5234de99cacf55de58031ef5d73 100644 --- a/hostsidetests/dumpsys/apps/ProcStatsTestApp/AndroidManifest.xml +++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/AndroidManifest.xml @@ -21,6 +21,6 @@ - diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/src/com/android/server/cts/procstats/ProcStatsTest.java b/hostsidetests/dumpsys/apps/ProcStatsTestApp/src/com/android/server/cts/procstats/ProcStatsTest.java index c6836c3ca5f70628afa07516d1c35ff19ab0cf22..b7771bc2343033d1f265d8ff95a15906584940db 100644 --- a/hostsidetests/dumpsys/apps/ProcStatsTestApp/src/com/android/server/cts/procstats/ProcStatsTest.java +++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/src/com/android/server/cts/procstats/ProcStatsTest.java @@ -15,17 +15,16 @@ */ package com.android.server.cts.procstats; -import static junit.framework.Assert.assertEquals; import static junit.framework.TestCase.fail; import android.content.ComponentName; import android.content.Intent; import android.os.ParcelFileDescriptor; -import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/dumpsys/apps/storagedapp/Android.mk b/hostsidetests/dumpsys/apps/storagedapp/Android.mk index 63648556fa209e1692d5835e09d2fe57ef1724c7..a1670dbcd61ddae545bbe5b2b83f7d0f29373312 100644 --- a/hostsidetests/dumpsys/apps/storagedapp/Android.mk +++ b/hostsidetests/dumpsys/apps/storagedapp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/dumpsys/apps/storagedapp/AndroidManifest.xml b/hostsidetests/dumpsys/apps/storagedapp/AndroidManifest.xml index db3d79f43938d4c6990c6b052d6cd424108ec580..c4b7a7e1fec6a1a4479a003a825b4091f1ffd6bd 100644 --- a/hostsidetests/dumpsys/apps/storagedapp/AndroidManifest.xml +++ b/hostsidetests/dumpsys/apps/storagedapp/AndroidManifest.xml @@ -25,6 +25,6 @@ - diff --git a/hostsidetests/dumpsys/apps/storagedapp/src/com/android/server/cts/storaged/StoragedTest.java b/hostsidetests/dumpsys/apps/storagedapp/src/com/android/server/cts/storaged/StoragedTest.java index 0e54c6876f3793f9e3fcc64b5cb983837083006b..cab23d2eda40fe49944d90b16b0f63672471e2e4 100644 --- a/hostsidetests/dumpsys/apps/storagedapp/src/com/android/server/cts/storaged/StoragedTest.java +++ b/hostsidetests/dumpsys/apps/storagedapp/src/com/android/server/cts/storaged/StoragedTest.java @@ -17,8 +17,9 @@ package com.android.server.cts.storaged; import android.content.Context; import android.content.Intent; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/hostsidetests/dumpsys/src/android/dumpsys/cts/BaseDumpsysTest.java b/hostsidetests/dumpsys/src/android/dumpsys/cts/BaseDumpsysTest.java index ca548c80ce149f098582426bb5740e23772bfa28..b0006b4afe40314471e17915493f92c7e5e0e5a5 100644 --- a/hostsidetests/dumpsys/src/android/dumpsys/cts/BaseDumpsysTest.java +++ b/hostsidetests/dumpsys/src/android/dumpsys/cts/BaseDumpsysTest.java @@ -43,7 +43,7 @@ import javax.annotation.Nullable; public class BaseDumpsysTest extends DeviceTestCase implements IBuildReceiver { protected static final String TAG = "DumpsysHostTest"; - private static final String TEST_RUNNER = "android.support.test.runner.AndroidJUnitRunner"; + private static final String TEST_RUNNER = "androidx.test.runner.AndroidJUnitRunner"; /** * A reference to the device under test. diff --git a/hostsidetests/harmfulappwarning/testapp/Android.mk b/hostsidetests/harmfulappwarning/testapp/Android.mk index 3ab50c41e4304de1c9445adf37cedef8feb1d2b7..34854f43c101cc3a339907ec5302ac4d062b2ad3 100644 --- a/hostsidetests/harmfulappwarning/testapp/Android.mk +++ b/hostsidetests/harmfulappwarning/testapp/Android.mk @@ -26,8 +26,8 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - compatibility-device-util \ + androidx.test.rules \ + compatibility-device-util-axt \ ub-uiautomator LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/harmfulappwarning/testapp/AndroidManifest.xml b/hostsidetests/harmfulappwarning/testapp/AndroidManifest.xml index 4f6bc699a0412e2380c899fd31ede1c1561cca90..f686dd7f491fe2542b22e1f07cf17ea92fcbeb2e 100644 --- a/hostsidetests/harmfulappwarning/testapp/AndroidManifest.xml +++ b/hostsidetests/harmfulappwarning/testapp/AndroidManifest.xml @@ -23,7 +23,7 @@ diff --git a/hostsidetests/harmfulappwarning/testapp/src/android/harmfulappwarning/testapp/HarmfulAppWarningDeviceTest.java b/hostsidetests/harmfulappwarning/testapp/src/android/harmfulappwarning/testapp/HarmfulAppWarningDeviceTest.java index c81702d088ac6144f3bf7e3aa6b010e8677acd62..88a31798157aaa05d337664dac3a62b91b5ad8fb 100644 --- a/hostsidetests/harmfulappwarning/testapp/src/android/harmfulappwarning/testapp/HarmfulAppWarningDeviceTest.java +++ b/hostsidetests/harmfulappwarning/testapp/src/android/harmfulappwarning/testapp/HarmfulAppWarningDeviceTest.java @@ -16,6 +16,16 @@ package android.harmfulappwarning.testapp; +import android.app.Instrumentation; +import android.content.Intent; +import android.support.test.uiautomator.By; +import android.support.test.uiautomator.UiDevice; +import android.support.test.uiautomator.UiObject2; +import android.support.test.uiautomator.Until; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import com.android.compatibility.common.util.BlockingBroadcastReceiver; import org.junit.After; @@ -24,15 +34,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import android.app.Instrumentation; -import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; - import java.util.concurrent.TimeUnit; /** diff --git a/hostsidetests/incident/apps/batterystatsapp/Android.mk b/hostsidetests/incident/apps/batterystatsapp/Android.mk index e1518effc05edd50b77d732bdbe6501c06be9353..822bb652801cb454130ea550d4f03ebb7a00cefd 100644 --- a/hostsidetests/incident/apps/batterystatsapp/Android.mk +++ b/hostsidetests/incident/apps/batterystatsapp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit org.apache.http.legacy LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/incident/apps/batterystatsapp/AndroidManifest.xml b/hostsidetests/incident/apps/batterystatsapp/AndroidManifest.xml index d3e5e26ee6988817a7ddb2849b59c0b1a4df595e..82b23112556c202acb63a7a398eb224d9dedfedd 100644 --- a/hostsidetests/incident/apps/batterystatsapp/AndroidManifest.xml +++ b/hostsidetests/incident/apps/batterystatsapp/AndroidManifest.xml @@ -66,6 +66,6 @@ - diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAlarmTest.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAlarmTest.java index c49a82493383b879bd71c51c1c04fdbc110d1870..9b6c23fbe93977f187c1db0a9dc042e1fb005c3f 100644 --- a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAlarmTest.java +++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAlarmTest.java @@ -24,10 +24,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsDeviceTestBase.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsDeviceTestBase.java index e53c21316686bc08ebedb01087ea2ecd3ef35db2..35b67c91a0177e1efad62035cd22bfee262a5dda 100644 --- a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsDeviceTestBase.java +++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsDeviceTestBase.java @@ -15,21 +15,15 @@ */ package com.android.server.cts.device.batterystats; -import static junit.framework.Assert.assertEquals; - import android.content.Context; import android.os.PowerManager; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.InstrumentationRegistry; -import android.util.Log; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; -import org.junit.Test; import org.junit.runner.RunWith; -import java.net.HttpURLConnection; -import java.net.URL; - /** * Used by BatteryStatsValidationTest. */ diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsJobDurationTests.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsJobDurationTests.java index 527f8bca035a45ac66986362faffff1e92d57f38..e4434e1c8cea4d181855ca1eee818dd9d69e168c 100644 --- a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsJobDurationTests.java +++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsJobDurationTests.java @@ -21,9 +21,10 @@ import static org.junit.Assert.fail; import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.ComponentName; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProcessStateTests.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProcessStateTests.java index 5c72aa46c68ab69545695d8b2b23764ea83ad9dc..c57f18e8260fe6ffb6bd5515198fdc269be5bb86 100644 --- a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProcessStateTests.java +++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProcessStateTests.java @@ -15,12 +15,11 @@ */ package com.android.server.cts.device.batterystats; -import android.app.Notification; -import android.app.NotificationManager; import android.content.Intent; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncTest.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncTest.java index daa6f5e89203d35491fa50c744a9491fb5b09698..927010e15b013f009c3eea0bcb7c7500cfb0363b 100644 --- a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncTest.java +++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncTest.java @@ -18,8 +18,9 @@ package com.android.server.cts.device.batterystats; import android.accounts.Account; import android.content.ContentResolver; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWakeLockTests.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWakeLockTests.java index 9956e793c291ce9915817bf66373fbee032b7ce1..4389c76b3e7d20061f050000d8edd6f347949264 100644 --- a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWakeLockTests.java +++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWakeLockTests.java @@ -15,11 +15,10 @@ */ package com.android.server.cts.device.batterystats; -import android.content.Context; import android.os.PowerManager; -import android.support.test.runner.AndroidJUnit4; -import org.junit.Before; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/incident/apps/boundwidgetapp/Android.mk b/hostsidetests/incident/apps/boundwidgetapp/Android.mk index 0b6a884c499089e2241e74ed4457ef9d1d7fe987..0a671a1cc6c21fd5e7f783367e6833d1aa17eb1f 100644 --- a/hostsidetests/incident/apps/boundwidgetapp/Android.mk +++ b/hostsidetests/incident/apps/boundwidgetapp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit android.test.base.stubs LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml b/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml index 312d05db0468dd9ee631d923bbde6f5d45dac893..9825d5c0824499c01026d0200897ca1700e45bf6 100644 --- a/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml +++ b/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml @@ -40,7 +40,7 @@ - - diff --git a/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ErrorsTests.java b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ErrorsTests.java index f5ce5d90600481d439f85e92241d0a25a1c25ccc..00296b3bd8e81e295c2974b8ef15ae0111937ea8 100644 --- a/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ErrorsTests.java +++ b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ErrorsTests.java @@ -22,17 +22,18 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.DropBoxManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + /** * Used by ErrorTest. Spawns misbehaving activities so reports will appear in Dropbox. */ diff --git a/hostsidetests/incident/apps/graphicsstatsapp/Android.mk b/hostsidetests/incident/apps/graphicsstatsapp/Android.mk index ebcea6bed28fad991bb59199fc60e647a223789a..5dcb56de344f8eee2415c1c85b7e35327c05def7 100644 --- a/hostsidetests/incident/apps/graphicsstatsapp/Android.mk +++ b/hostsidetests/incident/apps/graphicsstatsapp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/incident/apps/graphicsstatsapp/AndroidManifest.xml b/hostsidetests/incident/apps/graphicsstatsapp/AndroidManifest.xml index cfe80becd336ad98f2f7432b35c3507427dc0ee9..0f9a3a0ec9e0ae3a69a04261798c428994f9287e 100644 --- a/hostsidetests/incident/apps/graphicsstatsapp/AndroidManifest.xml +++ b/hostsidetests/incident/apps/graphicsstatsapp/AndroidManifest.xml @@ -23,6 +23,6 @@ - diff --git a/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/SimpleDrawFrameTests.java b/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/SimpleDrawFrameTests.java index b2b8b7d674e1d1bf356fa40b41137f5479f0b1da..56413f849a976e2d1b5f161e2533893b5bde27e5 100644 --- a/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/SimpleDrawFrameTests.java +++ b/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/SimpleDrawFrameTests.java @@ -15,15 +15,16 @@ */ package com.android.server.cts.device.graphicsstats; -import android.support.test.filters.LargeTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import androidx.test.filters.LargeTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * Used by GraphicsStatsTest. diff --git a/hostsidetests/incident/apps/netstatsapp/Android.mk b/hostsidetests/incident/apps/netstatsapp/Android.mk index 158fb3572ae9ff6612e1cbb7ed7defd922a78ebd..9f4af1d649f2300ada8670334a9eacea7e72cec2 100644 --- a/hostsidetests/incident/apps/netstatsapp/Android.mk +++ b/hostsidetests/incident/apps/netstatsapp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/incident/apps/netstatsapp/AndroidManifest.xml b/hostsidetests/incident/apps/netstatsapp/AndroidManifest.xml index b9d4d17e40f120bd7b75558d4098728c4a6a894d..df045fd3f8c8b1cc405d986dcf7042c1533059d5 100644 --- a/hostsidetests/incident/apps/netstatsapp/AndroidManifest.xml +++ b/hostsidetests/incident/apps/netstatsapp/AndroidManifest.xml @@ -23,6 +23,6 @@ - diff --git a/hostsidetests/incident/apps/netstatsapp/src/com/android/server/cts/netstats/NetstatsDeviceTest.java b/hostsidetests/incident/apps/netstatsapp/src/com/android/server/cts/netstats/NetstatsDeviceTest.java index bdc5fd33175a773effa092652ac18b3ccdd6b91b..e9ec71e6b5301e875877f5a36cd56fd4463d5980 100644 --- a/hostsidetests/incident/apps/netstatsapp/src/com/android/server/cts/netstats/NetstatsDeviceTest.java +++ b/hostsidetests/incident/apps/netstatsapp/src/com/android/server/cts/netstats/NetstatsDeviceTest.java @@ -16,9 +16,10 @@ package com.android.server.cts.netstats; import android.net.TrafficStats; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/incident/apps/notificationsapp/Android.mk b/hostsidetests/incident/apps/notificationsapp/Android.mk index af1619e7fe89ac0d94b458658d44ca7332647b1b..4281861e3054b5e3268dd3222e6df490e5fc3b92 100644 --- a/hostsidetests/incident/apps/notificationsapp/Android.mk +++ b/hostsidetests/incident/apps/notificationsapp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/incident/apps/notificationsapp/AndroidManifest.xml b/hostsidetests/incident/apps/notificationsapp/AndroidManifest.xml index efafd698e703013db7a28edd1133eb3f0a44f457..7872b9e0cc34c8cb08ba20c80fce31144a4d9685 100644 --- a/hostsidetests/incident/apps/notificationsapp/AndroidManifest.xml +++ b/hostsidetests/incident/apps/notificationsapp/AndroidManifest.xml @@ -22,6 +22,6 @@ - diff --git a/hostsidetests/incident/apps/procstatsapp/Android.mk b/hostsidetests/incident/apps/procstatsapp/Android.mk index 47b9c77350eea625c898fc39cd3df6f3c456c8a6..9676ee8be1976a7b7126d3474a2cf5134ef3377e 100644 --- a/hostsidetests/incident/apps/procstatsapp/Android.mk +++ b/hostsidetests/incident/apps/procstatsapp/Android.mk @@ -27,8 +27,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := test_current diff --git a/hostsidetests/incident/apps/procstatsapp/AndroidManifest.xml b/hostsidetests/incident/apps/procstatsapp/AndroidManifest.xml index a0cccb4d14d4176d923528104734987a7d8f3248..4b68a0e9be3359d052b7c21d820fad0b07493817 100644 --- a/hostsidetests/incident/apps/procstatsapp/AndroidManifest.xml +++ b/hostsidetests/incident/apps/procstatsapp/AndroidManifest.xml @@ -22,6 +22,6 @@ - diff --git a/hostsidetests/incident/src/com/android/server/cts/ProtoDumpTestCase.java b/hostsidetests/incident/src/com/android/server/cts/ProtoDumpTestCase.java index b17f3c4d46ddf0fd4e87a87c2e0ce7ecd6080c5a..13718a99c29c3b6a8aa878af20bc239183d613e3 100644 --- a/hostsidetests/incident/src/com/android/server/cts/ProtoDumpTestCase.java +++ b/hostsidetests/incident/src/com/android/server/cts/ProtoDumpTestCase.java @@ -38,9 +38,9 @@ import com.google.protobuf.MessageLite; import com.google.protobuf.Parser; import java.io.FileNotFoundException; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -70,7 +70,7 @@ public class ProtoDumpTestCase extends DeviceTestCase implements IBuildReceiver protected IBuildInfo mCtsBuild; - private static final String TEST_RUNNER = "android.support.test.runner.AndroidJUnitRunner"; + private static final String TEST_RUNNER = "androidx.test.runner.AndroidJUnitRunner"; @Override protected void setUp() throws Exception { diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk index 1727ad717db3ddec03aee5643e719af4aaa3c114..636d3ab3ec280b80d475349d7736d0d864d31ea2 100644 --- a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk +++ b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk @@ -29,7 +29,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_RESOURCE_DIR := res LOCAL_JAVA_LIBRARY := android.test.runner.stubs LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ hamcrest hamcrest-library \ ub-uiautomator \ CtsInputMethodServiceCommon \ diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml index e585bcbce3370109ec9ba2d2faaf008ea0f52370..fa6d62df6c085bb504371033e42c41063f6d59d5 100755 --- a/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml +++ b/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml @@ -33,7 +33,7 @@ diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java index 9b8e4e021729792a5daf5c61d495158b47864414..a4063874d7425d1c9a44517cd596d8363b032948 100644 --- a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java +++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java @@ -49,7 +49,7 @@ import android.inputmethodservice.cts.common.test.DeviceTestConstants; import android.inputmethodservice.cts.common.test.ShellCommandUtils; import android.inputmethodservice.cts.devicetest.SequenceMatcher.MatchResult; import android.os.SystemClock; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiObject2; import org.junit.Test; diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/TestHelper.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/TestHelper.java index dda48a07720b5ce848a2e3326e5a0393c6db1d72..20df53a9f4cd7dc1808aac468381eeb207f16abe 100644 --- a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/TestHelper.java +++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/TestHelper.java @@ -29,13 +29,13 @@ import android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventTyp import android.inputmethodservice.cts.common.EventProviderConstants.EventTableConstants; import android.inputmethodservice.cts.common.test.TestInfo; import android.net.Uri; -import androidx.annotation.IdRes; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; +import androidx.test.InstrumentationRegistry; + import java.io.IOException; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; diff --git a/hostsidetests/inputmethodservice/deviceside/edittextapp/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/edittextapp/AndroidManifest.xml index 756502322ae51825f7a842ee0f4ce61630555873..faebb9f640603f8b6281ccfcfe57fee546b33129 100755 --- a/hostsidetests/inputmethodservice/deviceside/edittextapp/AndroidManifest.xml +++ b/hostsidetests/inputmethodservice/deviceside/edittextapp/AndroidManifest.xml @@ -41,6 +41,6 @@ diff --git a/hostsidetests/jvmti/allocation-tracking/app/AndroidManifest.xml b/hostsidetests/jvmti/allocation-tracking/app/AndroidManifest.xml index 76d753cac96e4cad422146b358423b2fafcb0301..024f084a2570e06c81a612b4dd0745f8830fc32e 100755 --- a/hostsidetests/jvmti/allocation-tracking/app/AndroidManifest.xml +++ b/hostsidetests/jvmti/allocation-tracking/app/AndroidManifest.xml @@ -26,7 +26,7 @@ diff --git a/hostsidetests/jvmti/base/app/Android.mk b/hostsidetests/jvmti/base/app/Android.mk index 1c9b2769de354f2e576352eecb36420aa8444daf..5d755687700db78edbd5869decb83a0993397603 100644 --- a/hostsidetests/jvmti/base/app/Android.mk +++ b/hostsidetests/jvmti/base/app/Android.mk @@ -22,7 +22,7 @@ LOCAL_SDK_VERSION := current LOCAL_DEX_PREOPT := false LOCAL_JAVA_LIBRARIES := android.test.runner.stubs cts-junit LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner \ - compatibility-device-util \ + ctstestrunner-axt \ + compatibility-device-util-axt \ include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/base/app/src/android/jvmti/cts/JvmtiTestBase.java b/hostsidetests/jvmti/base/app/src/android/jvmti/cts/JvmtiTestBase.java index 0b54a93d7e135dc71b465b4a9f37bbf2b23d4fcd..c67f9b85407e2c85b443cd6b08afd06d7f2b5940 100644 --- a/hostsidetests/jvmti/base/app/src/android/jvmti/cts/JvmtiTestBase.java +++ b/hostsidetests/jvmti/base/app/src/android/jvmti/cts/JvmtiTestBase.java @@ -15,15 +15,16 @@ */ package android.jvmti.cts; -import android.support.test.filters.SmallTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; +import android.jvmti.JvmtiActivity; + +import androidx.test.filters.SmallTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Rule; import org.junit.runner.RunWith; -import android.jvmti.JvmtiActivity; import art.CtsMain; /** diff --git a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java index edc685a8d2d8ee3b0150443dd27f51cf98c8954d..c7ceba633a009b532881308b88d15bd3672b332f 100644 --- a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java +++ b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java @@ -45,7 +45,7 @@ import java.util.zip.ZipFile; * test run and attaches the agent. */ public class JvmtiHostTest extends DeviceTestCase implements IBuildReceiver, IAbiReceiver { - private static final String RUNNER = "android.support.test.runner.AndroidJUnitRunner"; + private static final String RUNNER = "androidx.test.runner.AndroidJUnitRunner"; // inject these options from HostTest directly using --set-option - diff --git a/hostsidetests/ui/appB/Android.mk b/hostsidetests/ui/appB/Android.mk index 6c64244be48680dead5bfbc2c4c56cc3d8c04c8f..11fc2b02669f59cccb2884d4ddd33cb3e37037aa 100644 --- a/hostsidetests/ui/appB/Android.mk +++ b/hostsidetests/ui/appB/Android.mk @@ -21,8 +21,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_STATIC_JAVA_LIBRARIES := \ - compatibility-device-util \ - ctstestrunner \ + compatibility-device-util-axt \ + ctstestrunner-axt \ LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/ui/appB/AndroidManifest.xml b/hostsidetests/ui/appB/AndroidManifest.xml index 0cd50924ca9a2d42db3a8b4fa5a3b88b5cbaa028..9b370c12784bb3a00ca1beecd6e3417313fe9198 100644 --- a/hostsidetests/ui/appB/AndroidManifest.xml +++ b/hostsidetests/ui/appB/AndroidManifest.xml @@ -40,7 +40,7 @@ - diff --git a/hostsidetests/ui/control/Android.mk b/hostsidetests/ui/control/Android.mk index e35c4f0c7466de5e5855035c1ec06e52acb3ce6a..2a30338216fdf7909d7def7d24134146189be009 100644 --- a/hostsidetests/ui/control/Android.mk +++ b/hostsidetests/ui/control/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner +LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt ctstestrunner-axt LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/hostsidetests/ui/control/AndroidManifest.xml b/hostsidetests/ui/control/AndroidManifest.xml index 2b6b0dd1ae548d694b426e613bc4cee44069b21f..85f0ba8fecef3c6de6291c4238ebe02f817ef1f4 100644 --- a/hostsidetests/ui/control/AndroidManifest.xml +++ b/hostsidetests/ui/control/AndroidManifest.xml @@ -26,7 +26,7 @@ + android:name="androidx.test.runner.AndroidJUnitRunner" > diff --git a/hostsidetests/ui/src/android/ui/cts/TaskSwitchingTest.java b/hostsidetests/ui/src/android/ui/cts/TaskSwitchingTest.java index 9f2bd4433574a0b98b8f76dc81c6c7744a376c52..623f01102537f30a7ab7905f933ea2f2c7bf428b 100644 --- a/hostsidetests/ui/src/android/ui/cts/TaskSwitchingTest.java +++ b/hostsidetests/ui/src/android/ui/cts/TaskSwitchingTest.java @@ -47,7 +47,7 @@ import java.util.Map; */ public class TaskSwitchingTest extends DeviceTestCase implements IAbiReceiver, IBuildReceiver { private static final String TAG = "TaskSwitchingTest"; - private final static String RUNNER = "android.support.test.runner.AndroidJUnitRunner"; + private final static String RUNNER = "androidx.test.runner.AndroidJUnitRunner"; private static final String RESULT_KEY = "COMPATIBILITY_TEST_RESULT"; private IBuildInfo mBuild; private ITestDevice mDevice; diff --git a/hostsidetests/usb/SerialTestApp/Android.mk b/hostsidetests/usb/SerialTestApp/Android.mk index 601c0ba284c4a62ddd59e285646182f8c3d63f8e..53b92666baad7b2a8a2dbb1cd656e3641bdc5595 100644 --- a/hostsidetests/usb/SerialTestApp/Android.mk +++ b/hostsidetests/usb/SerialTestApp/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner +LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/hostsidetests/usb/SerialTestApp/AndroidManifest.xml b/hostsidetests/usb/SerialTestApp/AndroidManifest.xml index 935c2373c8b1a1e53b83c99ea0db9a19adfb59cc..4a0810042d660cf4ea0445e56a112dc04efb7f01 100644 --- a/hostsidetests/usb/SerialTestApp/AndroidManifest.xml +++ b/hostsidetests/usb/SerialTestApp/AndroidManifest.xml @@ -27,5 +27,5 @@ + android:name="androidx.test.runner.AndroidJUnitRunner" /> diff --git a/hostsidetests/usb/SerialTestApp/src/com/android/cts/usb/serialtest/UsbSerialTest.java b/hostsidetests/usb/SerialTestApp/src/com/android/cts/usb/serialtest/UsbSerialTest.java index d239095d136d538e5bb318800f337077a245a9f9..e54d1cbaf18c5d55af839fa82c9d022a41044f20 100644 --- a/hostsidetests/usb/SerialTestApp/src/com/android/cts/usb/serialtest/UsbSerialTest.java +++ b/hostsidetests/usb/SerialTestApp/src/com/android/cts/usb/serialtest/UsbSerialTest.java @@ -17,9 +17,10 @@ package com.android.cts.usb.serialtest; import android.os.Build; -import android.support.test.runner.AndroidJUnit4; import android.util.Log; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hostsidetests/usb/src/com/android/cts/usb/TestUsbTest.java b/hostsidetests/usb/src/com/android/cts/usb/TestUsbTest.java index 0039337e9b2c92fe35a9e65ecea930018ad8891d..01b5d889fe015c237b7e744d2de4bb97d23c0f8a 100644 --- a/hostsidetests/usb/src/com/android/cts/usb/TestUsbTest.java +++ b/hostsidetests/usb/src/com/android/cts/usb/TestUsbTest.java @@ -46,7 +46,7 @@ import java.util.regex.Pattern; */ public class TestUsbTest extends DeviceTestCase implements IAbiReceiver, IBuildReceiver { - private static final String CTS_RUNNER = "android.support.test.runner.AndroidJUnitRunner"; + private static final String CTS_RUNNER = "androidx.test.runner.AndroidJUnitRunner"; private static final String PACKAGE_NAME = "com.android.cts.usb.serialtest"; private static final String TEST_CLASS_NAME = PACKAGE_NAME + ".UsbSerialTest"; private static final String APK_NAME="CtsUsbSerialTestApp.apk"; diff --git a/hostsidetests/webkit/app/Android.mk b/hostsidetests/webkit/app/Android.mk index 2b0be1c9c1c7dfb54a53274d4030e92cfa9b5d8d..98a7092bfddf54dcb9a0c07aac8072f32ead2974 100644 --- a/hostsidetests/webkit/app/Android.mk +++ b/hostsidetests/webkit/app/Android.mk @@ -22,10 +22,10 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := \ - compatibility-device-util \ - ctsdeviceutillegacy \ + compatibility-device-util-axt \ + ctsdeviceutillegacy-axt \ ctstestserver \ - ctstestrunner + ctstestrunner-axt LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/hostsidetests/webkit/app/AndroidManifest.xml b/hostsidetests/webkit/app/AndroidManifest.xml index cfd25d596f4602bd7318d0fd874e4c1db5368486..b7b17db9940df57fc784d2f9d8d25369bc4dddf9 100644 --- a/hostsidetests/webkit/app/AndroidManifest.xml +++ b/hostsidetests/webkit/app/AndroidManifest.xml @@ -38,7 +38,7 @@ diff --git a/hostsidetests/webkit/src/com/android/cts/webkit/WebViewHostSideStartupTest.java b/hostsidetests/webkit/src/com/android/cts/webkit/WebViewHostSideStartupTest.java index d2728dcb612eda9c8c12d7220355fcc6fd02425b..d403618d1b96ec5d23befca07364d67977cbbfe5 100644 --- a/hostsidetests/webkit/src/com/android/cts/webkit/WebViewHostSideStartupTest.java +++ b/hostsidetests/webkit/src/com/android/cts/webkit/WebViewHostSideStartupTest.java @@ -16,6 +16,7 @@ package com.android.cts.webkit; import android.platform.test.annotations.AppModeFull; + import com.android.ddmlib.testrunner.RemoteAndroidTestRunner; import com.android.ddmlib.testrunner.TestResult.TestStatus; import com.android.tradefed.device.DeviceNotAvailableException; @@ -27,7 +28,7 @@ import com.android.tradefed.testtype.DeviceTestCase; import java.util.Collection; public class WebViewHostSideStartupTest extends DeviceTestCase { - private static final String RUNNER = "android.support.test.runner.AndroidJUnitRunner"; + private static final String RUNNER = "androidx.test.runner.AndroidJUnitRunner"; private static final String DEVICE_WEBVIEW_STARTUP_PKG = "com.android.cts.webkit"; private static final String DEVICE_WEBVIEW_STARTUP_TEST_CLASS = "WebViewDeviceSideStartupTest"; diff --git a/libs/runner/Android.mk b/libs/runner/Android.mk index 15f64a323922aa5780926ca432ee00a0e0196688..f245351c5248ae337ab819cd0627cb4c7072b1dd 100644 --- a/libs/runner/Android.mk +++ b/libs/runner/Android.mk @@ -16,6 +16,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +# The legacy library that brings in android-support-test transitively + LOCAL_STATIC_JAVA_LIBRARIES := cts-test-runner LOCAL_MODULE_TAGS := optional @@ -25,3 +27,19 @@ LOCAL_MODULE := ctstestrunner LOCAL_SDK_VERSION := current include $(BUILD_STATIC_JAVA_LIBRARY) + + +# The library variant that brings in androidx.test transitively +include $(CLEAR_VARS) + +LOCAL_STATIC_JAVA_LIBRARIES := cts-test-runner-axt + +LOCAL_MODULE_TAGS := optional + +LOCAL_MODULE := ctstestrunner-axt + +LOCAL_SDK_VERSION := current + +include $(BUILD_STATIC_JAVA_LIBRARY) + + diff --git a/tests/AlarmManager/Android.mk b/tests/AlarmManager/Android.mk index 1b3ff17f8ec450775d83b12341976746707d2434..127cc5deb726dbf9a5b592a2c5d854beb6a40bc0 100755 --- a/tests/AlarmManager/Android.mk +++ b/tests/AlarmManager/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional # When built, explicitly put it in the data partition. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator android-support-test compatibility-device-util +LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator androidx.test.rules compatibility-device-util-axt LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, app/src) diff --git a/tests/AlarmManager/AndroidManifest.xml b/tests/AlarmManager/AndroidManifest.xml index f557b515b812e185827feec5e9a9577e7489b374..30395c059bc85553cc5a8651b0decba043069308 100644 --- a/tests/AlarmManager/AndroidManifest.xml +++ b/tests/AlarmManager/AndroidManifest.xml @@ -21,7 +21,7 @@ - diff --git a/tests/AlarmManager/src/android/alarmmanager/cts/AppStandbyTests.java b/tests/AlarmManager/src/android/alarmmanager/cts/AppStandbyTests.java index 36acd8274310e5e08016de69abc826a157df1ac3..8d8adb1901386450ef9d1b69f59d75840ca03f8b 100644 --- a/tests/AlarmManager/src/android/alarmmanager/cts/AppStandbyTests.java +++ b/tests/AlarmManager/src/android/alarmmanager/cts/AppStandbyTests.java @@ -31,12 +31,13 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.compatibility.common.util.AppStandbyUtils; import org.junit.After; diff --git a/tests/AlarmManager/src/android/alarmmanager/cts/BackgroundRestrictedAlarmsTest.java b/tests/AlarmManager/src/android/alarmmanager/cts/BackgroundRestrictedAlarmsTest.java index a981e5a6092942825990102513dc0f84db21171e..f85ec18be319942eff293796a65a87717178f566 100644 --- a/tests/AlarmManager/src/android/alarmmanager/cts/BackgroundRestrictedAlarmsTest.java +++ b/tests/AlarmManager/src/android/alarmmanager/cts/BackgroundRestrictedAlarmsTest.java @@ -19,8 +19,8 @@ package android.alarmmanager.cts; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.alarmmanager.alarmtestapp.cts.TestAlarmScheduler; import android.alarmmanager.alarmtestapp.cts.TestAlarmReceiver; +import android.alarmmanager.alarmtestapp.cts.TestAlarmScheduler; import android.app.AlarmManager; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -28,12 +28,13 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/JobScheduler/Android.mk b/tests/JobScheduler/Android.mk index 622c06ee58222e3ef27f9613087423220409fba8..116d74f4591332438dd6307fcbce4ccfb3dc743d 100755 --- a/tests/JobScheduler/Android.mk +++ b/tests/JobScheduler/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional # When built, explicitly put it in the data partition. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ub-uiautomator android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt ub-uiautomator androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/tests/JobScheduler/AndroidManifest.xml b/tests/JobScheduler/AndroidManifest.xml index 915536c9c4c4ddca810ad870e2d8a84a330790ee..db0b6bbfd1e6f72ee298da3da86fd3e6d6762d52 100755 --- a/tests/JobScheduler/AndroidManifest.xml +++ b/tests/JobScheduler/AndroidManifest.xml @@ -41,7 +41,7 @@ diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java index e624a62f9af8a00f3caef435be93087af6319c65..a3e934379a888a94c6f0f74898f40a2ddc819d0d 100644 --- a/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java +++ b/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java @@ -36,12 +36,13 @@ import android.jobscheduler.cts.jobtestapp.TestActivity; import android.jobscheduler.cts.jobtestapp.TestJobSchedulerReceiver; import android.os.PowerManager; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.util.Log; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.compatibility.common.util.AppStandbyUtils; import org.junit.After; diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/DeviceStatesTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/DeviceStatesTest.java index 10b84d6cf8fe61faaf9944c1f8f8ca8ea46acd52..8fc13bec40382b6d908cea8e3e582b28dfc187b0 100644 --- a/tests/JobScheduler/src/android/jobscheduler/cts/DeviceStatesTest.java +++ b/tests/JobScheduler/src/android/jobscheduler/cts/DeviceStatesTest.java @@ -19,9 +19,10 @@ package android.jobscheduler.cts; import android.annotation.TargetApi; import android.app.job.JobInfo; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.UiDevice; +import androidx.test.InstrumentationRegistry; + /** * Make sure the state of {@link android.app.job.JobScheduler} is correct. */ diff --git a/tests/JobSchedulerSharedUid/Android.mk b/tests/JobSchedulerSharedUid/Android.mk index 416c2e39b1c7602ec06783df9229a0d3f2e2426e..0b9912c9d22331f2725a7a9237b8c9982117251c 100755 --- a/tests/JobSchedulerSharedUid/Android.mk +++ b/tests/JobSchedulerSharedUid/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional # When built, explicitly put it in the data partition. LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ub-uiautomator android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt ub-uiautomator androidx.test.rules LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/tests/JobSchedulerSharedUid/AndroidManifest.xml b/tests/JobSchedulerSharedUid/AndroidManifest.xml index 5cf9ce55a997fed3a36c73f46715d1ddb1ad3ec3..824b73adc5f8f6de6c833ab6488d90370c20510d 100755 --- a/tests/JobSchedulerSharedUid/AndroidManifest.xml +++ b/tests/JobSchedulerSharedUid/AndroidManifest.xml @@ -40,7 +40,7 @@ diff --git a/tests/JobSchedulerSharedUid/jobperm/Android.mk b/tests/JobSchedulerSharedUid/jobperm/Android.mk index 8be235f4fc6ac93dea3297b50da653bc7e7d7212..44ecdf32dbd81f29d7bc128bd9022e3b1869c8a4 100644 --- a/tests/JobSchedulerSharedUid/jobperm/Android.mk +++ b/tests/JobSchedulerSharedUid/jobperm/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - compatibility-device-util \ + compatibility-device-util-axt \ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ diff --git a/tests/JobSchedulerSharedUid/shareduid/Android.mk b/tests/JobSchedulerSharedUid/shareduid/Android.mk index 1376b4e9af0040666c44370bf43c4a66495526e5..cfc89cdeec91aa6acd1f956d10063d1971e2b69f 100644 --- a/tests/JobSchedulerSharedUid/shareduid/Android.mk +++ b/tests/JobSchedulerSharedUid/shareduid/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - compatibility-device-util \ + compatibility-device-util-axt \ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ diff --git a/tests/ProcessTest/AndroidManifest.xml b/tests/ProcessTest/AndroidManifest.xml index c7cf6353a23f37cbab79fc5577e5510522a9309d..f2d7202d0815a716390dddec156fd25e206f30f7 100644 --- a/tests/ProcessTest/AndroidManifest.xml +++ b/tests/ProcessTest/AndroidManifest.xml @@ -18,7 +18,7 @@ android:sharedUserId="com.android.cts.process.uidpid_test"> - diff --git a/tests/acceleration/Android.mk b/tests/acceleration/Android.mk index cef437904c9ddef20c8a5b8b88e7c19f045930a9..789a8f43bea03fa06e3b5aeeac9ccd64b3cb4779 100644 --- a/tests/acceleration/Android.mk +++ b/tests/acceleration/Android.mk @@ -25,7 +25,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner compatibility-device-util + ctstestrunner-axt compatibility-device-util-axt LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs diff --git a/tests/acceleration/AndroidManifest.xml b/tests/acceleration/AndroidManifest.xml index 1a21554afd0160d3d2bc6f96faae8ca028e1cebc..1aa4e64e423c1f594f918898673a48d6516786da 100644 --- a/tests/acceleration/AndroidManifest.xml +++ b/tests/acceleration/AndroidManifest.xml @@ -28,7 +28,7 @@ android:hardwareAccelerated="false" /> - - - - -