Merge "Migrate frameworks/rs to androidx.test"
diff --git a/rsov/tests/RSoVTest/Android.mk b/rsov/tests/RSoVTest/Android.mk
index 7659b10..c89902f 100644
--- a/rsov/tests/RSoVTest/Android.mk
+++ b/rsov/tests/RSoVTest/Android.mk
@@ -18,7 +18,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/rsov/tests/RSoVTest/AndroidManifest.xml b/rsov/tests/RSoVTest/AndroidManifest.xml
index 23a4e5c..936dd9f 100644
--- a/rsov/tests/RSoVTest/AndroidManifest.xml
+++ b/rsov/tests/RSoVTest/AndroidManifest.xml
@@ -15,6 +15,6 @@
</activity>
</application>
- <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.rsov.test"/>
</manifest>
diff --git a/tests/java_api/ImageProcessing_jb/Android.mk b/tests/java_api/ImageProcessing_jb/Android.mk
index 700906d..4271c3c 100644
--- a/tests/java_api/ImageProcessing_jb/Android.mk
+++ b/tests/java_api/ImageProcessing_jb/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_MODULE_TAGS := tests
diff --git a/tests/java_api/ImageProcessing_jb/AndroidManifest.xml b/tests/java_api/ImageProcessing_jb/AndroidManifest.xml
index 738ce1a..5a61312 100644
--- a/tests/java_api/ImageProcessing_jb/AndroidManifest.xml
+++ b/tests/java_api/ImageProcessing_jb/AndroidManifest.xml
@@ -21,6 +21,6 @@
</intent-filter>
</activity>
</application>
- <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.imagejb"/>
</manifest>
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingActivityJB.java b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingActivityJB.java
index 24c0f46..af2f365 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingActivityJB.java
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingActivityJB.java
@@ -17,23 +17,22 @@
package com.android.rs.imagejb;
import android.app.Activity;
-
import android.content.Intent;
+import android.graphics.Point;
+import android.graphics.SurfaceTexture;
import android.os.Bundle;
+import android.renderscript.Allocation;
+import android.renderscript.RenderScript;
+import android.util.Log;
+import android.view.Surface;
+import android.view.TextureView;
+import android.view.View;
+import android.view.WindowManager;
import android.widget.SeekBar;
import android.widget.Spinner;
import android.widget.TextView;
-import android.view.View;
-import android.view.TextureView;
-import android.view.Surface;
-import android.graphics.SurfaceTexture;
-import android.graphics.Point;
-import android.view.WindowManager;
-import android.util.Log;
-import android.renderscript.Allocation;
-import android.renderscript.RenderScript;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
public class ImageProcessingActivityJB extends Activity
implements SeekBar.OnSeekBarChangeListener,
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
index c720b7a..2577d05 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
@@ -17,16 +17,15 @@
package com.android.rs.imagejb;
-import android.os.Bundle;
-import android.util.Log;
import android.app.Activity;
+import android.os.Bundle;
+import android.os.Environment;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.util.Log;
import com.android.rs.imagejb.IPTestListJB.TestName;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.os.Environment;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -36,7 +35,7 @@
* ImageProcessing benchmark test.
* To run the test, please use command
*
- * adb shell am instrument -w com.android.rs.imagejb/android.support.test.runner.AndroidJUnitRunner
+ * adb shell am instrument -w com.android.rs.imagejb/androidx.test.runner.AndroidJUnitRunner
*
*/
public class ImageProcessingTest extends ActivityInstrumentationTestCase2<ImageProcessingActivityJB> {
diff --git a/tests/java_api/RSTestBackward/Android.mk b/tests/java_api/RSTestBackward/Android.mk
index 10f8e82..d253ee5 100644
--- a/tests/java_api/RSTestBackward/Android.mk
+++ b/tests/java_api/RSTestBackward/Android.mk
@@ -26,7 +26,7 @@
$(call all-java-files-under, ../RSUnitTests/src)\
$(call all-renderscript-files-under, ../RSUnitTests/src)\
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_RENDERSCRIPT_TARGET_API := current
diff --git a/tests/java_api/RSTestBackward/AndroidManifest.xml b/tests/java_api/RSTestBackward/AndroidManifest.xml
index daca492..bfa93ed 100644
--- a/tests/java_api/RSTestBackward/AndroidManifest.xml
+++ b/tests/java_api/RSTestBackward/AndroidManifest.xml
@@ -25,7 +25,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testbackward"
android:label="RenderScript Backward Compatibility Tests" />
</manifest>
diff --git a/tests/java_api/RSTestBackward/src/com/android/rs/testbackward/RSBackwardCompatibilityTests.java b/tests/java_api/RSTestBackward/src/com/android/rs/testbackward/RSBackwardCompatibilityTests.java
index c203d31..49d5e6e 100644
--- a/tests/java_api/RSTestBackward/src/com/android/rs/testbackward/RSBackwardCompatibilityTests.java
+++ b/tests/java_api/RSTestBackward/src/com/android/rs/testbackward/RSBackwardCompatibilityTests.java
@@ -16,13 +16,14 @@
package com.android.rs.testbackward;
-import com.android.rs.unittest.*;
-
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
import android.util.Log;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+
+import com.android.rs.unittest.*;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +38,7 @@
* RSTestBackward, functional test for platform RenderScript APIs.
* To run the test, please use command
*
- * adb shell am instrument -w com.android.rs.testbackward/android.support.test.runner.AndroidJUnitRunner
+ * adb shell am instrument -w com.android.rs.testbackward/androidx.test.runner.AndroidJUnitRunner
*/
@RunWith(Parameterized.class)
public class RSBackwardCompatibilityTests {
diff --git a/tests/java_api/RSTestBackward19/Android.mk b/tests/java_api/RSTestBackward19/Android.mk
index bbde8f3..a226b45 100644
--- a/tests/java_api/RSTestBackward19/Android.mk
+++ b/tests/java_api/RSTestBackward19/Android.mk
@@ -21,7 +21,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_RENDERSCRIPT_TARGET_API := 19
LOCAL_MIN_SDK_VERSION := 17
diff --git a/tests/java_api/RSTestBackward19/AndroidManifest.xml b/tests/java_api/RSTestBackward19/AndroidManifest.xml
index 1825b09..22239b4 100644
--- a/tests/java_api/RSTestBackward19/AndroidManifest.xml
+++ b/tests/java_api/RSTestBackward19/AndroidManifest.xml
@@ -25,7 +25,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testbackward19"
android:label="RenderScript Backward Compatibility Tests (19)" />
</manifest>
diff --git a/tests/java_api/RSTestBackward19/src/com/android/rs/testbackward19/RSBackward19CompatibilityTests.java b/tests/java_api/RSTestBackward19/src/com/android/rs/testbackward19/RSBackward19CompatibilityTests.java
index 3142bd5..4908fe3 100644
--- a/tests/java_api/RSTestBackward19/src/com/android/rs/testbackward19/RSBackward19CompatibilityTests.java
+++ b/tests/java_api/RSTestBackward19/src/com/android/rs/testbackward19/RSBackward19CompatibilityTests.java
@@ -16,13 +16,14 @@
package com.android.rs.testbackward19;
-import com.android.rs.unittest.*;
-
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
import android.util.Log;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+
+import com.android.rs.unittest.*;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,7 +45,7 @@
*
* To run the test, please use command
*
- * adb shell am instrument -w com.android.rs.testbackward19/android.support.test.runner.AndroidJUnitRunner
+ * adb shell am instrument -w com.android.rs.testbackward19/androidx.test.runner.AndroidJUnitRunner
*/
@RunWith(Parameterized.class)
public class RSBackward19CompatibilityTests {
diff --git a/tests/java_api/RSTestForward/21.1.2/Android.mk b/tests/java_api/RSTestForward/21.1.2/Android.mk
index 45b11ec..99bce0c 100644
--- a/tests/java_api/RSTestForward/21.1.2/Android.mk
+++ b/tests/java_api/RSTestForward/21.1.2/Android.mk
@@ -27,7 +27,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_RENDERSCRIPT_TARGET_API := current
LOCAL_PACKAGE_NAME := RSTestForward_21_1_2
diff --git a/tests/java_api/RSTestForward/21.1.2/AndroidManifest.xml b/tests/java_api/RSTestForward/21.1.2/AndroidManifest.xml
index 715d662..cc56fb6 100644
--- a/tests/java_api/RSTestForward/21.1.2/AndroidManifest.xml
+++ b/tests/java_api/RSTestForward/21.1.2/AndroidManifest.xml
@@ -28,7 +28,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testforward21"
android:label="RenderScript Forward Compatibility Tests" />
</manifest>
diff --git a/tests/java_api/RSTestForward/22.0.1/Android.mk b/tests/java_api/RSTestForward/22.0.1/Android.mk
index 1b4905c..cd49c74 100644
--- a/tests/java_api/RSTestForward/22.0.1/Android.mk
+++ b/tests/java_api/RSTestForward/22.0.1/Android.mk
@@ -27,7 +27,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_RENDERSCRIPT_TARGET_API := current
LOCAL_PACKAGE_NAME := RSTestForward_22_0_1
diff --git a/tests/java_api/RSTestForward/22.0.1/AndroidManifest.xml b/tests/java_api/RSTestForward/22.0.1/AndroidManifest.xml
index 48139c9..2a0975b 100644
--- a/tests/java_api/RSTestForward/22.0.1/AndroidManifest.xml
+++ b/tests/java_api/RSTestForward/22.0.1/AndroidManifest.xml
@@ -28,7 +28,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testforward22"
android:label="RenderScript Forward Compatibility Tests" />
</manifest>
diff --git a/tests/java_api/RSTestForward/23.0.3/Android.mk b/tests/java_api/RSTestForward/23.0.3/Android.mk
index 932a918..6180f33 100644
--- a/tests/java_api/RSTestForward/23.0.3/Android.mk
+++ b/tests/java_api/RSTestForward/23.0.3/Android.mk
@@ -27,7 +27,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_RENDERSCRIPT_TARGET_API := current
LOCAL_PACKAGE_NAME := RSTestForward_23_0_3
diff --git a/tests/java_api/RSTestForward/23.0.3/AndroidManifest.xml b/tests/java_api/RSTestForward/23.0.3/AndroidManifest.xml
index 327f706..c34eba6 100644
--- a/tests/java_api/RSTestForward/23.0.3/AndroidManifest.xml
+++ b/tests/java_api/RSTestForward/23.0.3/AndroidManifest.xml
@@ -28,7 +28,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testforward23"
android:label="RenderScript Forward Compatibility Tests" />
</manifest>
diff --git a/tests/java_api/RSTestForward/24.0.3/Android.mk b/tests/java_api/RSTestForward/24.0.3/Android.mk
index 467cd03..c6ebe09 100644
--- a/tests/java_api/RSTestForward/24.0.3/Android.mk
+++ b/tests/java_api/RSTestForward/24.0.3/Android.mk
@@ -27,7 +27,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_RENDERSCRIPT_TARGET_API := current
LOCAL_PACKAGE_NAME := RSTestForward_24_0_3
diff --git a/tests/java_api/RSTestForward/24.0.3/AndroidManifest.xml b/tests/java_api/RSTestForward/24.0.3/AndroidManifest.xml
index b3ba1b6..d6caf57 100644
--- a/tests/java_api/RSTestForward/24.0.3/AndroidManifest.xml
+++ b/tests/java_api/RSTestForward/24.0.3/AndroidManifest.xml
@@ -28,7 +28,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testforward24"
android:label="RenderScript Forward Compatibility Tests" />
</manifest>
diff --git a/tests/java_api/RSTestForward/25.0.2/Android.mk b/tests/java_api/RSTestForward/25.0.2/Android.mk
index 666a059..a80624e 100644
--- a/tests/java_api/RSTestForward/25.0.2/Android.mk
+++ b/tests/java_api/RSTestForward/25.0.2/Android.mk
@@ -27,7 +27,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_RENDERSCRIPT_TARGET_API := current
LOCAL_PACKAGE_NAME := RSTestForward_25_0_2
diff --git a/tests/java_api/RSTestForward/25.0.2/AndroidManifest.xml b/tests/java_api/RSTestForward/25.0.2/AndroidManifest.xml
index 8e093af..1c7eaa0 100644
--- a/tests/java_api/RSTestForward/25.0.2/AndroidManifest.xml
+++ b/tests/java_api/RSTestForward/25.0.2/AndroidManifest.xml
@@ -28,7 +28,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testforward25"
android:label="RenderScript Forward Compatibility Tests" />
</manifest>
diff --git a/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSForwardCompatibilityTests.java b/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSForwardCompatibilityTests.java
index f403018..e82bcfa 100644
--- a/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSForwardCompatibilityTests.java
+++ b/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSForwardCompatibilityTests.java
@@ -16,12 +16,12 @@
package com.android.rs.testforward;
-import com.android.rs.unittest.UnitTest;
-
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+
+import com.android.rs.unittest.UnitTest;
import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +37,7 @@
* RSTestForward, functional test for platform RenderScript APIs.
* To run the test, please use command
*
- * adb shell am instrument -w com.android.rs.testforward/android.support.test.runner.AndroidJUnitRunner
+ * adb shell am instrument -w com.android.rs.testforward/androidx.test.runner.AndroidJUnitRunner
*/
@RunWith(Parameterized.class)
public class RSForwardCompatibilityTests {
diff --git a/tests/java_api/RSTest_CompatLib/Android.mk b/tests/java_api/RSTest_CompatLib/Android.mk
index dd98b5b..741f7ce 100644
--- a/tests/java_api/RSTest_CompatLib/Android.mk
+++ b/tests/java_api/RSTest_CompatLib/Android.mk
@@ -28,7 +28,7 @@
$(call all-renderscript-files-under,../RSUnitTests/supportlibsrc_gen) \
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-test \
+ androidx.test.rules \
android-support-v8-renderscript \
LOCAL_RENDERSCRIPT_TARGET_API := current
diff --git a/tests/java_api/RSTest_CompatLib/AndroidManifest.xml b/tests/java_api/RSTest_CompatLib/AndroidManifest.xml
index e4473d8..a48aecd 100644
--- a/tests/java_api/RSTest_CompatLib/AndroidManifest.xml
+++ b/tests/java_api/RSTest_CompatLib/AndroidManifest.xml
@@ -35,7 +35,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testcompat"
android:label="RenderScript Tests" />
</manifest>
diff --git a/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTests.java b/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTests.java
index 927cc8b..912f08d 100644
--- a/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTests.java
+++ b/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTests.java
@@ -16,12 +16,12 @@
package com.android.rs.testcompat;
-import com.android.rs.unittest.UnitTest;
-
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+
+import com.android.rs.unittest.UnitTest;
import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +37,7 @@
* RSTest_CompatLib, functional test for RenderScript Support Library APIs.
* To run the test, please use command
*
- * adb shell am instrument -w com.android.rs.testcompat/android.support.test.runner.AndroidJUnitRunner
+ * adb shell am instrument -w com.android.rs.testcompat/androidx.test.runner.AndroidJUnitRunner
*/
@RunWith(Parameterized.class)
public class RSSupportLibTests {
diff --git a/tests/java_api/RSTest_CompatLib19/Android.mk b/tests/java_api/RSTest_CompatLib19/Android.mk
index 67b43c4..7120de8 100644
--- a/tests/java_api/RSTest_CompatLib19/Android.mk
+++ b/tests/java_api/RSTest_CompatLib19/Android.mk
@@ -24,7 +24,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-test \
+ androidx.test.rules \
android-support-v8-renderscript \
LOCAL_RENDERSCRIPT_TARGET_API := 19
diff --git a/tests/java_api/RSTest_CompatLib19/AndroidManifest.xml b/tests/java_api/RSTest_CompatLib19/AndroidManifest.xml
index f2ca476..81e05d6 100644
--- a/tests/java_api/RSTest_CompatLib19/AndroidManifest.xml
+++ b/tests/java_api/RSTest_CompatLib19/AndroidManifest.xml
@@ -24,7 +24,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.testcompat19"
android:label="RenderScript Support Lib Tests" />
</manifest>
diff --git a/tests/java_api/RSTest_CompatLib19/src/com/android/rs/testcompat/RSSupportLibTests.java b/tests/java_api/RSTest_CompatLib19/src/com/android/rs/testcompat/RSSupportLibTests.java
index 2ed97c0..21d11be 100644
--- a/tests/java_api/RSTest_CompatLib19/src/com/android/rs/testcompat/RSSupportLibTests.java
+++ b/tests/java_api/RSTest_CompatLib19/src/com/android/rs/testcompat/RSSupportLibTests.java
@@ -16,12 +16,12 @@
package com.android.rs.testcompat19;
-import com.android.rs.unittest.UnitTest;
-
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+
+import com.android.rs.unittest.UnitTest;
import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +37,7 @@
* RSTest_CompatLib, functional test for RenderScript Support Library APIs.
* To run the test, please use command
*
- * adb shell am instrument -w com.android.rs.testcompat19/android.support.test.runner.AndroidJUnitRunner
+ * adb shell am instrument -w com.android.rs.testcompat19/androidx.test.runner.AndroidJUnitRunner
*/
@RunWith(Parameterized.class)
public class RSSupportLibTests {
diff --git a/tests/java_api/RSUnitTests/RSUnitTests.py b/tests/java_api/RSUnitTests/RSUnitTests.py
index 1bfb5ed..6e464ed 100644
--- a/tests/java_api/RSUnitTests/RSUnitTests.py
+++ b/tests/java_api/RSUnitTests/RSUnitTests.py
@@ -496,7 +496,7 @@
' </application>\n'
'\n'
' <instrumentation\n'
- ' android:name="android.support.test.runner.AndroidJUnitRunner"\n'
+ ' android:name="androidx.test.runner.AndroidJUnitRunner"\n'
' android:targetPackage="{}"\n'
' android:label="RenderScript Forward Compatibility Tests" />\n'
'</manifest>\n'.format(package, package)
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UnitTest.java b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UnitTest.java
index 7bab7b7..5ecb0e8 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UnitTest.java
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UnitTest.java
@@ -19,7 +19,6 @@
import android.content.Context;
import android.renderscript.RenderScript;
import android.renderscript.RenderScript.RSMessageHandler;
-import android.support.test.InstrumentationRegistry;
import android.util.Log;
import dalvik.system.DexFile;
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UnitTest.java b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UnitTest.java
index 5de45ae..5412db9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UnitTest.java
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UnitTest.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.support.v8.renderscript.RenderScript;
import android.support.v8.renderscript.RenderScript.RSMessageHandler;
-import android.support.test.InstrumentationRegistry;
import android.util.Log;
import dalvik.system.DexFile;
diff --git a/tests/java_api/RsBLAS_Benchmark/Android.mk b/tests/java_api/RsBLAS_Benchmark/Android.mk
index f8b1130..dccc342 100644
--- a/tests/java_api/RsBLAS_Benchmark/Android.mk
+++ b/tests/java_api/RsBLAS_Benchmark/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_MODULE_TAGS := tests
diff --git a/tests/java_api/RsBLAS_Benchmark/AndroidManifest.xml b/tests/java_api/RsBLAS_Benchmark/AndroidManifest.xml
index 104706e..38a2c93 100644
--- a/tests/java_api/RsBLAS_Benchmark/AndroidManifest.xml
+++ b/tests/java_api/RsBLAS_Benchmark/AndroidManifest.xml
@@ -34,6 +34,6 @@
</intent-filter>
</activity>
</application>
- <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.example.android.rs.blasbenchmark"/>
</manifest>
diff --git a/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java b/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
index f0b5a4d..e12aca4 100644
--- a/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
+++ b/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
@@ -19,18 +19,17 @@
import android.app.Activity;
import android.os.Bundle;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import com.example.android.rs.blasbenchmark.BlasTestList.TestName;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-
/**
* BLAS benchmark test.
* To run the test, please use command
*
- * adb shell am instrument -w com.example.android.rs.blasbenchmark/android.support.test.runner.AndroidJUnitRunner
+ * adb shell am instrument -w com.example.android.rs.blasbenchmark/androidx.test.runner.AndroidJUnitRunner
*
*/
public class BlasTest extends ActivityInstrumentationTestCase2<BlasBenchmark> {
diff --git a/tests/java_api/RsTest/Android.mk b/tests/java_api/RsTest/Android.mk
index d097143..256efef 100644
--- a/tests/java_api/RsTest/Android.mk
+++ b/tests/java_api/RsTest/Android.mk
@@ -18,7 +18,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
LOCAL_SRC_FILES := \
$(call all-java-files-under,src) \
diff --git a/tests/java_api/RsTest/AndroidManifest.xml b/tests/java_api/RsTest/AndroidManifest.xml
index e5f1ef1..64ea460 100644
--- a/tests/java_api/RsTest/AndroidManifest.xml
+++ b/tests/java_api/RsTest/AndroidManifest.xml
@@ -35,7 +35,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.rs.test"
android:label="RenderScript Tests" />
</manifest>
diff --git a/tests/java_api/RsTest/AndroidTest.xml b/tests/java_api/RsTest/AndroidTest.xml
index e4bdb1f..7be6b56 100644
--- a/tests/java_api/RsTest/AndroidTest.xml
+++ b/tests/java_api/RsTest/AndroidTest.xml
@@ -22,7 +22,7 @@
<option name="test-tag" value="RSTest" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.rs.test" />
- <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/java_api/RsTest/src/com/android/rs/test/RSTest.java b/tests/java_api/RsTest/src/com/android/rs/test/RSTest.java
index 4ed34ba..df0955f 100644
--- a/tests/java_api/RsTest/src/com/android/rs/test/RSTest.java
+++ b/tests/java_api/RsTest/src/com/android/rs/test/RSTest.java
@@ -16,12 +16,12 @@
package com.android.rs.test;
-import com.android.rs.unittest.UnitTest;
-
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+
+import com.android.rs.unittest.UnitTest;
import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +37,7 @@
* RSTest, functional test for platform RenderScript APIs.
* To run the test, please use command
*
- * adb shell am instrument -w com.android.rs.test/android.support.test.runner.AndroidJUnitRunner
+ * adb shell am instrument -w com.android.rs.test/androidx.test.runner.AndroidJUnitRunner
*/
@RunWith(Parameterized.class)
public class RSTest {
