diff options
author | vadimt <vadimt@google.com> | 2019-04-15 16:50:12 -0700 |
---|---|---|
committer | vadimt <vadimt@google.com> | 2019-04-15 16:50:12 -0700 |
commit | a42dc530ee8f0ad2264a9ee728e6b7da942102f7 (patch) | |
tree | 98b278ed0d77b7f39c151b3c8124be6f284d3a8a /tests | |
parent | 0edbac1132f229c22ed951cf2d90d58d2f36aa06 (diff) | |
download | android_packages_apps_Trebuchet-a42dc530ee8f0ad2264a9ee728e6b7da942102f7.tar.gz android_packages_apps_Trebuchet-a42dc530ee8f0ad2264a9ee728e6b7da942102f7.tar.bz2 android_packages_apps_Trebuchet-a42dc530ee8f0ad2264a9ee728e6b7da942102f7.zip |
More improvements for wellbeing tests
Change-Id: I3c5866660bfb96378cdc80c1afc70ec438fc9add
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 4a9df989c..ab2808d44 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -280,7 +280,7 @@ public abstract class AbstractLauncherUiTest { // the results of that gesture because the wait can hide flakeness. protected void waitForState(String message, LauncherState state) { waitForLauncherCondition(message, - launcher -> launcher.getStateManager().getState() == state); + launcher -> launcher.getStateManager().getCurrentStableState() == state); } protected void waitForResumed(String message) { @@ -301,6 +301,19 @@ public abstract class AbstractLauncherUiTest { Wait.atMost(message, () -> getFromLauncher(condition), timeout); } + // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide + // flakiness. + protected void waitForLauncherCondition( + String message, + Runnable testThreadAction, Function<Launcher, Boolean> condition, + long timeout) { + if (!TestHelpers.isInLauncherProcess()) return; + Wait.atMost(message, () -> { + testThreadAction.run(); + return getFromLauncher(condition); + }, timeout); + } + protected LauncherActivityInfo getSettingsApp() { return LauncherAppsCompat.getInstance(mTargetContext) .getActivityList("com.android.settings", |