Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 249abfcf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 7f8c5ac3 130f0a5c

apct-tests/perftests/multiuser/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

apct-tests/perftests/multiuser/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkResultsReporter.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java

+5 −4
Original line number Diff line number Diff line
@@ -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

 *