diff options
author | Vadim Tryshev <vadimt@google.com> | 2018-09-20 17:30:03 -0700 |
---|---|---|
committer | Vadim Tryshev <vadimt@google.com> | 2018-09-25 10:32:30 -0700 |
commit | 47d66ad8791be94ecc6a9f9f83678a0c628e18a6 (patch) | |
tree | 083438a8a91c250f4a508169f6d02dcf39b21be4 /tests | |
parent | 19e0e8ab1fd47de8455072a18b06d373495359c9 (diff) | |
download | android_packages_apps_Trebuchet-47d66ad8791be94ecc6a9f9f83678a0c628e18a6.tar.gz android_packages_apps_Trebuchet-47d66ad8791be94ecc6a9f9f83678a0c628e18a6.tar.bz2 android_packages_apps_Trebuchet-47d66ad8791be94ecc6a9f9f83678a0c628e18a6.zip |
Support for running tests out of Launcher process
This CL doesn't turn it on yet.
Bug: 113056917
Test: TaplTests
Change-Id: I01007cb9ab330166cbb8a4c1fcd0cee0c60aeba5
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index ba7d9c523..75efea4eb 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -82,12 +82,17 @@ public abstract class AbstractLauncherUiTest { protected final LauncherInstrumentation mLauncher; protected Context mTargetContext; protected String mTargetPackage; + protected final boolean mIsInLauncherProcess; private static final String TAG = "AbstractLauncherUiTest"; protected AbstractLauncherUiTest() { - mDevice = UiDevice.getInstance(getInstrumentation()); - mLauncher = new LauncherInstrumentation(getInstrumentation()); + final Instrumentation instrumentation = getInstrumentation(); + mDevice = UiDevice.getInstance(instrumentation); + mLauncher = new LauncherInstrumentation(instrumentation); + + mIsInLauncherProcess = instrumentation.getTargetContext().getPackageName().equals( + mDevice.getLauncherPackageName()); } @Rule @@ -261,6 +266,7 @@ public abstract class AbstractLauncherUiTest { } protected <T> T getFromLauncher(Function<Launcher, T> f) { + if (!mIsInLauncherProcess) return null; return getOnUiThread(() -> f.apply(mActivityMonitor.getActivity())); } @@ -287,6 +293,7 @@ public abstract class AbstractLauncherUiTest { // flakiness. protected boolean waitForLauncherCondition( Function<Launcher, Boolean> condition, long timeout) { + if (!mIsInLauncherProcess) return true; return Wait.atMost(() -> getFromLauncher(condition), timeout); } |