diff options
| author | Brett Chabot <brettchabot@google.com> | 2019-03-01 14:43:20 -0800 |
|---|---|---|
| committer | Brett Chabot <brettchabot@google.com> | 2019-03-02 00:35:17 +0000 |
| commit | 502ec7ae4bf0aa26e34a01efdf81116de6907809 (patch) | |
| tree | c06584e05e03178beb73e3f6916462a7039a4ac1 /tests/PackageWatchdog | |
| parent | a485f9a4f101cc8f0749a96e3cb87afc407896a6 (diff) | |
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
Diffstat (limited to 'tests/PackageWatchdog')
| -rw-r--r-- | tests/PackageWatchdog/Android.mk | 2 | ||||
| -rw-r--r-- | tests/PackageWatchdog/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/PackageWatchdog/Android.mk b/tests/PackageWatchdog/Android.mk index 1c1c2a426d15..1e4aacce1613 100644 --- a/tests/PackageWatchdog/Android.mk +++ b/tests/PackageWatchdog/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ junit \ frameworks-base-testutils \ - android-support-test \ + androidx.test.rules \ services.core LOCAL_JAVA_LIBRARIES := \ diff --git a/tests/PackageWatchdog/AndroidManifest.xml b/tests/PackageWatchdog/AndroidManifest.xml index fa89528403c3..540edb41f66f 100644 --- a/tests/PackageWatchdog/AndroidManifest.xml +++ b/tests/PackageWatchdog/AndroidManifest.xml @@ -22,7 +22,7 @@ </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.tests.packagewatchdog" android:label="PackageWatchdog Test"/> </manifest> diff --git a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java index 77cd62e4cbd3..598f60ad7c8d 100644 --- a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java +++ b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java @@ -24,7 +24,8 @@ import static org.junit.Assert.assertTrue; import android.content.pm.VersionedPackage; import android.os.test.TestLooper; -import android.support.test.InstrumentationRegistry; + +import androidx.test.InstrumentationRegistry; import com.android.server.PackageWatchdog.PackageHealthObserver; import com.android.server.PackageWatchdog.PackageHealthObserverImpact; |