diff options
author | Vadim Tryshev <vadimt@google.com> | 2019-09-09 14:17:20 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-09 14:17:20 -0700 |
commit | c698c0cdbb29caf2dd03676e319a05aa7e519bda (patch) | |
tree | 26e48e4492be815ea75033bdb3896e75a8d505d8 /tests/src/com | |
parent | 84fa5893e76cf8c9b112981c80aa93ec3dd018d0 (diff) | |
parent | b34f951e7e717838310f2bfca7983604c1d5b9c0 (diff) | |
download | android_packages_apps_Trebuchet-c698c0cdbb29caf2dd03676e319a05aa7e519bda.tar.gz android_packages_apps_Trebuchet-c698c0cdbb29caf2dd03676e319a05aa7e519bda.tar.bz2 android_packages_apps_Trebuchet-c698c0cdbb29caf2dd03676e319a05aa7e519bda.zip |
Merge "Adding a test method to get a Launcher object when it becomes non-null" into ub-launcher3-qt-qpr1-dev
am: b34f951e7e
Change-Id: Id63a1df1aef2f35b0f6cdb0f8ab851163c8140c9
Diffstat (limited to 'tests/src/com')
-rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 6ba74cf85..86635edec 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -269,6 +269,12 @@ public abstract class AbstractLauncherUiTest { // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide // flakiness. + protected <T> T getOnceNotNull(String message, Function<Launcher, T> f) { + return getOnceNotNull(message, f, DEFAULT_ACTIVITY_TIMEOUT); + } + + // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide + // flakiness. protected void waitForLauncherCondition( String message, Function<Launcher, Boolean> condition, long timeout) { if (!TestHelpers.isInLauncherProcess()) return; @@ -277,6 +283,20 @@ public abstract class AbstractLauncherUiTest { // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide // flakiness. + protected <T> T getOnceNotNull(String message, Function<Launcher, T> f, long timeout) { + if (!TestHelpers.isInLauncherProcess()) return null; + + final Object[] output = new Object[1]; + Wait.atMost(message, () -> { + final Object fromLauncher = getFromLauncher(f); + output[0] = fromLauncher; + return fromLauncher != null; + }, timeout); + return (T) output[0]; + } + + // 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, |