diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2019-05-23 16:54:59 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2019-05-23 17:01:19 -0700 |
| commit | 9820c05f2bb091762f334269f11061467b4ba6ba (patch) | |
| tree | ee9b2f5be0ae9efb98a83be9acb8a4d893da48ed /tests | |
| parent | 571e51161cb1e4ab7685aca5b370fba73c5727e6 (diff) | |
| download | android_packages_apps_Trebuchet-9820c05f2bb091762f334269f11061467b4ba6ba.tar.gz android_packages_apps_Trebuchet-9820c05f2bb091762f334269f11061467b4ba6ba.tar.bz2 android_packages_apps_Trebuchet-9820c05f2bb091762f334269f11061467b4ba6ba.zip | |
Removing prediciton loading state
Also fixing test flakyness due to delayed prediction loading
Bug: 132993129
Bug: 131854153
Change-Id: I85f7afff0e3ee0ca9e40e92e91681f797a0bc2de
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 4 | ||||
| -rw-r--r-- | tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index a19857c78..44401c73c 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -54,6 +54,7 @@ import com.android.launcher3.MainThreadExecutor; import com.android.launcher3.ResourceUtils; import com.android.launcher3.Utilities; import com.android.launcher3.compat.LauncherAppsCompat; +import com.android.launcher3.model.AppLaunchTracker; import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.tapl.TestHelpers; import com.android.launcher3.util.Wait; @@ -197,6 +198,9 @@ public abstract class AbstractLauncherUiTest { @Before public void setUp() throws Exception { + // Disable app tracker + AppLaunchTracker.INSTANCE.initializeForTesting(new AppLaunchTracker()); + mTargetContext = InstrumentationRegistry.getTargetContext(); mTargetPackage = mTargetContext.getPackageName(); // Unlock the phone diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index d0ea14268..d4cfe3aa2 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -64,8 +64,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { test.mDevice.pressHome(); } test.waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null); - test.waitForLauncherCondition("Prediction never had state update", - launcher -> launcher.debugIsPredictionInitialized()); test.waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL); test.waitForResumed("Launcher internal state is still Background"); // Check that we switched to home. |