diff options
author | vadimt <vadimt@google.com> | 2019-07-12 12:26:08 -0700 |
---|---|---|
committer | vadimt <vadimt@google.com> | 2019-07-12 12:26:08 -0700 |
commit | d91cec72feb435d403192080edc28747889d02fa (patch) | |
tree | 5a07595c070f9a9e17f5ac4b7d840c8d57a5db8e | |
parent | 59b5b3f2a2d97e3652ecd8d19090262c9d4fc11c (diff) | |
download | packages_apps_Trebuchet-d91cec72feb435d403192080edc28747889d02fa.tar.gz packages_apps_Trebuchet-d91cec72feb435d403192080edc28747889d02fa.tar.bz2 packages_apps_Trebuchet-d91cec72feb435d403192080edc28747889d02fa.zip |
Simplifying switching to home for some tests
Change-Id: I696d0267a2c36a18080396657bed07f7b1654a7d
8 files changed, 16 insertions, 32 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java index d9fcf4d97..d0956d1f6 100644 --- a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java +++ b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java @@ -88,7 +88,7 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { */ @Test public void testPredictionExistsInAllApps() { - mActivityMonitor.startLauncher(); + mDevice.pressHome(); mLauncher.pressHome().switchToAllApps(); // Dispatch an update @@ -103,7 +103,7 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { */ @Test public void testPredictionsDeferredUntilHome() { - mActivityMonitor.startLauncher(); + mDevice.pressHome(); sendPredictionUpdate(mSampleApp1, mSampleApp2); mLauncher.pressHome().switchToAllApps(); waitForLauncherCondition("Predictions were not updated in loading state", @@ -120,7 +120,7 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { @Test public void testPredictionsDisabled() { - mActivityMonitor.startLauncher(); + mDevice.pressHome(); sendPredictionUpdate(); mLauncher.pressHome().switchToAllApps(); diff --git a/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java b/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java index 58c74cef1..a76b4a488 100644 --- a/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java +++ b/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java @@ -72,7 +72,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { writeLayout(new LauncherLayoutBuilder().atHotseat(0).putApp(SETTINGS_APP, SETTINGS_APP)); // Launch the home activity - mActivityMonitor.startLauncher(); + mDevice.pressHome(); waitForModelLoaded(); mLauncher.getWorkspace().getHotseatAppIcon(getSettingsApp().getLabel().toString()); @@ -88,7 +88,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { info.getComponent().getClassName(), 2, 2)); // Launch the home activity - mActivityMonitor.startLauncher(); + mDevice.pressHome(); waitForModelLoaded(); // Verify widget present @@ -105,7 +105,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { .build()); // Launch the home activity - mActivityMonitor.startLauncher(); + mDevice.pressHome(); waitForModelLoaded(); mLauncher.getWorkspace().getHotseatFolder("Folder: Copy"); diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java index c93c20a61..79c2d071d 100644 --- a/tests/src/com/android/launcher3/ui/WorkTabTest.java +++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java @@ -53,7 +53,7 @@ public class WorkTabTest extends AbstractLauncherUiTest { @Test public void workTabExists() { - mActivityMonitor.startLauncher(); + mDevice.pressHome(); executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS)); diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java index dc72bda9a..3206a69bb 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java @@ -98,7 +98,7 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest { lockRotation(true); clearHomescreen(); - mActivityMonitor.startLauncher(); + mDevice.pressHome(); final Widgets widgets = mLauncher.getWorkspace().openAllWidgets(); diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java index 4529a80d1..276c6144a 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java @@ -55,7 +55,7 @@ public class AddWidgetTest extends AbstractLauncherUiTest { private void performTest() throws Throwable { clearHomescreen(); - mActivityMonitor.startLauncher(); + mDevice.pressHome(); final LauncherAppWidgetProviderInfo widgetInfo = TestViewHelpers.findWidgetProvider(this, false /* hasConfigureScreen */); diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java index d36126bb1..3a7df64e8 100644 --- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java @@ -267,7 +267,7 @@ public class BindWidgetTest extends AbstractLauncherUiTest { resetLoaderState(); // Launch the home activity - mActivityMonitor.startLauncher(); + mDevice.pressHome(); waitForModelLoaded(); } diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java index 6122daec2..a9a509098 100644 --- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java @@ -131,7 +131,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { lockRotation(true); clearHomescreen(); - mActivityMonitor.startLauncher(); + mDevice.pressHome(); // Open Pin item activity BlockingBroadcastReceiver openMonitor = new BlockingBroadcastReceiver( diff --git a/tests/src/com/android/launcher3/util/rule/LauncherActivityRule.java b/tests/src/com/android/launcher3/util/rule/LauncherActivityRule.java index 2aba7a56d..204240324 100644 --- a/tests/src/com/android/launcher3/util/rule/LauncherActivityRule.java +++ b/tests/src/com/android/launcher3/util/rule/LauncherActivityRule.java @@ -15,11 +15,6 @@ */ package com.android.launcher3.util.rule; -import static com.android.launcher3.tapl.TestHelpers.getHomeIntentInPackage; - -import static androidx.test.InstrumentationRegistry.getInstrumentation; -import static androidx.test.InstrumentationRegistry.getTargetContext; - import android.app.Activity; import android.app.Application; import android.app.Application.ActivityLifecycleCallbacks; @@ -52,26 +47,15 @@ public class LauncherActivityRule implements TestRule { } public Callable<Boolean> itemExists(final ItemOperator op) { - return new Callable<Boolean>() { - - @Override - public Boolean call() throws Exception { - Launcher launcher = getActivity(); - if (launcher == null) { - return false; - } - return launcher.getWorkspace().getFirstMatch(op) != null; + return () -> { + Launcher launcher = getActivity(); + if (launcher == null) { + return false; } + return launcher.getWorkspace().getFirstMatch(op) != null; }; } - /** - * Starts the launcher activity in the target package. - */ - public void startLauncher() { - getInstrumentation().startActivitySync(getHomeIntentInPackage(getTargetContext())); - } - private class MyStatement extends Statement implements ActivityLifecycleCallbacks { private final Statement mBase; |