commit 0ddd265fdb4a1e6c27e4ae52d2d50b70ae86167d
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Mar 21 02:14:49 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 21 02:14:49 2020 +0000
tree 6346f217ec4478d242acc3eea297d4b5608e2de5
parent f946e0a5ee48f11bb45d4edab310c1c76bd17692
parent 7f6baf9f60387ff3ee8c8ee7982edb1cba7a316d

Merge "[Flake test] add state checks for WorkTabTest#testWorkEduIntermittent" into ub-launcher3-master

tests/src/com/android/launcher3/ui/WorkTabTest.java

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 7e80e5d..8d571ff 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.ui;
 
 import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.NORMAL;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -158,9 +159,11 @@
 
         // dismiss personal edu
         mDevice.pressHome();
+        waitForState("Launcher did not go home", () -> NORMAL);
 
         // open work tab
         executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));
+        waitForState("Launcher did not switch to all apps", () -> ALL_APPS);
         executeOnLauncher(launcher -> {
             AllAppsPagedView pagedView = (AllAppsPagedView) launcher.getAppsView().getContentView();
             pagedView.setCurrentPage(WORK_PAGE);