From b8b42ec051c07972ec8551b474551c6302dc16b4 Mon Sep 17 00:00:00 2001
From: "oana.horvath" <ohorvath@mozilla.com>
Date: Mon, 31 Jul 2023 15:16:38 +0300
Subject: [PATCH] Bug 1833120 - Programmatically switch toolbar position for
 verifySearchBookmarksViewTest UI test

---
 .../org/mozilla/fenix/ui/BookmarksTest.kt     | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index c0714e20a..c99785cee 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -29,13 +29,11 @@ import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.appContext
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
-import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
 import org.mozilla.fenix.helpers.TestHelper.registerAndCleanupIdlingResources
 import org.mozilla.fenix.helpers.TestHelper.restartApp
 import org.mozilla.fenix.ui.robots.bookmarksMenu
 import org.mozilla.fenix.ui.robots.browserScreen
-import org.mozilla.fenix.ui.robots.clearTextFieldItem
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.multipleSelectionToolbar
 import org.mozilla.fenix.ui.robots.navigationToolbar
@@ -754,8 +752,8 @@ class BookmarksTest {
     fun verifySearchBookmarksViewTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
-        browserScreen {
-            createBookmark(defaultWebPage.url)
+        createBookmarkItem(defaultWebPage.url.toString(), defaultWebPage.title, 1u)
+        homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
         }.clickSearchButton {
@@ -768,17 +766,14 @@ class BookmarksTest {
             tapOutsideToDismissSearchBar()
             verifySearchToolbar(false)
         }
-        bookmarksMenu {
-        }.goBackToBrowserScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openCustomizeSubMenu {
-            clickTopToolbarToggle()
-        }
 
-        exitMenu()
+        runBlocking {
+            // Switching to top toolbar position
+            appContext.settings().shouldUseBottomToolbar = false
+            restartApp(activityTestRule.activityRule)
+        }
 
-        browserScreen {
+        homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
         }.clickSearchButton {
@@ -814,7 +809,7 @@ class BookmarksTest {
             verifyNoSuggestionsAreDisplayed(
                 activityTestRule,
                 firstWebPage.url.toString(),
-                secondWebPage.url.toString()
+                secondWebPage.url.toString(),
             )
         }
     }