For #16615: UI smoke test addPredefinedSearchEngineTest

app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt

@@ -214,7 +214,7 @@ class SmokeTest {
         homeScreen {
         }.openSearch {
             verifyKeyboardVisibility()
-            clickSearchEngineButton()
+            clickSearchEngineShortcutButton()
             verifySearchEngineList()
             changeDefaultSearchEngine("Amazon.com")
             verifySearchEngineIcon("Amazon.com")
@@ -222,7 +222,7 @@ class SmokeTest {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openTabDrawer {
         }.openNewTab {
-            clickSearchEngineButton()
+            clickSearchEngineShortcutButton()
             mDevice.waitForIdle()
             changeDefaultSearchEngine("Bing")
             verifySearchEngineIcon("Bing")
@@ -230,7 +230,7 @@ class SmokeTest {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openTabDrawer {
         }.openNewTab {
-            clickSearchEngineButton()
+            clickSearchEngineShortcutButton()
             mDevice.waitForIdle()
             changeDefaultSearchEngine("DuckDuckGo")
             verifySearchEngineIcon("DuckDuckGo")
@@ -238,7 +238,7 @@ class SmokeTest {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openTabDrawer {
         }.openNewTab {
-            clickSearchEngineButton()
+            clickSearchEngineShortcutButton()
             changeDefaultSearchEngine("Wikipedia")
             verifySearchEngineIcon("Wikipedia")
         }.goToSearchEngine {
@@ -254,4 +254,23 @@ class SmokeTest {
             }
         }
     }
+
+    @Test
+    fun addPredefinedSearchEngineTest() {
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.openSearchSubMenu {
+            openAddSearchEngineMenu()
+            verifyAddSearchEngineList()
+            addNewSearchEngine("YouTube")
+            verifyEngineListContains("YouTube")
+        }.goBack {
+        }.goBack {
+        }.openSearch {
+            verifyKeyboardVisibility()
+            clickSearchEngineShortcutButton()
+            verifyEnginesListShortcutContains("YouTube")
+        }
+    }
 }

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt

@@ -6,18 +6,19 @@
 
 package org.mozilla.fenix.ui.robots
 
-import android.widget.ToggleButton
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.swipeDown
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.Visibility
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -62,15 +63,16 @@ class SearchRobot {
     }
     fun verifyDefaultSearchEngine(expectedText: String) = assertDefaultSearchEngine(expectedText)
 
+    fun verifyEnginesListShortcutContains(searchEngineName: String) = assertEngineListShortcutContains(searchEngineName)
+
     fun changeDefaultSearchEngine(searchEngineName: String) =
         selectDefaultSearchEngine(searchEngineName)
 
-    fun clickSearchEngineButton() {
-        val searchEngineButton = mDevice.findObject(UiSelector()
-            .instance(1)
-            .className(ToggleButton::class.java))
-        searchEngineButton.waitForExists(waitingTime)
-        searchEngineButton.click()
+    fun clickSearchEngineShortcutButton() {
+        val searchEnginesShortcutButton = mDevice.findObject(UiSelector()
+            .resourceId("org.mozilla.fenix.debug:id/search_engines_shortcut_button"))
+        searchEnginesShortcutButton.waitForExists(waitingTime)
+        searchEnginesShortcutButton.click()
     }
 
     fun clickScanButton() {
@@ -266,6 +268,12 @@ private fun assertSearchEngineList() {
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 }
 
+private fun assertEngineListShortcutContains(searchEngineName: String) {
+    onView(withId(R.id.awesome_bar))
+        .perform(swipeDown())
+        .check(matches(hasDescendant(withText(searchEngineName))))
+}
+
 private fun selectDefaultSearchEngine(searchEngine: String) {
     onView(withId(R.id.mozac_browser_toolbar_edit_icon)).click()
     onView(withText(searchEngine))

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt

@@ -13,6 +13,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers.Visibility
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -20,6 +21,8 @@ import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import org.hamcrest.CoreMatchers
+import org.mozilla.fenix.R
+import org.mozilla.fenix.helpers.click
 
 /**
  * Implementation of Robot Pattern for the settings search sub menu.
@@ -32,12 +35,26 @@ class SettingsSubMenuSearchRobot {
     fun verifyShowClipboardSuggestions() = assertShowClipboardSuggestions()
     fun verifySearchBrowsingHistory() = assertSearchBrowsingHistory()
     fun verifySearchBookmarks() = assertSearchBookmarks()
+
     fun changeDefaultSearchEngine(searchEngineName: String) =
-        selectDefaultSearchEngine(searchEngineName)
+        selectSearchEngine(searchEngineName)
 
     fun disableShowSearchSuggestions() = toggleShowSearchSuggestions()
     fun enableShowSearchShortcuts() = toggleShowSearchShortcuts()
 
+    fun openAddSearchEngineMenu() = addSearchEngineButton().click()
+
+    fun verifyAddSearchEngineList() = assertAddSearchEngineList()
+
+    fun verifyEngineListContains(searchEngineName: String) = assertEngineListContains(searchEngineName)
+
+    fun saveNewSearchEngine() = addSearchEngineSaveButton().click()
+
+    fun addNewSearchEngine(searchEngineName: String) {
+        selectSearchEngine(searchEngineName)
+        saveNewSearchEngine()
+    }
+
     class Transition {
         val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
@@ -120,16 +137,12 @@ private fun assertSearchBookmarks() {
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 }
 
-private fun selectDefaultSearchEngine(searchEngine: String) {
+private fun selectSearchEngine(searchEngine: String) {
     onView(withText(searchEngine))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
         .perform(click())
 }
 
-private fun selectDuckDuckGoAsSearchEngine() {
-    selectDefaultSearchEngine("DuckDuckGo")
-}
-
 private fun toggleShowSearchSuggestions() {
     onView(withId(androidx.preference.R.id.recycler_view)).perform(
         RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
@@ -154,3 +167,17 @@ private fun toggleShowSearchShortcuts() {
 
 private fun goBackButton() =
     onView(CoreMatchers.allOf(withContentDescription("Navigate up")))
+
+private fun addSearchEngineButton() = onView(withText("Add search engine"))
+
+private fun assertAddSearchEngineList() {
+    onView(withText("Reddit")).check(matches(isDisplayed()))
+    onView(withText("YouTube")).check(matches(isDisplayed()))
+    onView(withText("Other")).check(matches(isDisplayed()))
+}
+
+private fun addSearchEngineSaveButton() = onView(withId(R.id.add_search_engine))
+
+private fun assertEngineListContains(searchEngineName: String) {
+    onView(withId(R.id.search_engine_group)).check(matches(hasDescendant(withText(searchEngineName))))
+}