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/UsageStatsPerfTests | |
| 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/UsageStatsPerfTests')
4 files changed, 7 insertions, 6 deletions
diff --git a/tests/UsageStatsPerfTests/Android.mk b/tests/UsageStatsPerfTests/Android.mk index cd29b51e5a24..4304fb0d8e9e 100644 --- a/tests/UsageStatsPerfTests/Android.mk +++ b/tests/UsageStatsPerfTests/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ apct-perftests-utils \ services.usage diff --git a/tests/UsageStatsPerfTests/AndroidManifest.xml b/tests/UsageStatsPerfTests/AndroidManifest.xml index 596a79cd8948..98915485c7bd 100644 --- a/tests/UsageStatsPerfTests/AndroidManifest.xml +++ b/tests/UsageStatsPerfTests/AndroidManifest.xml @@ -24,6 +24,6 @@ <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.frameworks.perftests.usage"/> </manifest> diff --git a/tests/UsageStatsPerfTests/AndroidTest.xml b/tests/UsageStatsPerfTests/AndroidTest.xml index c9b51dc5ba07..b8892ebc2ff7 100644 --- a/tests/UsageStatsPerfTests/AndroidTest.xml +++ b/tests/UsageStatsPerfTests/AndroidTest.xml @@ -23,6 +23,6 @@ <option name="test-tag" value="UsageStatsPerfTests"/> <test class="com.android.tradefed.testtype.AndroidJUnitTest"> <option name="package" value="com.android.frameworks.perftests.usage"/> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/> </test> </configuration>
\ No newline at end of file diff --git a/tests/UsageStatsPerfTests/src/com/android/frameworks/perftests/usage/tests/UsageStatsDatabasePerfTest.java b/tests/UsageStatsPerfTests/src/com/android/frameworks/perftests/usage/tests/UsageStatsDatabasePerfTest.java index e2a4c26606bf..7d9d0d52b002 100644 --- a/tests/UsageStatsPerfTests/src/com/android/frameworks/perftests/usage/tests/UsageStatsDatabasePerfTest.java +++ b/tests/UsageStatsPerfTests/src/com/android/frameworks/perftests/usage/tests/UsageStatsDatabasePerfTest.java @@ -24,9 +24,10 @@ import android.content.Context; import android.os.SystemClock; import android.perftests.utils.ManualBenchmarkState; import android.perftests.utils.PerfManualStatusReporter; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import com.android.server.usage.IntervalStats; import com.android.server.usage.UsageStatsDatabase; |