- Use Espresso for Search Engine dialog screenshot collection

- Use device.waitForIdle() so the expanding menu dialog can be fully drawn before the screenshot is taken
aayushsingla · Dec 8, 2017 · 5de513a · 5de513a
1 parent e162c95
commit 5de513a
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/app/src/androidTest/java/org/mozilla/focus/activity/screenshots/SettingsScreenshots.java b/app/src/androidTest/java/org/mozilla/focus/activity/screenshots/SettingsScreenshots.java
@@ -40,6 +40,7 @@
 import static android.support.test.espresso.matcher.PreferenceMatchers.withKey;
 import static android.support.test.espresso.matcher.PreferenceMatchers.withTitleText;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
 import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withParent;
@@ -77,50 +78,56 @@ public void clearSettings() {
     public void takeScreenShotsOfSettings() throws Exception {
         openSettings();
 
-        assertTrue(TestHelper.settingsHeading.waitForExists(waitingTime));
         Screengrab.screenshot("Settings_View_Top");
 
         /* Language List (First page only */
-        UiObject LanguageSelection = TestHelper.settingsList.getChild(new UiSelector()
-                .className("android.widget.LinearLayout")
-                .instance(0));
-        LanguageSelection.click();
-        TestHelper.settingsHeading.waitUntilGone(waitingTime);
+        onView(withText(R.string.preference_language))
+                .perform(click());
 
+        // Cancel button is not translated in some locales, and there are no R.id defined
+        // That can be checked in the language list dialog
         UiObject CancelBtn =  device.findObject(new UiSelector()
                 .resourceId("android:id/button2")
                 .enabled(true));
+        CancelBtn.waitForExists(waitingTime);
+
         Screengrab.screenshot("Language_Selection");
         CancelBtn.click();
-        assertTrue(TestHelper.settingsHeading.waitForExists(waitingTime));
+        onView(withText(R.string.preference_language))
+                .check(matches(isDisplayed()));
 
         /* Search Engine List */
-        UiObject SearchEngineSelection = TestHelper.settingsList.getChild(new UiSelector()
-                .className("android.widget.LinearLayout")
-                .instance(1));
-        SearchEngineSelection.click();
-        TestHelper.settingsHeading.waitUntilGone(waitingTime);
+        onView(withText(R.string.preference_search_engine_default))
+                .perform(click());
+        onView(withText(R.string.preference_search_installed_search_engines))
+                .check(matches(isDisplayed()));
+
         Screengrab.screenshot("SearchEngine_Selection");
 
         /* Remove Search Engine page */
         openActionBarOverflowOrOptionsMenu(InstrumentationRegistry.getContext());
+        device.waitForIdle();       // wait until dialog fully appears
+        onView(withText(R.string.preference_search_remove))
+                .check(matches(isDisplayed()));
         Screengrab.screenshot("SearchEngine_Search_Engine_Menu");
         // Menu items don't have ids, so we have to match by text
         onView(withText(R.string.preference_search_remove))
                 .perform(click());
-
+        device.waitForIdle();       // wait until dialog fully disappears
         assertToolbarMatchesText(R.string.preference_search_remove_title);
         Screengrab.screenshot("SearchEngine_Remove_Search_Engines");
-        TestHelper.pressBackKey();
+        Espresso.pressBack();
 
         /* Manual Search Engine page */
         final String addEngineLabel = getString(R.string.preference_search_add2);
         onData(withTitleText(addEngineLabel))
                 .perform(click());
-        TestHelper.settingsHeading.waitUntilGone(waitingTime);
+        onView(withId(R.id.edit_engine_name))
+                .check(matches(isEnabled()));
+
         Screengrab.screenshot("SearchEngine_Add_Search_Engine");
-        TestHelper.pressBackKey();
-        TestHelper.pressBackKey();
+        Espresso.pressBack();;
+        Espresso.pressBack();
 
         /* Tap autocomplete menu */
         final String urlAutocompletemenu = getString(R.string.preference_subitem_autocomplete);
@@ -160,11 +167,13 @@ public void takeScreenShotsOfSettings() throws Exception {
         /* Remove menu */
         final String removeMenu = getString(R.string.preference_autocomplete_menu_remove);
         openActionBarOverflowOrOptionsMenu(InstrumentationRegistry.getContext());
+        device.waitForIdle();   // wait until dialog fully appears
         onView(withText(removeMenu))
                 .check(matches(isDisplayed()));
         Screengrab.screenshot("Autocomplete_Custom_URL_Remove_Menu_Item");
         onView(withText(removeMenu))
                 .perform(click());
+        device.waitForIdle();   // wait until dialog fully disappears
         /* Remove dialog */
         onView(withText(getString(R.string.preference_autocomplete_title_remove)))
                 .check(matches(isDisplayed()));