diff options
113 files changed, 265 insertions, 225 deletions
diff --git a/core/tests/BroadcastRadioTests/Android.mk b/core/tests/BroadcastRadioTests/Android.mk index 6b0484ec366d..faffc4b28a58 100644 --- a/core/tests/BroadcastRadioTests/Android.mk +++ b/core/tests/BroadcastRadioTests/Android.mk @@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := tests # LOCAL_SDK_VERSION := current LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util androidx.test.rules testng +LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt androidx.test.rules testng LOCAL_JAVA_LIBRARIES := android.test.base diff --git a/keystore/tests/Android.mk b/keystore/tests/Android.mk index 596e5f530970..99d3197f8bf3 100644 --- a/keystore/tests/Android.mk +++ b/keystore/tests/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test + androidx.test.rules hamcrest-library LOCAL_PACKAGE_NAME := KeystoreTests LOCAL_PRIVATE_PLATFORM_APIS := true diff --git a/keystore/tests/AndroidManifest.xml b/keystore/tests/AndroidManifest.xml index 9bf2d0c761e6..6833cd1e35b9 100644 --- a/keystore/tests/AndroidManifest.xml +++ b/keystore/tests/AndroidManifest.xml @@ -20,7 +20,7 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="android.security.tests" android:label="Tests for Keystore"> </instrumentation> diff --git a/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java b/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java index 32f8ec44d11f..fca2775a34bb 100644 --- a/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java +++ b/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java @@ -22,16 +22,20 @@ import static org.junit.Assert.assertThat; import android.os.Parcel; import android.security.keystore.KeyGenParameterSpec; -import android.security.keystore.ParcelableKeyGenParameterSpec; import android.security.keystore.KeyProperties; -import android.support.test.runner.AndroidJUnit4; +import android.security.keystore.ParcelableKeyGenParameterSpec; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + import java.math.BigInteger; import java.security.spec.ECGenParameterSpec; import java.security.spec.RSAKeyGenParameterSpec; import java.util.Date; + import javax.security.auth.x500.X500Principal; -import org.junit.Test; -import org.junit.runner.RunWith; /** Unit tests for {@link ParcelableKeyGenParameterSpec}. */ @RunWith(AndroidJUnit4.class) diff --git a/keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java b/keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java index 865cad472eb5..b2edfd05d13f 100644 --- a/keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java +++ b/keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java @@ -20,10 +20,12 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; +import android.security.ParcelableKeyGenParameterSpecTest; import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.KeyProperties; -import android.security.ParcelableKeyGenParameterSpecTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/media/tests/MediaFrameworkTest/Android.mk b/media/tests/MediaFrameworkTest/Android.mk index fb473f0581c9..167d255af74c 100644 --- a/media/tests/MediaFrameworkTest/Android.mk +++ b/media/tests/MediaFrameworkTest/Android.mk @@ -9,7 +9,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_STATIC_JAVA_LIBRARIES := \ mockito-target-minus-junit4 \ - android-support-test \ + androidx.test.rules \ android-ex-camera2 LOCAL_PACKAGE_NAME := mediaframeworktest diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml index e50a3757d14f..fb2d630faaf6 100644 --- a/media/tests/MediaFrameworkTest/AndroidManifest.xml +++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml @@ -86,7 +86,7 @@ android:label="MediaFramework integration tests InstrumentationRunner"> </instrumentation> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.mediaframeworktest" android:label="media framework tests"> </instrumentation> diff --git a/media/tests/MediaFrameworkTest/AndroidTest.xml b/media/tests/MediaFrameworkTest/AndroidTest.xml index 204959ff2749..132028ce98dc 100644 --- a/media/tests/MediaFrameworkTest/AndroidTest.xml +++ b/media/tests/MediaFrameworkTest/AndroidTest.xml @@ -21,7 +21,7 @@ <option name="test-tag" value="MediaFrameworkTest" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.mediaframeworktest" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> <option name="hidden-api-checks" value="false"/> </test> </configuration> diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java index feac63d40710..701454c32e4b 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java @@ -28,7 +28,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.mtp.MtpConstants; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; import libcore.net.MimeUtils; diff --git a/services/tests/runtests.py b/services/tests/runtests.py index f19cc5d567ec..4c8b4bad8019 100755 --- a/services/tests/runtests.py +++ b/services/tests/runtests.py @@ -19,7 +19,7 @@ import subprocess import sys INSTRUMENTED_PACKAGE_RUNNER = ('com.android.frameworks.servicestests/' - 'android.support.test.runner.AndroidJUnitRunner') + 'androidx.test.runner.AndroidJUnitRunner') PACKAGE_WHITELIST = ( "com.android.server", diff --git a/startop/iorap/tests/Android.bp b/startop/iorap/tests/Android.bp index 5ac4a46b81f1..4359978f5814 100644 --- a/startop/iorap/tests/Android.bp +++ b/startop/iorap/tests/Android.bp @@ -29,7 +29,7 @@ java_library { // test android dependencies "platform-test-annotations", - "android-support-test", + "androidx.test.rules", // test framework dependencies "mockito-target-inline-minus-junit4", // "mockito-target-minus-junit4", diff --git a/startop/iorap/tests/AndroidManifest.xml b/startop/iorap/tests/AndroidManifest.xml index 99f4add6579f..b967e7207a3f 100644 --- a/startop/iorap/tests/AndroidManifest.xml +++ b/startop/iorap/tests/AndroidManifest.xml @@ -22,7 +22,7 @@ <!--suppress AndroidDomInspection --> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.google.android.startop.iorap.tests" /> <!-- diff --git a/startop/iorap/tests/AndroidTest.xml b/startop/iorap/tests/AndroidTest.xml index 919154d3e48a..bcd11033bed3 100644 --- a/startop/iorap/tests/AndroidTest.xml +++ b/startop/iorap/tests/AndroidTest.xml @@ -44,7 +44,7 @@ <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.google.android.startop.iorap.tests" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> </test> </configuration> diff --git a/startop/iorap/tests/src/com/google/android/startop/iorap/IIorapIntegrationTest.kt b/startop/iorap/tests/src/com/google/android/startop/iorap/IIorapIntegrationTest.kt index 16dcbe20f46a..b1e6194e0c92 100644 --- a/startop/iorap/tests/src/com/google/android/startop/iorap/IIorapIntegrationTest.kt +++ b/startop/iorap/tests/src/com/google/android/startop/iorap/IIorapIntegrationTest.kt @@ -14,12 +14,14 @@ package com.google.android.startop.iorap -import android.net.Uri import android.os.ServiceManager -import android.support.test.filters.MediumTest +import androidx.test.filters.MediumTest import org.junit.Test -import org.junit.Ignore -import org.mockito.Mockito.* +import org.mockito.Mockito.argThat +import org.mockito.Mockito.eq +import org.mockito.Mockito.inOrder +import org.mockito.Mockito.spy +import org.mockito.Mockito.timeout // @Ignore("Test is disabled until iorapd is added to init and there's selinux policies for it") @MediumTest @@ -27,7 +29,7 @@ class IIorapIntegrationTest { /** * @throws ServiceManager.ServiceNotFoundException if iorapd service could not be found */ - private val iorapService : IIorap by lazy { + private val iorapService: IIorap by lazy { // TODO: connect to 'iorapd.stub' which doesn't actually do any work other than reply. IIorap.Stub.asInterface(ServiceManager.getServiceOrThrow("iorapd")) @@ -39,7 +41,7 @@ class IIorapIntegrationTest { // A dummy binder stub implementation is required to use with mockito#spy. // Mockito overrides the methods at runtime and tracks how methods were invoked. - open class DummyTaskListener : ITaskListener.Stub() { + open class DummyTaskListener : ITaskListener.Stub() { // Note: make parameters nullable to avoid the kotlin IllegalStateExceptions // from using the mockito matchers (eq, argThat, etc). override fun onProgress(requestId: RequestId?, result: TaskResult?) { @@ -49,7 +51,7 @@ class IIorapIntegrationTest { } } - private fun testAnyMethod(func : (RequestId) -> Unit) { + private fun testAnyMethod(func: (RequestId) -> Unit) { val taskListener = spy(DummyTaskListener())!! try { @@ -68,14 +70,13 @@ class IIorapIntegrationTest { // The "stub" behavior of iorapd is that every request immediately gets a response of // BEGAN,ONGOING,COMPLETED - inOrder.verify(taskListener, timeout(100)). - onProgress(eq(requestId), argThat { it!!.state == TaskResult.STATE_BEGAN }) - inOrder.verify(taskListener, timeout(100)). - onProgress(eq(requestId), argThat { it!!.state == TaskResult.STATE_ONGOING }) - inOrder.verify(taskListener, timeout(100)). - onComplete(eq(requestId), argThat { it!!.state == TaskResult.STATE_COMPLETED }) + inOrder.verify(taskListener, timeout(100)) + .onProgress(eq(requestId), argThat { it!!.state == TaskResult.STATE_BEGAN }) + inOrder.verify(taskListener, timeout(100)) + .onProgress(eq(requestId), argThat { it!!.state == TaskResult.STATE_ONGOING }) + inOrder.verify(taskListener, timeout(100)) + .onComplete(eq(requestId), argThat { it!!.state == TaskResult.STATE_COMPLETED }) inOrder.verifyNoMoreInteractions() - } finally { // iorapService.setTaskListener(null) // FIXME: null is broken, C++ side sees a non-null object. @@ -96,7 +97,7 @@ class IIorapIntegrationTest { @Test fun testOnAppIntentEvent() { - testAnyMethod { requestId : RequestId -> + testAnyMethod { requestId: RequestId -> iorapService.onAppIntentEvent(requestId, AppIntentEvent.createDefaultIntentChanged( ActivityInfo("dont care", "dont care"), ActivityInfo("dont care 2", "dont care 2"))) @@ -105,7 +106,7 @@ class IIorapIntegrationTest { @Test fun testOnSystemServiceEvent() { - testAnyMethod { requestId : RequestId -> + testAnyMethod { requestId: RequestId -> iorapService.onSystemServiceEvent(requestId, SystemServiceEvent(SystemServiceEvent.TYPE_START)) } @@ -113,9 +114,9 @@ class IIorapIntegrationTest { @Test fun testOnSystemServiceUserEvent() { - testAnyMethod { requestId : RequestId -> + testAnyMethod { requestId: RequestId -> iorapService.onSystemServiceUserEvent(requestId, - SystemServiceUserEvent(SystemServiceUserEvent.TYPE_START_USER,0)) + SystemServiceUserEvent(SystemServiceUserEvent.TYPE_START_USER, 0)) } } } diff --git a/startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt b/startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt index 4abbb3e9f162..8fa0cde0f9cc 100644 --- a/startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt +++ b/startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt @@ -17,7 +17,7 @@ package com.google.android.startop.iorap import android.net.Uri import android.os.Parcel import android.os.Parcelable -import android.support.test.filters.SmallTest +import androidx.test.filters.SmallTest import org.junit.Test import org.junit.runner.RunWith import com.google.common.truth.Truth.assertThat @@ -29,7 +29,7 @@ import org.junit.runners.Parameterized */ @SmallTest @RunWith(Parameterized::class) -class ParcelablesTest<T : Parcelable>(private val inputData : InputData<T>) { +class ParcelablesTest<T : Parcelable>(private val inputData: InputData<T>) { companion object { private val initialRequestId = RequestId.nextValueForSequence()!! @@ -73,19 +73,19 @@ class ParcelablesTest<T : Parcelable>(private val inputData : InputData<T>) { TaskResult(TaskResult.STATE_ONGOING)) ) - private fun newActivityInfo() : ActivityInfo { + private fun newActivityInfo(): ActivityInfo { return ActivityInfo("some package", "some activity") } - private fun newActivityInfoOther() : ActivityInfo { + private fun newActivityInfoOther(): ActivityInfo { return ActivityInfo("some package 2", "some activity 2") } - private fun newUri() : Uri { + private fun newUri(): Uri { return Uri.parse("https://www.google.com") } - private fun cloneRequestId(requestId: RequestId) : RequestId { + private fun cloneRequestId(requestId: RequestId): RequestId { val constructor = requestId::class.java.declaredConstructors[0] constructor.isAccessible = true return constructor.newInstance(requestId.requestId) as RequestId @@ -108,7 +108,7 @@ class ParcelablesTest<T : Parcelable>(private val inputData : InputData<T>) { @Test fun testParcelRoundTrip() { // calling writeToParcel and then T::CREATOR.createFromParcel would return the same data. - val assertParcels = { it : T, data : InputData<T> -> + val assertParcels = { it: T, data: InputData<T> -> val parcel = Parcel.obtain() it.writeToParcel(parcel, 0) parcel.setDataPosition(0) // future reads will see all previous writes. @@ -121,7 +121,7 @@ class ParcelablesTest<T : Parcelable>(private val inputData : InputData<T>) { assertParcels(inputData.validOther, inputData) } - data class InputData<T : Parcelable>(val valid : T, val validCopy : T, val validOther : T) { + data class InputData<T : Parcelable>(val valid: T, val validCopy: T, val validOther: T) { val kls = valid.javaClass init { assertThat(valid).isNotSameAs(validCopy) @@ -130,8 +130,8 @@ class ParcelablesTest<T : Parcelable>(private val inputData : InputData<T>) { assertThat(validOther.javaClass).isEqualTo(valid.javaClass) } - fun createFromParcel(parcel : Parcel) : T { - val field = kls.getDeclaredField("CREATOR") + fun createFromParcel(parcel: Parcel): T { + val field = kls.getDeclaredField("CREATOR") val creator = field.get(null) as Parcelable.Creator<T> return creator.createFromParcel(parcel) diff --git a/startop/view_compiler/dex_builder_test/Android.bp b/startop/view_compiler/dex_builder_test/Android.bp index ac60e966fe43..22a3cfafbc44 100644 --- a/startop/view_compiler/dex_builder_test/Android.bp +++ b/startop/view_compiler/dex_builder_test/Android.bp @@ -43,7 +43,7 @@ android_test { sdk_version: "current", data: [":generate_dex_testcases", ":generate_compiled_layout1", ":generate_compiled_layout2"], static_libs: [ - "android-support-test", + "androidx.test.rules", "guava", ], manifest: "AndroidManifest.xml", diff --git a/startop/view_compiler/dex_builder_test/AndroidManifest.xml b/startop/view_compiler/dex_builder_test/AndroidManifest.xml index 6ac5fc5db345..b33566363286 100644 --- a/startop/view_compiler/dex_builder_test/AndroidManifest.xml +++ b/startop/view_compiler/dex_builder_test/AndroidManifest.xml @@ -22,7 +22,7 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="android.startop.test" android:label="DexBuilder Tests"/> diff --git a/startop/view_compiler/dex_builder_test/AndroidTest.xml b/startop/view_compiler/dex_builder_test/AndroidTest.xml index 92e2a718bcce..82509b960f24 100644 --- a/startop/view_compiler/dex_builder_test/AndroidTest.xml +++ b/startop/view_compiler/dex_builder_test/AndroidTest.xml @@ -31,6 +31,6 @@ <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="android.startop.test" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> </test> </configuration> diff --git a/startop/view_compiler/dex_builder_test/src/android/startop/test/DexBuilderTest.java b/startop/view_compiler/dex_builder_test/src/android/startop/test/DexBuilderTest.java index 42d4161ee81e..f7b1674894f5 100644 --- a/startop/view_compiler/dex_builder_test/src/android/startop/test/DexBuilderTest.java +++ b/startop/view_compiler/dex_builder_test/src/android/startop/test/DexBuilderTest.java @@ -14,18 +14,14 @@ package android.startop.test; -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import com.google.common.io.ByteStreams; -import dalvik.system.InMemoryDexClassLoader; import dalvik.system.PathClassLoader; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; + import org.junit.Assert; import org.junit.Test; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + // Adding tests here requires changes in several other places. See README.md in // the view_compiler directory for more information. public class DexBuilderTest { diff --git a/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java b/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java index a3b1b6c11ac3..3dfb20c2e524 100644 --- a/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java +++ b/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java @@ -15,18 +15,15 @@ package android.startop.test; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.view.View; -import com.google.common.io.ByteStreams; -import dalvik.system.InMemoryDexClassLoader; + +import androidx.test.InstrumentationRegistry; + import dalvik.system.PathClassLoader; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; -import org.junit.Assert; + import org.junit.Test; +import java.lang.reflect.Method; + // Adding tests here requires changes in several other places. See README.md in // the view_compiler directory for more information. public class LayoutCompilerTest { diff --git a/tests/ActivityManagerPerfTests/tests/Android.mk b/tests/ActivityManagerPerfTests/tests/Android.mk index f23a665dc5b2..e1f56b8ba55f 100644 --- a/tests/ActivityManagerPerfTests/tests/Android.mk +++ b/tests/ActivityManagerPerfTests/tests/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ apct-perftests-utils \ ActivityManagerPerfTestsUtils diff --git a/tests/ActivityManagerPerfTests/tests/AndroidManifest.xml b/tests/ActivityManagerPerfTests/tests/AndroidManifest.xml index a1ab33a96248..04aef47419d0 100644 --- a/tests/ActivityManagerPerfTests/tests/AndroidManifest.xml +++ b/tests/ActivityManagerPerfTests/tests/AndroidManifest.xml @@ -25,6 +25,6 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.frameworks.perftests.amtests"/> </manifest> diff --git a/tests/ActivityManagerPerfTests/tests/AndroidTest.xml b/tests/ActivityManagerPerfTests/tests/AndroidTest.xml index ffb5404d7d94..76c40b2e3dc6 100644 --- a/tests/ActivityManagerPerfTests/tests/AndroidTest.xml +++ b/tests/ActivityManagerPerfTests/tests/AndroidTest.xml @@ -24,6 +24,6 @@ <option name="test-tag" value="ActivityManagerPerfTests"/> <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="com.android.frameworks.perftests.amtests"/> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> </test> </configuration>
\ No newline at end of file diff --git a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/BasePerfTest.java b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/BasePerfTest.java index 58fb136ae9b3..daff76f4f522 100644 --- a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/BasePerfTest.java +++ b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/BasePerfTest.java @@ -21,7 +21,8 @@ import android.content.Intent; import android.content.ServiceConnection; import android.perftests.utils.ManualBenchmarkState; import android.perftests.utils.PerfManualStatusReporter; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import com.android.frameworks.perftests.am.util.TargetPackageUtils; import com.android.frameworks.perftests.am.util.TimeReceiver; diff --git a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/BroadcastPerfTest.java b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/BroadcastPerfTest.java index f7dab03f10ee..bc528d4d4fb7 100644 --- a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/BroadcastPerfTest.java +++ b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/BroadcastPerfTest.java @@ -17,8 +17,9 @@ package com.android.frameworks.perftests.am.tests; import android.content.Intent; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.perftests.am.util.Constants; diff --git a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ContentProviderPerfTest.java b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ContentProviderPerfTest.java index 3bf56ce8b085..8e8221954ad6 100644 --- a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ContentProviderPerfTest.java +++ b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ContentProviderPerfTest.java @@ -17,8 +17,9 @@ package com.android.frameworks.perftests.am.tests; import android.content.ContentProviderClient; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.perftests.am.util.TargetPackageUtils; diff --git a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceBindPerfTest.java b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceBindPerfTest.java index e1263db61b8b..996c5a5c5584 100644 --- a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceBindPerfTest.java +++ b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceBindPerfTest.java @@ -21,8 +21,9 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.os.IBinder; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.perftests.am.util.Constants; import com.android.frameworks.perftests.am.util.TargetPackageUtils; diff --git a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java index f05f32382e53..ba2064005937 100644 --- a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java +++ b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java @@ -19,8 +19,9 @@ package com.android.frameworks.perftests.am.tests; import android.content.ComponentName; import android.content.Intent; import android.content.ServiceConnection; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.perftests.am.util.Constants; import com.android.frameworks.perftests.am.util.TargetPackageUtils; diff --git a/tests/ActivityManagerPerfTests/utils/Android.mk b/tests/ActivityManagerPerfTests/utils/Android.mk index 60c94239d85f..7a7471dd6cd8 100644 --- a/tests/ActivityManagerPerfTests/utils/Android.mk +++ b/tests/ActivityManagerPerfTests/utils/Android.mk @@ -23,7 +23,7 @@ LOCAL_SRC_FILES := \ src/com/android/frameworks/perftests/am/util/ITimeReceiverCallback.aidl LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ junit \ ub-uiautomator diff --git a/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java b/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java index 67071d204eff..fc787bafa93a 100644 --- a/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java +++ b/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java @@ -19,10 +19,11 @@ package com.android.frameworks.perftests.am.util; import android.content.Intent; import android.os.RemoteException; import android.os.ResultReceiver; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.UiDevice; import android.util.Log; +import androidx.test.InstrumentationRegistry; + import java.io.IOException; public class Utils { diff --git a/tests/AppLaunch/Android.mk b/tests/AppLaunch/Android.mk index 1fb548b0edde..f50bca560f83 100644 --- a/tests/AppLaunch/Android.mk +++ b/tests/AppLaunch/Android.mk @@ -12,7 +12,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.base android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java index 5ea8ff1c4861..9d7319f7d337 100644 --- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java +++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java @@ -30,11 +30,12 @@ import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.os.UserHandle; -import android.support.test.rule.logging.AtraceLogger; import android.test.InstrumentationTestCase; import android.test.InstrumentationTestRunner; import android.util.Log; +import androidx.test.rule.logging.AtraceLogger; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -51,6 +52,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; + /** * This test is intended to measure the time it takes for the apps to start. * Names of the applications are passed in command line, and the diff --git a/tests/AppLaunchWear/Android.mk b/tests/AppLaunchWear/Android.mk index 6d083661324d..332b6808ace8 100644 --- a/tests/AppLaunchWear/Android.mk +++ b/tests/AppLaunchWear/Android.mk @@ -12,7 +12,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.base android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/tests/AppLaunchWear/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunchWear/src/com/android/tests/applaunch/AppLaunch.java index d36d84e8f51d..97701c61011e 100644 --- a/tests/AppLaunchWear/src/com/android/tests/applaunch/AppLaunch.java +++ b/tests/AppLaunchWear/src/com/android/tests/applaunch/AppLaunch.java @@ -30,16 +30,16 @@ import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.os.UserHandle; -import android.support.test.rule.logging.AtraceLogger; import android.test.InstrumentationTestCase; import android.test.InstrumentationTestRunner; import android.util.Log; +import androidx.test.rule.logging.AtraceLogger; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -52,6 +52,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; + /** * This test is intended to measure the time it takes for the apps to start. * Names of the applications are passed in command line, and the diff --git a/tests/BackgroundDexOptServiceIntegrationTests/Android.mk b/tests/BackgroundDexOptServiceIntegrationTests/Android.mk index b10305d96fce..f47cf96446ba 100644 --- a/tests/BackgroundDexOptServiceIntegrationTests/Android.mk +++ b/tests/BackgroundDexOptServiceIntegrationTests/Android.mk @@ -24,7 +24,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ LOCAL_PACKAGE_NAME := BackgroundDexOptServiceIntegrationTests LOCAL_PRIVATE_PLATFORM_APIS := true diff --git a/tests/BackgroundDexOptServiceIntegrationTests/AndroidManifest.xml b/tests/BackgroundDexOptServiceIntegrationTests/AndroidManifest.xml index afae155f88fe..aec9f77cf922 100644 --- a/tests/BackgroundDexOptServiceIntegrationTests/AndroidManifest.xml +++ b/tests/BackgroundDexOptServiceIntegrationTests/AndroidManifest.xml @@ -34,7 +34,7 @@ </application> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.frameworks.bgdexopttest" android:label="Integration test for BackgroundDexOptService" /> </manifest> diff --git a/tests/BackgroundDexOptServiceIntegrationTests/AndroidTest.xml b/tests/BackgroundDexOptServiceIntegrationTests/AndroidTest.xml index 9bb1e280b861..a532422a38d3 100644 --- a/tests/BackgroundDexOptServiceIntegrationTests/AndroidTest.xml +++ b/tests/BackgroundDexOptServiceIntegrationTests/AndroidTest.xml @@ -50,6 +50,6 @@ <option name="test-tag" value="BackgroundDexOptServiceIntegrationTests"/> <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="com.android.frameworks.bgdexopttest"/> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> </test> </configuration> diff --git a/tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java b/tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java index fd20f4a1fa77..7d826f7172da 100644 --- a/tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java +++ b/tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java @@ -17,17 +17,16 @@ package com.android.server.pm; import android.app.AlarmManager; -import android.app.UiAutomation; import android.content.Context; import android.os.Environment; import android.os.ParcelFileDescriptor; import android.os.SystemProperties; import android.os.storage.StorageManager; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.test.InstrumentationRegistry; + import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/Camera2Tests/CameraToo/tests/Android.mk b/tests/Camera2Tests/CameraToo/tests/Android.mk index eb8f6c306862..fe4dc42aa7d9 100644 --- a/tests/Camera2Tests/CameraToo/tests/Android.mk +++ b/tests/Camera2Tests/CameraToo/tests/Android.mk @@ -20,6 +20,6 @@ LOCAL_PACKAGE_NAME := CameraTooTests LOCAL_INSTRUMENTATION_FOR := CameraToo LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under,src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4 +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules mockito-target-minus-junit4 include $(BUILD_PACKAGE) diff --git a/tests/Camera2Tests/CameraToo/tests/AndroidManifest.xml b/tests/Camera2Tests/CameraToo/tests/AndroidManifest.xml index 30210bae5cd1..8d3574929ca8 100644 --- a/tests/Camera2Tests/CameraToo/tests/AndroidManifest.xml +++ b/tests/Camera2Tests/CameraToo/tests/AndroidManifest.xml @@ -23,7 +23,7 @@ <application android:label="CameraToo"> <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.example.android.camera2.cameratoo" android:label="CameraToo tests" /> </manifest> diff --git a/tests/Compatibility/Android.mk b/tests/Compatibility/Android.mk index 9c47a2610223..643f9ebd5f15 100644 --- a/tests/Compatibility/Android.mk +++ b/tests/Compatibility/Android.mk @@ -17,7 +17,7 @@ include $(CLEAR_VARS) # We only want this apk build for tests. LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules # Include all test java files. LOCAL_SRC_FILES := \ $(call all-java-files-under, src) diff --git a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java index 95eb5c9e7770..d683ec746a61 100644 --- a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java +++ b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java @@ -33,10 +33,11 @@ import android.os.Bundle; import android.os.DropBoxManager; import android.os.RemoteException; import android.os.ServiceManager; -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.Assert; import org.junit.Before; diff --git a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibilityRunner.java b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibilityRunner.java index b61ec346f041..960ea4966958 100644 --- a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibilityRunner.java +++ b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibilityRunner.java @@ -16,7 +16,7 @@ package com.android.compatibilitytest; -import android.support.test.runner.AndroidJUnitRunner; +import androidx.test.runner.AndroidJUnitRunner; // empty subclass to maintain backwards compatibility on host-side harness public class AppCompatibilityRunner extends AndroidJUnitRunner {} diff --git a/tests/DynamicCodeLoggerIntegrationTests/Android.mk b/tests/DynamicCodeLoggerIntegrationTests/Android.mk index f324eb10a7b0..62c1ba89653c 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/Android.mk +++ b/tests/DynamicCodeLoggerIntegrationTests/Android.mk @@ -67,7 +67,7 @@ LOCAL_CERTIFICATE := shared LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/server/pm) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ truth-prebuilt \ # Include both versions of the .so if we have 2 arch diff --git a/tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml b/tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml index 4327da2db3dd..08fac300512b 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml +++ b/tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml @@ -29,7 +29,7 @@ </application> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.frameworks.dynamiccodeloggertest" android:label="Integration test for DynamicCodeLogger" /> </manifest> diff --git a/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml b/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml index f70b9c8cb357..f8a1ec90a78a 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml +++ b/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml @@ -24,7 +24,7 @@ <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="com.android.frameworks.dynamiccodeloggertest"/> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> <option name="hidden-api-checks" value="false"/> </test> </configuration> diff --git a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java index 4f9aeea5bdb4..db2f659c655b 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java +++ b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java @@ -24,11 +24,12 @@ import android.content.Context; import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; import android.util.EventLog; import android.util.EventLog.Event; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; + import dalvik.system.DexClassLoader; import org.junit.Before; diff --git a/tests/FlickerTests/AndroidManifest.xml b/tests/FlickerTests/AndroidManifest.xml index ba6394008642..5b1a36b84cc4 100644 --- a/tests/FlickerTests/AndroidManifest.xml +++ b/tests/FlickerTests/AndroidManifest.xml @@ -29,7 +29,7 @@ <uses-library android:name="android.test.runner"/> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.server.wm.flicker" android:label="WindowManager Flicker Tests"> </instrumentation> diff --git a/tests/FlickerTests/lib/Android.mk b/tests/FlickerTests/lib/Android.mk index 6a8dfe8b5d0a..e438822a6f32 100644 --- a/tests/FlickerTests/lib/Android.mk +++ b/tests/FlickerTests/lib/Android.mk @@ -24,7 +24,7 @@ LOCAL_CERTIFICATE := platform LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - ub-janktesthelper \ + androidx.test.janktesthelper \ cts-amwm-util \ platformprotosnano \ layersprotosnano \ @@ -41,7 +41,7 @@ LOCAL_SRC_FILES := src/com/android/server/wm/flicker/AutomationUtils.java \ src/com/android/server/wm/flicker/WindowUtils.java LOCAL_STATIC_JAVA_LIBRARIES := sysui-helper \ launcher-helper-lib \ - compatibility-device-util + compatibility-device-util-axt include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AutomationUtils.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AutomationUtils.java index 6306f0e16375..e00a2474556c 100644 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AutomationUtils.java +++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AutomationUtils.java @@ -30,7 +30,6 @@ import android.content.pm.PackageManager; import android.graphics.Point; import android.graphics.Rect; import android.os.RemoteException; -import android.support.test.InstrumentationRegistry; import android.support.test.launcherhelper.LauncherStrategyFactory; import android.support.test.uiautomator.By; import android.support.test.uiautomator.BySelector; @@ -43,6 +42,8 @@ import android.util.Rational; import android.view.View; import android.view.ViewConfiguration; +import androidx.test.InstrumentationRegistry; + /** * Collection of UI Automation helper functions. */ diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java index f6e8192ee4c0..0a3fe3c00de2 100644 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java +++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java @@ -18,9 +18,10 @@ package com.android.server.wm.flicker; import android.annotation.Nullable; import android.support.annotation.VisibleForTesting; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.test.InstrumentationRegistry; + import com.android.server.wm.flicker.monitor.ITransitionMonitor; import com.android.server.wm.flicker.monitor.LayersTraceMonitor; import com.android.server.wm.flicker.monitor.ScreenRecorder; diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java index 0da876173995..c54396f895e4 100644 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java +++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java @@ -20,10 +20,11 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Point; import android.graphics.Rect; -import android.support.test.InstrumentationRegistry; import android.view.Surface; import android.view.WindowManager; +import androidx.test.InstrumentationRegistry; + /** * Helper functions to retrieve system window sizes and positions. */ diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java index 717d187e1d4a..3f86f0d001d7 100644 --- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java +++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java @@ -25,7 +25,7 @@ import android.view.FrameStats; /** * Monitors {@link android.view.WindowAnimationFrameStats} to detect janky frames. * - * Adapted from {@link android.support.test.jank.internal.WindowAnimationFrameStatsMonitorImpl} + * Adapted from {@link androidx.test.jank.internal.WindowAnimationFrameStatsMonitorImpl} * using the same threshold to determine jank. */ public class WindowAnimationFrameStatsMonitor implements ITransitionMonitor { diff --git a/tests/FlickerTests/lib/test/Android.mk b/tests/FlickerTests/lib/test/Android.mk index 0e3f58d8a8c9..5be89ba624e6 100644 --- a/tests/FlickerTests/lib/test/Android.mk +++ b/tests/FlickerTests/lib/test/Android.mk @@ -25,7 +25,7 @@ LOCAL_COMPATIBILITY_SUITE := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ platform-test-annotations \ truth-prebuilt \ platformprotosnano \ diff --git a/tests/FlickerTests/lib/test/AndroidManifest.xml b/tests/FlickerTests/lib/test/AndroidManifest.xml index d30172d56c2c..6451a5710821 100644 --- a/tests/FlickerTests/lib/test/AndroidManifest.xml +++ b/tests/FlickerTests/lib/test/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-library android:name="android.test.runner"/> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.server.wm.flicker" android:label="WindowManager Flicker Lib Test"> </instrumentation> diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java index 42b2acace8c9..7d77126fd7d4 100644 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java +++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java @@ -26,9 +26,10 @@ import static org.junit.Assert.fail; import android.content.Context; import android.graphics.Point; import android.graphics.Rect; -import android.support.test.InstrumentationRegistry; import android.view.WindowManager; +import androidx.test.InstrumentationRegistry; + import org.junit.Test; import java.util.List; diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java index 5a24e6d91595..c46175c1a977 100644 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java +++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java @@ -17,7 +17,8 @@ package com.android.server.wm.flicker; import android.content.Context; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import com.google.common.io.ByteStreams; diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java index f7fa0d572de6..dd6fed04d3e6 100644 --- a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java +++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java @@ -18,9 +18,7 @@ package com.android.server.wm.flicker.monitor; import static com.android.server.wm.flicker.AutomationUtils.wakeUpAndGoToHomeScreen; -import static com.google.common.truth.Truth.assertThat; - -import android.support.test.InstrumentationRegistry; +import androidx.test.InstrumentationRegistry; import org.junit.Before; import org.junit.Ignore; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java index 34f4ebb89543..b6860cbd8d96 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java @@ -25,11 +25,12 @@ import static com.android.server.wm.flicker.WindowUtils.getStatusBarPosition; import static com.android.server.wm.flicker.WmTraceSubject.assertThat; import android.graphics.Rect; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; import android.util.Log; import android.view.Surface; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java index 2b62fcf196fb..6590b86f1499 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java @@ -20,9 +20,10 @@ import static com.android.server.wm.flicker.CommonTransitions.editTextLoseFocusT import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; import android.platform.helpers.IAppHelper; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java index 42b161f8a604..4771b02000c0 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java @@ -20,9 +20,10 @@ import static com.android.server.wm.flicker.CommonTransitions.editTextLoseFocusT import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; import android.platform.helpers.IAppHelper; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java index 92bb1ea0b58f..65888acc184b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java @@ -30,7 +30,6 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.platform.helpers.IAppHelper; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject2; @@ -38,6 +37,8 @@ import android.support.test.uiautomator.Until; import android.util.Rational; import android.view.Surface; +import androidx.test.InstrumentationRegistry; + import com.android.server.wm.flicker.TransitionRunner.TransitionBuilder; /** diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java index fec248c13818..61cca0d6b53f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java @@ -17,12 +17,13 @@ package com.android.server.wm.flicker; import android.platform.helpers.IAppHelper; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.UiDevice; import android.util.Rational; import android.view.Surface; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java b/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java index 7061b23c069d..00e11c0cef41 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java @@ -21,10 +21,11 @@ import static com.android.server.wm.flicker.AutomationUtils.setDefaultWait; import static com.google.common.truth.Truth.assertWithMessage; import android.platform.helpers.IAppHelper; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.UiDevice; import android.util.Log; +import androidx.test.InstrumentationRegistry; + import com.android.server.wm.flicker.TransitionRunner.TransitionResult; import org.junit.After; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java index 7e713699c72e..7818c4e4ba50 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java @@ -20,9 +20,9 @@ import static com.android.server.wm.flicker.CommonTransitions.getOpenAppCold; import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; import static com.android.server.wm.flicker.WmTraceSubject.assertThat; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java index 745569aac7ab..63018ec1d9e7 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java @@ -19,9 +19,9 @@ package com.android.server.wm.flicker; import static com.android.server.wm.flicker.CommonTransitions.appToSplitScreen; import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java index de7639d43d3c..1aba93056c89 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java @@ -20,9 +20,9 @@ import static com.android.server.wm.flicker.CommonTransitions.openAppWarm; import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; import static com.android.server.wm.flicker.WmTraceSubject.assertThat; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java index 1bd519c8334e..a81fa8e6d123 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java @@ -19,8 +19,8 @@ package com.android.server.wm.flicker; import static com.android.server.wm.flicker.CommonTransitions.editTextSetFocus; import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java index 8a15cbdb7709..50dba81e53b7 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java @@ -25,11 +25,12 @@ import static com.google.common.truth.Truth.assertThat; import android.graphics.Rect; import android.platform.helpers.IAppHelper; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Rational; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java index 3eab68d1272f..117ac5a8fadf 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java @@ -27,10 +27,11 @@ import static com.android.server.wm.flicker.testapp.ActivityOptions.SEAMLESS_ACT import android.content.Intent; import android.graphics.Rect; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; import android.view.Surface; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java index 40bd4e962153..1d30df9750b2 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java @@ -19,10 +19,10 @@ package com.android.server.wm.flicker; import static com.android.server.wm.flicker.CommonTransitions.splitScreenToLauncher; import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.FlakyTest; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/tests/Internal/Android.mk b/tests/Internal/Android.mk index da566967fbeb..2e26ef103794 100644 --- a/tests/Internal/Android.mk +++ b/tests/Internal/Android.mk @@ -11,7 +11,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := junit \ - android-support-test \ + androidx.test.rules \ mockito-target-minus-junit4 LOCAL_JAVA_RESOURCE_DIRS := res diff --git a/tests/Internal/AndroidManifest.xml b/tests/Internal/AndroidManifest.xml index e5a56949fe4e..c85c3b12504a 100644 --- a/tests/Internal/AndroidManifest.xml +++ b/tests/Internal/AndroidManifest.xml @@ -38,7 +38,7 @@ </service> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.internal.tests" android:label="Internal Tests" /> </manifest> diff --git a/tests/Internal/AndroidTest.xml b/tests/Internal/AndroidTest.xml index 6531c9355e3d..7b67e9ebcced 100644 --- a/tests/Internal/AndroidTest.xml +++ b/tests/Internal/AndroidTest.xml @@ -24,6 +24,6 @@ <option name="test-tag" value="InternalTests" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.internal.tests" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> </test> </configuration>
\ No newline at end of file diff --git a/tests/Internal/src/android/app/WallpaperColorsTest.java b/tests/Internal/src/android/app/WallpaperColorsTest.java index 881f6284413f..65ff6eb1ba04 100644 --- a/tests/Internal/src/android/app/WallpaperColorsTest.java +++ b/tests/Internal/src/android/app/WallpaperColorsTest.java @@ -20,8 +20,9 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Assert; import org.junit.Test; diff --git a/tests/Internal/src/android/app/WallpaperInfoTest.java b/tests/Internal/src/android/app/WallpaperInfoTest.java index 7f06f2cb7aeb..476b99155672 100644 --- a/tests/Internal/src/android/app/WallpaperInfoTest.java +++ b/tests/Internal/src/android/app/WallpaperInfoTest.java @@ -26,9 +26,10 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Parcel; import android.service.wallpaper.WallpaperService; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/Internal/src/android/service/wallpaper/WallpaperServiceTest.java b/tests/Internal/src/android/service/wallpaper/WallpaperServiceTest.java index b9e282ebdfef..592aa3ac4a6b 100644 --- a/tests/Internal/src/android/service/wallpaper/WallpaperServiceTest.java +++ b/tests/Internal/src/android/service/wallpaper/WallpaperServiceTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java b/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java index 39608a40b416..17fa93135c7d 100644 --- a/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java +++ b/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java @@ -27,9 +27,10 @@ import android.app.WallpaperColors; import android.app.WallpaperManager; import android.content.Context; import android.graphics.Color; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.internal.colorextraction.types.ExtractionType; diff --git a/tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java b/tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java index a7d5ae8f69a3..d92cfce0379b 100644 --- a/tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java +++ b/tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java @@ -20,11 +20,12 @@ import static org.junit.Assert.assertTrue; import android.app.WallpaperColors; import android.graphics.Color; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Range; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.internal.graphics.ColorUtils; diff --git a/tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java b/tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java index 73df9a09ea75..d0bb8e3745bc 100644 --- a/tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java +++ b/tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java @@ -16,12 +16,13 @@ package com.android.internal.graphics; +import static org.junit.Assert.assertTrue; + import android.graphics.Color; -import android.support.test.filters.SmallTest; -import org.junit.Test; +import androidx.test.filters.SmallTest; -import static org.junit.Assert.assertTrue; +import org.junit.Test; @SmallTest public class ColorUtilsTest { diff --git a/tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java b/tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java index a64f8a60d485..540a1ec2bd5a 100644 --- a/tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java +++ b/tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import android.annotation.SuppressLint; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Assert; import org.junit.Before; diff --git a/tests/PackageWatchdog/Android.mk b/tests/PackageWatchdog/Android.mk index 1c1c2a426d15..1e4aacce1613 100644 --- a/tests/PackageWatchdog/Android.mk +++ b/tests/PackageWatchdog/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ junit \ frameworks-base-testutils \ - android-support-test \ + androidx.test.rules \ services.core LOCAL_JAVA_LIBRARIES := \ diff --git a/tests/PackageWatchdog/AndroidManifest.xml b/tests/PackageWatchdog/AndroidManifest.xml index fa89528403c3..540edb41f66f 100644 --- a/tests/PackageWatchdog/AndroidManifest.xml +++ b/tests/PackageWatchdog/AndroidManifest.xml @@ -22,7 +22,7 @@ </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.tests.packagewatchdog" android:label="PackageWatchdog Test"/> </manifest> diff --git a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java index 77cd62e4cbd3..598f60ad7c8d 100644 --- a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java +++ b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java @@ -24,7 +24,8 @@ import static org.junit.Assert.assertTrue; import android.content.pm.VersionedPackage; import android.os.test.TestLooper; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import com.android.server.PackageWatchdog.PackageHealthObserver; import com.android.server.PackageWatchdog.PackageHealthObserverImpact; diff --git a/tests/RcsTests/Android.mk b/tests/RcsTests/Android.mk index 7b348d73747a..a276584530f4 100644 --- a/tests/RcsTests/Android.mk +++ b/tests/RcsTests/Android.mk @@ -11,7 +11,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base -LOCAL_STATIC_JAVA_LIBRARIES := junit android-support-test mockito-target-minus-junit4 truth-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES := junit androidx.test.rules mockito-target-minus-junit4 truth-prebuilt include $(BUILD_PACKAGE) diff --git a/tests/RcsTests/AndroidManifest.xml b/tests/RcsTests/AndroidManifest.xml index a7e7d479a4d9..b1706a0a3629 100644 --- a/tests/RcsTests/AndroidManifest.xml +++ b/tests/RcsTests/AndroidManifest.xml @@ -6,6 +6,6 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.tests.rcs"/> </manifest> diff --git a/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadIconChangedEventTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadIconChangedEventTest.java index 89d32ab5a925..e8989424de6d 100644 --- a/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadIconChangedEventTest.java +++ b/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadIconChangedEventTest.java @@ -19,10 +19,11 @@ import static com.google.common.truth.Truth.assertThat; import android.net.Uri; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; import android.telephony.ims.RcsGroupThreadIconChangedEvent; import android.telephony.ims.RcsGroupThreadIconChangedEventDescriptor; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadNameChangedEventTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadNameChangedEventTest.java index 726b9cd6641f..356688d4db81 100644 --- a/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadNameChangedEventTest.java +++ b/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadNameChangedEventTest.java @@ -18,10 +18,11 @@ package com.android.tests.ims; import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; import android.telephony.ims.RcsGroupThreadNameChangedEvent; import android.telephony.ims.RcsGroupThreadNameChangedEventDescriptor; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadParticipantJoinedEventTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadParticipantJoinedEventTest.java index a109310076d2..572fcb8ffd5e 100644 --- a/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadParticipantJoinedEventTest.java +++ b/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadParticipantJoinedEventTest.java @@ -18,10 +18,11 @@ package com.android.tests.ims; import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; import android.telephony.ims.RcsGroupThreadParticipantJoinedEvent; import android.telephony.ims.RcsGroupThreadParticipantJoinedEventDescriptor; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadParticipantLeftEventTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadParticipantLeftEventTest.java index de2688c5b8c8..038b2e8e60e3 100644 --- a/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadParticipantLeftEventTest.java +++ b/tests/RcsTests/src/com/android/tests/ims/RcsGroupThreadParticipantLeftEventTest.java @@ -18,10 +18,11 @@ package com.android.tests.ims; import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; import android.telephony.ims.RcsGroupThreadParticipantLeftEvent; import android.telephony.ims.RcsGroupThreadParticipantLeftEventDescriptor; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/RcsTests/src/com/android/tests/ims/RcsParticipantAliasChangedEventTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsParticipantAliasChangedEventTest.java index 57240545e5d8..283c71b38eef 100644 --- a/tests/RcsTests/src/com/android/tests/ims/RcsParticipantAliasChangedEventTest.java +++ b/tests/RcsTests/src/com/android/tests/ims/RcsParticipantAliasChangedEventTest.java @@ -18,10 +18,11 @@ package com.android.tests.ims; import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; import android.telephony.ims.RcsParticipantAliasChangedEvent; import android.telephony.ims.RcsParticipantAliasChangedEventDescriptor; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/RcsTests/src/com/android/tests/ims/RcsParticipantQueryParamsTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsParticipantQueryParamsTest.java index 6361a393187e..2d95513be069 100644 --- a/tests/RcsTests/src/com/android/tests/ims/RcsParticipantQueryParamsTest.java +++ b/tests/RcsTests/src/com/android/tests/ims/RcsParticipantQueryParamsTest.java @@ -18,9 +18,10 @@ package com.android.tests.ims; import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; import android.telephony.ims.RcsParticipantQueryParams; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/RcsTests/src/com/android/tests/ims/RcsThreadQueryParamsTest.java b/tests/RcsTests/src/com/android/tests/ims/RcsThreadQueryParamsTest.java index beb4f8ad28e2..fb51bdaa88a5 100644 --- a/tests/RcsTests/src/com/android/tests/ims/RcsThreadQueryParamsTest.java +++ b/tests/RcsTests/src/com/android/tests/ims/RcsThreadQueryParamsTest.java @@ -21,10 +21,11 @@ import static android.telephony.ims.RcsThreadQueryParams.THREAD_TYPE_GROUP; import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; -import android.support.test.runner.AndroidJUnit4; import android.telephony.ims.RcsParticipant; import android.telephony.ims.RcsThreadQueryParams; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/RollbackTest/Android.mk b/tests/RollbackTest/Android.mk index db9376b844f9..206f8671d497 100644 --- a/tests/RollbackTest/Android.mk +++ b/tests/RollbackTest/Android.mk @@ -107,7 +107,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, RollbackTest/src) LOCAL_PACKAGE_NAME := RollbackTest LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules LOCAL_COMPATIBILITY_SUITE := general-tests LOCAL_JAVA_RESOURCE_FILES := \ $(ROLLBACK_TEST_APP_AV1) \ diff --git a/tests/RollbackTest/RollbackTest.xml b/tests/RollbackTest/RollbackTest.xml index ac39f853656a..70cd86783d6d 100644 --- a/tests/RollbackTest/RollbackTest.xml +++ b/tests/RollbackTest/RollbackTest.xml @@ -20,7 +20,7 @@ </target_preparer> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.tests.rollback" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> <!-- Exclude the StagedRollbackTest tests, which needs to be specially driven from the StagedRollbackTest host test --> diff --git a/tests/RollbackTest/RollbackTest/AndroidManifest.xml b/tests/RollbackTest/RollbackTest/AndroidManifest.xml index e57a768ad1b5..5380dc9fc8cd 100644 --- a/tests/RollbackTest/RollbackTest/AndroidManifest.xml +++ b/tests/RollbackTest/RollbackTest/AndroidManifest.xml @@ -24,7 +24,7 @@ </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.tests.rollback" android:label="Rollback Test"/> diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/LocalIntentSender.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/LocalIntentSender.java index ddcf1dabcafc..267ef7377b36 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/LocalIntentSender.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/LocalIntentSender.java @@ -21,7 +21,8 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentSender; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackBroadcastReceiver.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackBroadcastReceiver.java index e10f866c899f..8a925b9bad38 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackBroadcastReceiver.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackBroadcastReceiver.java @@ -20,9 +20,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.test.InstrumentationRegistry; + import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java index a6054e8f41d0..4780f30d5f7f 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java @@ -21,6 +21,11 @@ import static com.android.tests.rollback.RollbackTestUtils.assertRollbackInfoEqu import static com.android.tests.rollback.RollbackTestUtils.getUniqueRollbackInfoForPackage; import static com.android.tests.rollback.RollbackTestUtils.processUserData; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + import android.Manifest; import android.app.ActivityManager; import android.content.BroadcastReceiver; @@ -31,13 +36,9 @@ import android.content.pm.VersionedPackage; import android.content.rollback.RollbackInfo; import android.content.rollback.RollbackManager; import android.provider.DeviceConfig; -import android.support.test.InstrumentationRegistry; import android.util.Log; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import androidx.test.InstrumentationRegistry; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTestUtils.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTestUtils.java index 2f989f316ea6..e8cbd60ae649 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTestUtils.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTestUtils.java @@ -16,6 +16,11 @@ package com.android.tests.rollback; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -30,13 +35,9 @@ import android.content.rollback.RollbackInfo; import android.content.rollback.RollbackManager; import android.os.Handler; import android.os.HandlerThread; -import android.support.test.InstrumentationRegistry; import android.util.Log; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import androidx.test.InstrumentationRegistry; import java.io.IOException; import java.io.InputStream; diff --git a/tests/ServiceCrashTest/Android.mk b/tests/ServiceCrashTest/Android.mk index d1f6450e84a6..617ee7caf139 100644 --- a/tests/ServiceCrashTest/Android.mk +++ b/tests/ServiceCrashTest/Android.mk @@ -12,7 +12,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.base -LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt androidx.test.rules include $(BUILD_PACKAGE) diff --git a/tests/UsageStatsPerfTests/Android.mk b/tests/UsageStatsPerfTests/Android.mk index cd29b51e5a24..4304fb0d8e9e 100644 --- a/tests/UsageStatsPerfTests/Android.mk +++ b/tests/UsageStatsPerfTests/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ apct-perftests-utils \ services.usage diff --git a/tests/UsageStatsPerfTests/AndroidManifest.xml b/tests/UsageStatsPerfTests/AndroidManifest.xml index 596a79cd8948..98915485c7bd 100644 --- a/tests/UsageStatsPerfTests/AndroidManifest.xml +++ b/tests/UsageStatsPerfTests/AndroidManifest.xml @@ -24,6 +24,6 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.frameworks.perftests.usage"/> </manifest> diff --git a/tests/UsageStatsPerfTests/AndroidTest.xml b/tests/UsageStatsPerfTests/AndroidTest.xml index c9b51dc5ba07..b8892ebc2ff7 100644 --- a/tests/UsageStatsPerfTests/AndroidTest.xml +++ b/tests/UsageStatsPerfTests/AndroidTest.xml @@ -23,6 +23,6 @@ <option name="test-tag" value="UsageStatsPerfTests"/> <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="com.android.frameworks.perftests.usage"/> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> </test> </configuration>
\ No newline at end of file diff --git a/tests/UsageStatsPerfTests/src/com/android/frameworks/perftests/usage/tests/UsageStatsDatabasePerfTest.java b/tests/UsageStatsPerfTests/src/com/android/frameworks/perftests/usage/tests/UsageStatsDatabasePerfTest.java index e2a4c26606bf..7d9d0d52b002 100644 --- a/tests/UsageStatsPerfTests/src/com/android/frameworks/perftests/usage/tests/UsageStatsDatabasePerfTest.java +++ b/tests/UsageStatsPerfTests/src/com/android/frameworks/perftests/usage/tests/UsageStatsDatabasePerfTest.java @@ -24,9 +24,10 @@ import android.content.Context; import android.os.SystemClock; import android.perftests.utils.ManualBenchmarkState; import android.perftests.utils.PerfManualStatusReporter; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import com.android.server.usage.IntervalStats; import com.android.server.usage.UsageStatsDatabase; diff --git a/tests/UsbTests/Android.mk b/tests/UsbTests/Android.mk index 4e215cc5996f..aef993b9d348 100644 --- a/tests/UsbTests/Android.mk +++ b/tests/UsbTests/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_STATIC_JAVA_LIBRARIES := \ frameworks-base-testutils \ - android-support-test \ + androidx.test.rules \ mockito-target-inline-minus-junit4 \ platform-test-annotations \ services.core \ diff --git a/tests/UsbTests/AndroidManifest.xml b/tests/UsbTests/AndroidManifest.xml index 5d606951bb5e..03d1a3ee25e2 100644 --- a/tests/UsbTests/AndroidManifest.xml +++ b/tests/UsbTests/AndroidManifest.xml @@ -24,7 +24,7 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.server.usb" android:label="UsbTests"/> </manifest> diff --git a/tests/UsbTests/AndroidTest.xml b/tests/UsbTests/AndroidTest.xml index 4affad39b4eb..e55bc98ecdc1 100644 --- a/tests/UsbTests/AndroidTest.xml +++ b/tests/UsbTests/AndroidTest.xml @@ -24,7 +24,7 @@ <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="com.android.server.usb"/> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> <option name="hidden-api-checks" value="false"/> </test> </configuration> diff --git a/tests/UsbTests/src/com/android/server/usb/UsbDescriptorParserTests.java b/tests/UsbTests/src/com/android/server/usb/UsbDescriptorParserTests.java index ea027d7ae049..89dc79c08261 100644 --- a/tests/UsbTests/src/com/android/server/usb/UsbDescriptorParserTests.java +++ b/tests/UsbTests/src/com/android/server/usb/UsbDescriptorParserTests.java @@ -16,29 +16,29 @@ package com.android.server.usb; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; 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.Context; import android.content.res.Resources; import android.content.res.Resources.NotFoundException; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.server.usb.descriptors.UsbDescriptorParser; -import com.android.server.usb.descriptors.UsbDeviceDescriptor; -import com.google.common.io.ByteStreams; -import java.io.InputStream; -import java.io.IOException; -import java.lang.Exception; +import com.google.common.io.ByteStreams; import org.junit.Test; import org.junit.runner.RunWith; +import java.io.IOException; +import java.io.InputStream; + /** * Tests for {@link com.android.server.usb.descriptors.UsbDescriptorParser} */ diff --git a/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java b/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java index 4b93ca3dcaa9..ca1eb705e457 100644 --- a/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java +++ b/tests/UsbTests/src/com/android/server/usb/UsbHandlerTest.java @@ -31,11 +31,11 @@ import android.hardware.usb.UsbManager; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.os.UserHandle; import android.provider.Settings; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.server.FgThread; diff --git a/tests/WindowAnimationJank/Android.mk b/tests/WindowAnimationJank/Android.mk index 7800a8078d2a..1c2d16787e88 100644 --- a/tests/WindowAnimationJank/Android.mk +++ b/tests/WindowAnimationJank/Android.mk @@ -26,7 +26,7 @@ LOCAL_PACKAGE_NAME := WindowAnimationJank LOCAL_STATIC_JAVA_LIBRARIES := \ ub-uiautomator \ - ub-janktesthelper \ + androidx.test.janktesthelper \ junit LOCAL_JAVA_LIBRARIES := android.test.base.stubs diff --git a/tests/WindowAnimationJank/src/android/windowanimationjank/FullscreenRotationTest.java b/tests/WindowAnimationJank/src/android/windowanimationjank/FullscreenRotationTest.java index 1fb502a09874..6792a8b486af 100644 --- a/tests/WindowAnimationJank/src/android/windowanimationjank/FullscreenRotationTest.java +++ b/tests/WindowAnimationJank/src/android/windowanimationjank/FullscreenRotationTest.java @@ -17,8 +17,9 @@ package android.windowanimationjank; import android.os.Bundle; -import android.support.test.jank.JankTest; -import android.support.test.jank.GfxMonitor; + +import androidx.test.jank.GfxMonitor; +import androidx.test.jank.JankTest; /** * Detect janks during screen rotation for full-screen activity. Periodically change diff --git a/tests/WindowAnimationJank/src/android/windowanimationjank/WindowAnimationJankTestBase.java b/tests/WindowAnimationJank/src/android/windowanimationjank/WindowAnimationJankTestBase.java index bf739fa8da07..a8ace162c4d0 100644 --- a/tests/WindowAnimationJank/src/android/windowanimationjank/WindowAnimationJankTestBase.java +++ b/tests/WindowAnimationJank/src/android/windowanimationjank/WindowAnimationJankTestBase.java @@ -16,12 +16,10 @@ package android.windowanimationjank; -import java.io.IOException; -import java.util.StringTokenizer; - -import android.support.test.jank.JankTestBase; import android.support.test.uiautomator.UiDevice; +import androidx.test.jank.JankTestBase; + /** * This adds additional system level jank monitor and its result is merged with primary monitor * used in test. |