From 502ec7ae4bf0aa26e34a01efdf81116de6907809 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 1 Mar 2019 14:43:20 -0800 Subject: Migrate remainder of frameworks/base to androidx.test See go/jetpack-test-android-migration Exempt-From-Owner-Approval: automated package name refactoring Test: m m -j BroadcastRadioTests KeystoreTests mediaframeworktest ActivityManagerPerfTests AppLaunch AppLaunchWear BackgroundDexOptServiceIntegrationTests AppCompatibilityTest DynamicCodeLoggerIntegrationTests FlickerLibTest InternalTests PackageWatchdogTest RcsTests RollbackTestAppAv1 RollbackTestAppAv2 RollbackTestAppACrashingV2 RollbackTestAppBv1 RollbackTestAppBv2 RollbackTestAppASplitV1 RollbackTestAppASplitV2 RollbackTest ServiceCrashTest UsageStatsPerfTests UsbTests WindowAnimationJank Change-Id: I32fe3297656eec6060da6c7e24582bcd5315fb16 --- .../src/com/android/compatibilitytest/AppCompatibility.java | 5 +++-- .../src/com/android/compatibilitytest/AppCompatibilityRunner.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/Compatibility/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 {} -- cgit v1.2.3-59-g8ed1b