Bug 1825004 - Improve coverage for custom and predefined search engines related UI tests

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

@@ -202,6 +202,13 @@ class SettingsSearchTest {
             changeDefaultSearchEngine(activityTestRule, searchEngine)
         }.submitQuery("mozilla ") {
             verifyUrl(searchEngine)
+        }.openThreeDotMenu {
+        }.openSettings {
+            verifySettingsOptionSummary("Search", "Google")
+        }.openSearchSubMenu {
+            changeDefaultSearchEngine(searchEngine)
+        }.goBack {
+            verifySettingsOptionSummary("Search", searchEngine)
         }
     }
 
@@ -233,6 +240,7 @@ class SettingsSearchTest {
             saveEditSearchEngine()
             changeDefaultSearchEngine(searchEngine.newTitle)
         }.goBack {
+            verifySettingsOptionSummary("Search", searchEngine.newTitle)
         }.goBack {
         }.openSearch {
             verifyDefaultSearchEngine(searchEngine.newTitle)

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

@@ -510,18 +510,15 @@ private fun assertEngineListShortcutContains(rule: ComposeTestRule, searchEngine
         ).waitForExists(waitingTime)
 
         rule.onNodeWithTag("mozac.awesomebar.suggestions")
-            .performScrollToIndex(5)
+            .performScrollToNode(hasText(searchEngineName))
 
         rule.onNodeWithText(searchEngineName)
-            .assertExists()
             .assertIsDisplayed()
             .assertHasClickAction()
     }
 }
 
 private fun ComposeTestRule.selectDefaultSearchEngine(searchEngine: String) {
-    onView(withId(R.id.mozac_browser_toolbar_edit_icon)).click()
-
     onNodeWithText(searchEngine)
         .assertExists()
         .assertIsDisplayed()