Add retries to Action Bar opening in test.

devalp-pro · May 30, 2018 · 07085d7 · 07085d7
1 parent 6c146bf
commit 07085d7
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/...store/app/src/androidTest/java/com/google/firebase/example/fireeats/MainActivityTest.java b/...store/app/src/androidTest/java/com/google/firebase/example/fireeats/MainActivityTest.java
@@ -47,11 +47,7 @@
     getById("button_done").clickAndWaitForNewWindow(TIMEOUT);
 
     // Add random items
-    device.waitForIdle(TIMEOUT);
-    openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
-    UiObject addItems = device.findObject(new UiSelector().textContains("Add Random Items"));
-    addItems.waitForExists(TIMEOUT);
-    addItems.click();
+    getActionBarItem(new UiSelector().textContains("Add Random Items"), TIMEOUT).click();
     device.waitForIdle(TIMEOUT);
 
     // Click on the first restaurant
@@ -96,4 +92,19 @@ private void closeKeyboard() {
       }
     }
   }
+
+  private UiObject getActionBarItem(UiSelector selector, long timeout) throws InterruptedException {
+    final long STEP_TIMEOUT = 5000;
+    UiObject item = device.findObject(selector);
+
+    for (long i = 0; i < timeout; i += STEP_TIMEOUT) {
+      openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
+
+      if (item.waitForExists(STEP_TIMEOUT)) {
+        break;
+      }
+    }
+
+    return item;
+  }
 }