diff options
17 files changed, 27 insertions, 24 deletions
diff --git a/media/packages/BluetoothMidiService/tests/unit/Android.bp b/media/packages/BluetoothMidiService/tests/unit/Android.bp index 4d4ae9e15532..fa4612bc22e7 100644 --- a/media/packages/BluetoothMidiService/tests/unit/Android.bp +++ b/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", diff --git a/media/tests/MediaFrameworkTest/Android.bp b/media/tests/MediaFrameworkTest/Android.bp index 234462f1dc9b..3f1954a0874a 100644 --- a/media/tests/MediaFrameworkTest/Android.bp +++ b/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, diff --git a/media/tests/MediaRouter/Android.bp b/media/tests/MediaRouter/Android.bp index 4d0c258843f9..a439b79fa2f0 100644 --- a/media/tests/MediaRouter/Android.bp +++ b/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", diff --git a/media/tests/MediaRouter/AndroidManifest.xml b/media/tests/MediaRouter/AndroidManifest.xml index d9806f3cbb1d..02688d5d641a 100644 --- a/media/tests/MediaRouter/AndroidManifest.xml +++ b/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> diff --git a/media/tests/MediaRouter/AndroidTest.xml b/media/tests/MediaRouter/AndroidTest.xml index 1301062db496..d350e05ecc33 100644 --- a/media/tests/MediaRouter/AndroidTest.xml +++ b/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> diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouteInfoTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouteInfoTest.java index 92e4c9554cb4..255b95f63682 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouteInfoTest.java +++ b/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; diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java index ddefe266d897..1286fc1ad16a 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java +++ b/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; diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java index 31f240d87f94..77b3160a8016 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java +++ b/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; diff --git a/media/tests/MediaTranscodingTest/Android.bp b/media/tests/MediaTranscodingTest/Android.bp index 907c3c8b4933..bd687a1f9a8f 100644 --- a/media/tests/MediaTranscodingTest/Android.bp +++ b/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, diff --git a/media/tests/TunerTest/Android.bp b/media/tests/TunerTest/Android.bp index cef879112225..e86560447f31 100644 --- a/media/tests/TunerTest/Android.bp +++ b/media/tests/TunerTest/Android.bp @@ -9,7 +9,7 @@ android_test { ], static_libs: [ - "android-support-test", + "androidx.test.rules", "testng" ], diff --git a/media/tests/TunerTest/AndroidManifest.xml b/media/tests/TunerTest/AndroidManifest.xml index 17e9f197b68c..ec155ca46f06 100644 --- a/media/tests/TunerTest/AndroidManifest.xml +++ b/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> diff --git a/media/tests/TunerTest/AndroidTest.xml b/media/tests/TunerTest/AndroidTest.xml index d9c31f45532f..c718b150d922 100644 --- a/media/tests/TunerTest/AndroidTest.xml +++ b/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> diff --git a/media/tests/TunerTest/src/com/android/mediatunertest/TunerTest.java b/media/tests/TunerTest/src/com/android/mediatunertest/TunerTest.java index afdbce0badae..de7f7ebabd8c 100644 --- a/media/tests/TunerTest/src/com/android/mediatunertest/TunerTest.java +++ b/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 android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/tests/GamePerformance/Android.bp b/tests/GamePerformance/Android.bp index 648fd8151b4e..02908d3a4cd4 100644 --- a/tests/GamePerformance/Android.bp +++ b/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", diff --git a/tests/NullHomeTest/Android.bp b/tests/NullHomeTest/Android.bp index 99248bfe1da1..fc71d0deaac6 100644 --- a/tests/NullHomeTest/Android.bp +++ b/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"], } diff --git a/tests/NullHomeTest/AndroidManifest.xml b/tests/NullHomeTest/AndroidManifest.xml index dc6402e03b5a..6f77781c7a29 100644 --- a/tests/NullHomeTest/AndroidManifest.xml +++ b/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" /> diff --git a/tests/NullHomeTest/src/com/android/test/nullhome/NullHomeTest.java b/tests/NullHomeTest/src/com/android/test/nullhome/NullHomeTest.java index 1d77cdc51187..3ec3ef2f8fea 100644 --- a/tests/NullHomeTest/src/com/android/test/nullhome/NullHomeTest.java +++ b/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; |