Merge "Convert to androidx.test from android-support-test."

media/packages/BluetoothMidiService/tests/unit/Android.bp

@@ -20,7 +20,6 @@ android_test {
     certificate: "platform",
     static_libs: [
         //"frameworks-base-testutils",
-        "android-support-test",
         "androidx.test.core",
         "androidx.test.ext.truth",
         "androidx.test.runner",

media/tests/MediaFrameworkTest/Android.bp

@@ -10,7 +10,6 @@ android_test {
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "android-ex-camera2",
-        "android-support-test",
         "testng"
     ],
     platform_apis: true,

media/tests/MediaRouter/Android.bp

@@ -9,7 +9,7 @@ android_test {
     ],
 
     static_libs: [
-        "android-support-test",
+        "androidx.test.rules",
         "mockito-target-minus-junit4",
         "testng",
         "truth-prebuilt",

media/tests/MediaRouter/AndroidManifest.xml

@@ -27,7 +27,7 @@
         </service>
     </application>
 
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                      android:targetPackage="com.android.mediaroutertest"
                      android:label="MediaRouter Tests"/>
 </manifest>

media/tests/MediaRouter/AndroidTest.xml

@@ -10,7 +10,7 @@
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.mediaroutertest"/>
-        <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>

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouteInfoTest.java

@@ -20,13 +20,14 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.hardware.display.DisplayManagerGlobal;
 import android.media.MediaRouter;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
 import android.view.Display;
 import android.view.DisplayAddress;
 import android.view.DisplayAdjustments;
 import android.view.DisplayInfo;
 
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java

@@ -52,12 +52,13 @@ import android.media.MediaRouter2Utils;
 import android.media.RouteDiscoveryPreference;
 import android.media.RoutingSessionInfo;
 import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
 import android.text.TextUtils;
 
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java

@@ -20,8 +20,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
 import android.media.RoutingSessionInfo;
-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;

media/tests/MediaTranscodingTest/Android.bp

@@ -9,7 +9,7 @@ android_test {
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "androidx.test.uiautomator_uiautomator",
-        "android-support-test",
+        "androidx.test.rules",
         "testng"
     ],
     platform_apis: true,

media/tests/TunerTest/Android.bp

@@ -9,7 +9,7 @@ android_test {
     ],
 
     static_libs: [
-        "android-support-test",
+        "androidx.test.rules",
         "testng"
     ],
 

media/tests/TunerTest/AndroidManifest.xml

@@ -23,7 +23,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.mediatunertest"
                      android:label="Media Tuner Tests"/>
 </manifest>

media/tests/TunerTest/AndroidTest.xml

@@ -12,6 +12,6 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.mediatunertest"/>
         <option name="hidden-api-checks" value="false"/>
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
+        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>
     </test>
 </configuration>

media/tests/TunerTest/src/com/android/mediatunertest/TunerTest.java

@@ -21,9 +21,10 @@ import static org.junit.Assert.assertNotNull;
 import android.content.Context;
 import android.media.tv.tuner.Descrambler;
 import android.media.tv.tuner.Tuner;
-import android.support.test.InstrumentationRegistry;
+
-import android.support.test.filters.SmallTest;
+import androidx.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;

tests/GamePerformance/Android.bp

@@ -22,7 +22,7 @@ android_test_helper_app {
         enabled: false,
     },
     srcs: ["src/**/*.java"],
-    static_libs: ["android-support-test"],
+    static_libs: ["androidx.test.rules"],
     libs: [
         "android.test.base",
         "android.test.runner",

tests/NullHomeTest/Android.bp

@@ -17,6 +17,6 @@ android_test {
     srcs: ["src/**/*.java"],
     certificate: "platform",
     platform_apis: true,
-    static_libs: ["android-support-test"],
+    static_libs: ["androidx.test.rules"],
     test_suites: ["device-tests"],
 }

tests/NullHomeTest/AndroidManifest.xml

@@ -21,7 +21,7 @@
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 
     <instrumentation
-        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.test.nullhome"
         android:label="Check if no null Home exists/is enabled" />
 

tests/NullHomeTest/src/com/android/test/nullhome/NullHomeTest.java

@@ -18,9 +18,10 @@ package com.android.test.nullhome;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.support.test.InstrumentationRegistry;
 import android.util.Log;
 
+import androidx.test.InstrumentationRegistry;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;