Merge "Simplifying switching to home for some tests" into ub-launcher3-qt-r1-dev
am: 08159a5b08
Change-Id: If5fc0ad9ec33b18445778cc1f91f469eac1ed565
diff --git a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
index 49ff238..7801775 100644
--- a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
+++ b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
@@ -88,7 +88,7 @@
*/
@Test
public void testPredictionExistsInAllApps() {
- mActivityMonitor.startLauncher();
+ mDevice.pressHome();
mLauncher.pressHome().switchToAllApps();
// Dispatch an update
@@ -103,7 +103,7 @@
*/
@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 @@
@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 58c74ce..a76b4a4 100644
--- a/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java
+++ b/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java
@@ -72,7 +72,7 @@
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 @@
info.getComponent().getClassName(), 2, 2));
// Launch the home activity
- mActivityMonitor.startLauncher();
+ mDevice.pressHome();
waitForModelLoaded();
// Verify widget present
@@ -105,7 +105,7 @@
.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 c93c20a..79c2d07 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -53,7 +53,7 @@
@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 dc72bda..3206a69 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 @@
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 4529a80..276c614 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 @@
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 d36126b..3a7df64 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 @@
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 6122dae..a9a5090 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 @@
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 2aba7a5..2042403 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 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;