For #6707 #6708 - Fix UI Tests for new Search Engine Behavior

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

@@ -63,25 +63,26 @@ class SettingsBasicsTest {
             verifyBasicsHeading()
             verifySearchEngineButton()
             // drill down to submenu
-            }.openSearchSubMenu {
+        }.openSearchSubMenu {
-                verifyDefaultSearchEngineHeader()
+            verifyDefaultSearchEngineHeader()
-                verifySearchEngineList()
+            verifySearchEngineList()
-                verifyShowSearchSuggestions()
+            verifyShowSearchSuggestions()
-                verifyShowClipboardSuggestions()
+            verifyShowSearchShortcuts()
-                verifySearchBrowsingHistory()
+            verifyShowClipboardSuggestions()
-                verifySearchBookmarks()
+            verifySearchBrowsingHistory()
-            }.goBack {
+            verifySearchBookmarks()
-            }.openThemeSubMenu {
+        }.goBack {
-                verifyThemes()
+        }.openThemeSubMenu {
-            }.goBack {
+            verifyThemes()
-            }.openAccessibilitySubMenu {
+        }.goBack {
-                verifyAutomaticFontSizing()
+        }.openAccessibilitySubMenu {
-            }.goBack {
+            verifyAutomaticFontSizing()
+        }.goBack {
             // drill down to submenu
-            }.openDefaultBrowserSubMenu {
+        }.openDefaultBrowserSubMenu {
-                // verify item: set as default browser (duplicates, verify child of recyclerview)
+            // verify item: set as default browser (duplicates, verify child of recyclerview)
-                // Verify label: Open links in private tab
+            // Verify label: Open links in private tab
-            }.goBack {
+        }.goBack {
         }
     }
 

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

@@ -22,6 +22,7 @@ class SettingsSubMenuSearchRobot {
     fun verifyDefaultSearchEngineHeader() = assertDefaultSearchEngineHeader()
     fun verifySearchEngineList() = assertSearchEngineList()
     fun verifyShowSearchSuggestions() = assertShowSearchSuggestions()
+    fun verifyShowSearchShortcuts() = assertShowSearchShortcuts()
     fun verifyShowClipboardSuggestions() = assertShowClipboardSuggestions()
     fun verifySearchBrowsingHistory() = assertSearchBrowsingHistory()
     fun verifySearchBookmarks() = assertSearchBookmarks()
@@ -54,10 +55,15 @@ private fun assertSearchEngineList() {
         .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
     onView(ViewMatchers.withText("Wikipedia"))
         .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+    onView(ViewMatchers.withText("Add search engine"))
+        .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 }
 
 private fun assertShowSearchSuggestions() = onView(ViewMatchers.withText("Show search suggestions"))
     .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+
+private fun assertShowSearchShortcuts() = onView(ViewMatchers.withText("Show search shortcuts"))
+    .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 private fun assertShowClipboardSuggestions() = onView(ViewMatchers.withText("Show clipboard suggestions"))
     .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 private fun assertSearchBrowsingHistory() = onView(ViewMatchers.withText("Search browsing history"))

app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt

@@ -329,7 +329,8 @@ class AwesomeBarView(
 
                 searchSuggestionProviderMap.put(
                     engine, SearchSuggestionProvider(
-                        components.search.provider.getDefaultEngine(this),
+                        components.search.provider.installedSearchEngines(this).list.find { it.name == engine.name }
+                            ?: components.search.provider.getDefaultEngine(this),
                         shortcutSearchUseCase,
                         components.core.client,
                         limit = 3,