Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate frameworks/base/apct-tests/perftests/multiuser to androidx.test

Browse Source 
See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: I73fc89de69f1eb54896a2dc19cf93b22bc4f049d
This commit is contained in:
KOUSHIK PANUGANTI
2018-12-17 14:41:06 -08:00
parent 1e65287c50
commit 130f0a5c48
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apct-tests/perftests/multiuser/Android.mk
View File

@@ -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

2
apct-tests/perftests/multiuser/AndroidManifest.xml
View File

@@ -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>

3
apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkResultsReporter.java
View File

@@ -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;

9
apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
View File

@@ -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
*