diff --git a/core/tests/utiltests/Android.mk b/core/tests/utiltests/Android.mk index 5c60c81847535..343c07af51dfb 100644 --- a/core/tests/utiltests/Android.mk +++ b/core/tests/utiltests/Android.mk @@ -15,7 +15,7 @@ LOCAL_SRC_FILES += src/android/util/IRemoteMemoryIntArray.aidl LOCAL_JNI_SHARED_LIBRARIES := libmemoryintarraytest libcutils libc++ LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ frameworks-base-testutils \ mockito-target-minus-junit4 \ diff --git a/core/tests/utiltests/AndroidManifest.xml b/core/tests/utiltests/AndroidManifest.xml index 8db81ca4b3b6e..4ef4b1fe91207 100644 --- a/core/tests/utiltests/AndroidManifest.xml +++ b/core/tests/utiltests/AndroidManifest.xml @@ -51,7 +51,7 @@ diff --git a/core/tests/utiltests/runtests.sh b/core/tests/utiltests/runtests.sh index 853119f623347..3b46cbbef4e9c 100755 --- a/core/tests/utiltests/runtests.sh +++ b/core/tests/utiltests/runtests.sh @@ -21,4 +21,4 @@ adb wait-for-device adb install -r -g "$OUT/data/app/FrameworksUtilTests/FrameworksUtilTests.apk" -adb shell am instrument -w "$@" 'com.android.frameworks.utiltests/android.support.test.runner.AndroidJUnitRunner' +adb shell am instrument -w "$@" 'com.android.frameworks.utiltests/androidx.test.runner.AndroidJUnitRunner' diff --git a/core/tests/utiltests/src/android/util/IntArrayTest.java b/core/tests/utiltests/src/android/util/IntArrayTest.java index a6120a1e8142e..a76c640db74a3 100644 --- a/core/tests/utiltests/src/android/util/IntArrayTest.java +++ b/core/tests/utiltests/src/android/util/IntArrayTest.java @@ -19,8 +19,9 @@ package android.util; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/utiltests/src/android/util/LongArrayTest.java b/core/tests/utiltests/src/android/util/LongArrayTest.java index a7afcbd81fdf5..a9a168b1bf6b6 100644 --- a/core/tests/utiltests/src/android/util/LongArrayTest.java +++ b/core/tests/utiltests/src/android/util/LongArrayTest.java @@ -19,8 +19,9 @@ package android.util; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/utiltests/src/android/util/MemoryIntArrayTest.java b/core/tests/utiltests/src/android/util/MemoryIntArrayTest.java index 24b33effdb719..2daefe74eb12c 100644 --- a/core/tests/utiltests/src/android/util/MemoryIntArrayTest.java +++ b/core/tests/utiltests/src/android/util/MemoryIntArrayTest.java @@ -24,8 +24,11 @@ import static org.junit.Assert.fail; import android.os.Parcel; import android.os.ParcelFileDescriptor; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.runner.AndroidJUnit4; + import libcore.io.IoUtils; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/tests/utiltests/src/android/util/RemoteIntArray.java b/core/tests/utiltests/src/android/util/RemoteIntArray.java index 11d0888179d11..4a3a01e61b7d0 100644 --- a/core/tests/utiltests/src/android/util/RemoteIntArray.java +++ b/core/tests/utiltests/src/android/util/RemoteIntArray.java @@ -24,7 +24,8 @@ import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import java.io.Closeable; import java.io.IOException; diff --git a/core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java b/core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java index b18ee171eb0ca..03cf3eb6a2b93 100644 --- a/core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java +++ b/core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java @@ -29,11 +29,12 @@ import android.content.ContextWrapper; import android.content.pm.UserInfo; import android.os.UserManager; import android.provider.Settings; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; - import android.test.mock.MockContentResolver; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.internal.util.test.FakeSettingsProvider; import com.android.internal.widget.ILockSettings; import com.android.internal.widget.LockPatternUtils;