diff options
| author | KOUSHIK PANUGANTI <kpanuganti@google.com> | 2018-12-17 14:41:06 -0800 |
|---|---|---|
| committer | KOUSHIK PANUGANTI <kpanuganti@google.com> | 2018-12-17 14:41:06 -0800 |
| commit | 130f0a5c48564363d61758eeaf876dd4d9f1f52f (patch) | |
| tree | 39da856e06bad1dd1937589ab7326ffa1523bca2 /apct-tests/perftests/multiuser | |
| parent | 1e65287c50a5c7177564a6ba415acdf55a4a8ada (diff) | |
Migrate frameworks/base/apct-tests/perftests/multiuser to androidx.test
See go/jetpack-test-android-migration
Test: make checkbuild
Change-Id: I73fc89de69f1eb54896a2dc19cf93b22bc4f049d
Diffstat (limited to 'apct-tests/perftests/multiuser')
4 files changed, 9 insertions, 7 deletions
diff --git a/apct-tests/perftests/multiuser/Android.mk b/apct-tests/perftests/multiuser/Android.mk index 5ff4ebc0eb80..5852044effa8 100644 --- a/apct-tests/perftests/multiuser/Android.mk +++ b/apct-tests/perftests/multiuser/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules \ apct-perftests-utils LOCAL_PACKAGE_NAME := MultiUserPerfTests diff --git a/apct-tests/perftests/multiuser/AndroidManifest.xml b/apct-tests/perftests/multiuser/AndroidManifest.xml index adb316fe6c43..e96771cf1c17 100644 --- a/apct-tests/perftests/multiuser/AndroidManifest.xml +++ b/apct-tests/perftests/multiuser/AndroidManifest.xml @@ -25,7 +25,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.perftests.multiuser"/> </manifest> diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkResultsReporter.java b/apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkResultsReporter.java index d3a3ce54e378..ba33e6439fbd 100644 --- a/apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkResultsReporter.java +++ b/apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkResultsReporter.java @@ -18,9 +18,10 @@ package android.multiuser; import android.app.Activity; import android.app.Instrumentation; import android.os.Bundle; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.test.InstrumentationRegistry; + import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java index 855be0859520..2fdba0af2c1b 100644 --- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java +++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java @@ -27,9 +27,10 @@ import android.content.pm.UserInfo; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -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 org.junit.After; import org.junit.Before; @@ -50,7 +51,7 @@ import java.util.concurrent.TimeUnit; * adb install -r \ * ${ANDROID_PRODUCT_OUT}/data/app/MultiUserPerfTests/MultiUserPerfTests.apk && * adb shell am instrument -e class android.multiuser.UserLifecycleTests \ - * -w com.android.perftests.multiuser/android.support.test.runner.AndroidJUnitRunner + * -w com.android.perftests.multiuser/androidx.test.runner.AndroidJUnitRunner * * or * |