diff options
| -rw-r--r-- | quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java | 7 | ||||
| -rw-r--r-- | tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index e9d8bce7e..c60cf45fc 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -55,12 +55,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @Before public void setUp() throws Exception { super.setUp(); - - clearLauncherData(); - - mLauncher.pressHome(); - waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL); - waitForResumed("Launcher internal state is still Background"); + TaplTestsLauncher3.initialize(this); } private void startTestApps() throws Exception { diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index 47b98fb06..c9d8b2927 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -104,13 +104,15 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { @Before public void setUp() throws Exception { super.setUp(); + initialize(this); + } - clearLauncherData(); - - mDevice.pressHome(); - waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null); - waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL); - waitForResumed("Launcher internal state is still Background"); + public static void initialize(AbstractLauncherUiTest test) throws Exception { + test.clearLauncherData(); + test.mDevice.pressHome(); + test.waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null); + test.waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL); + test.waitForResumed("Launcher internal state is still Background"); } // Please don't add negative test cases for methods that fail only after a long wait. |