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/DynamicCodeLoggerIntegrationTests | |
| 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/DynamicCodeLoggerIntegrationTests')
4 files changed, 6 insertions, 5 deletions
diff --git a/tests/DynamicCodeLoggerIntegrationTests/Android.mk b/tests/DynamicCodeLoggerIntegrationTests/Android.mk index f324eb10a7b0..62c1ba89653c 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/Android.mk +++ b/tests/DynamicCodeLoggerIntegrationTests/Android.mk @@ -67,7 +67,7 @@ LOCAL_CERTIFICATE := shared LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/server/pm) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ truth-prebuilt \ # Include both versions of the .so if we have 2 arch diff --git a/tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml b/tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml index 4327da2db3dd..08fac300512b 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml +++ b/tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml @@ -29,7 +29,7 @@ </application> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.frameworks.dynamiccodeloggertest" android:label="Integration test for DynamicCodeLogger" /> </manifest> diff --git a/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml b/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml index f70b9c8cb357..f8a1ec90a78a 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml +++ b/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml @@ -24,7 +24,7 @@ <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="com.android.frameworks.dynamiccodeloggertest"/> - <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/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java index 4f9aeea5bdb4..db2f659c655b 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java +++ b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java @@ -24,11 +24,12 @@ import android.content.Context; import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; import android.util.EventLog; import android.util.EventLog.Event; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; + import dalvik.system.DexClassLoader; import org.junit.Before; |