diff options
| author | Felipe Leme <felipeal@google.com> | 2018-04-30 09:39:55 -0700 |
|---|---|---|
| committer | Felipe Leme <felipeal@google.com> | 2018-05-01 12:40:33 -0700 |
| commit | 6378b48f239963cfad496f9c7ffec3b99d1a1fd4 (patch) | |
| tree | 67f584199cdea591f09a140a04653323ad2ddad9 /apct-tests/perftests/multiuser | |
| parent | 633c4d9875c019539d6e6f0821977b8d586e64e8 (diff) | |
Initial PERF tests for autofill.
These tests render an activity that has 2 autofillable views (username and
password) and keep focusing between then, observing what happens in 4 scenarios:
1. No autofill service (baseline)
2. Autofill service returning no datasets.
3. Autofill service returning a dataset with username and password.
4. Autofill service returning a dataset with just username.
Because this change introduced a helper class to run shell commands without
needing the UiAutomator package, it also changed the MultiUserPerfTests to use
such helper.
Test: mmma -j ./frameworks/base/apct-tests/perftests/core/ && \
adb install -r $OUT/data/app/CorePerfTests/CorePerfTests.apk && \
adb shell am instrument -w -e class android.view.autofill.AutofillPerfTest \
com.android.perftests.core/android.support.test.runner.AndroidJUnitRunner
Test: mmma -j ./frameworks/base/apct-tests/perftests/multiuser && \
adb install -r $OUT/data/app/MultiUserPerfTests/MultiUserPerfTests.apk && \
adb shell am instrument -w -e class android.multiuser.UserLifecycleTests \
com.android.perftests.multiuser/android.support.test.runner.AndroidJUnitRunner
Bug: 38345816
Change-Id: Ie283dff8dd19c38ea829de9164b23aae2bfeb015
Diffstat (limited to 'apct-tests/perftests/multiuser')
| -rw-r--r-- | apct-tests/perftests/multiuser/Android.mk | 2 | ||||
| -rw-r--r-- | apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkRunner.java | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/apct-tests/perftests/multiuser/Android.mk b/apct-tests/perftests/multiuser/Android.mk index 9bc7d051121a..5ff4ebc0eb80 100644 --- a/apct-tests/perftests/multiuser/Android.mk +++ b/apct-tests/perftests/multiuser/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - ub-uiautomator + apct-perftests-utils LOCAL_PACKAGE_NAME := MultiUserPerfTests LOCAL_PRIVATE_PLATFORM_APIS := true diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkRunner.java b/apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkRunner.java index 629e6f453824..7b65bfa02a18 100644 --- a/apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkRunner.java +++ b/apct-tests/perftests/multiuser/src/android/multiuser/BenchmarkRunner.java @@ -17,10 +17,8 @@ package android.multiuser; import android.os.Bundle; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.uiautomator.UiDevice; +import android.perftests.utils.ShellHelper; -import java.io.IOException; import java.util.ArrayList; // Based on //platform/frameworks/base/apct-tests/perftests/utils/BenchmarkState.java @@ -74,12 +72,7 @@ public class BenchmarkRunner { private void prepareForNextRun() { SystemClock.sleep(COOL_OFF_PERIOD_MS); - try { - UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) - .executeShellCommand("am wait-for-broadcast-idle"); - } catch (IOException e) { - throw new IllegalStateException("Cannot execute shell command", e); - } + ShellHelper.runShellCommand("am wait-for-broadcast-idle"); mStartTimeNs = System.nanoTime(); mPausedDurationNs = 0; } |