Bug 1855449 - Normal Browsing search TestRail matching

8 months ago · 9b599dc07a
parent 93ef8c7c25
commit 9b599dc07a
3 changed files with 62 additions and 44 deletions
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt
@ -156,7 +156,7 @@ class ComposeSearchTest {

    @SmokeTest
    @Test
-    fun scanButtonDenyPermissionTest() {
+    fun verifyQRScanningCameraAccessDialogTest() {
        val cameraManager = TestHelper.appContext.getSystemService(Context.CAMERA_SERVICE) as CameraManager
        Assume.assumeTrue(cameraManager.cameraIdList.isNotEmpty())

@ -177,7 +177,7 @@ class ComposeSearchTest {

    @SmokeTest
    @Test
-    fun scanButtonAllowPermissionTest() {
+    fun scanQRCodeToOpenAWebpageTest() {
        val cameraManager = TestHelper.appContext.getSystemService(Context.CAMERA_SERVICE) as CameraManager
        Assume.assumeTrue(cameraManager.cameraIdList.isNotEmpty())

@ -213,7 +213,7 @@ class ComposeSearchTest {
    // Verifies a temporary change of search engine from the Search shortcut menu
    @SmokeTest
    @Test
-    fun selectSearchEnginesShortcutTest() {
+    fun searchEnginesCanBeChangedTemporarilyFromSearchSelectorMenuTest() {
        val enginesList = listOf("DuckDuckGo", "Google", "Amazon.com", "Wikipedia", "Bing", "eBay")

        enginesList.forEach {
@ -230,7 +230,7 @@ class ComposeSearchTest {
    }

    @Test
-    fun accessSearchSettingFromSearchSelectorMenuTest() {
+    fun defaultSearchEnginesCanBeSetFromSearchSelectorMenuTest() {
        searchScreen {
            clickSearchSelectorButton()
        }.clickSearchEngineSettings {
@ -247,7 +247,7 @@ class ComposeSearchTest {
    }

    @Test
-    fun clearSearchTest() {
+    fun verifyClearSearchButtonTest() {
        homeScreen {
        }.openSearch {
            typeSearch(queryString)
@ -622,9 +622,10 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1850517
    // Test that verifies the Firefox Suggest results in a general search context
    @Test
-    fun firefoxSuggestHeaderForBrowsingDataSuggestionsTest() {
+    fun verifyFirefoxSuggestHeaderForBrowsingDataSuggestionsTest() {
        val firstPage = TestAssetHelper.getGenericAsset(searchMockServer, 1)
        val secondPage = TestAssetHelper.getGenericAsset(searchMockServer, 2)

@ -646,8 +647,9 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154197
    @Test
-    fun verifySearchTabsItemsTest() {
+    fun verifyTabsSearchItemsTest() {
        navigationToolbar {
        }.clickUrlbar {
            clickSearchSelectorButton()
@ -659,8 +661,9 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154198
    @Test
-    fun verifySearchTabsWithoutOpenTabsTest() {
+    fun verifyTabsSearchWithoutOpenTabsTest() {
        navigationToolbar {
        }.clickUrlbar {
            clickSearchSelectorButton()
@ -672,9 +675,10 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154199
    @SmokeTest
    @Test
-    fun verifySearchTabsWithOpenTabsTest() {
+    fun verifyTabsSearchWithOpenTabsTest() {
        val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1)
        val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2)

@ -707,8 +711,9 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154203
    @Test
-    fun verifySearchForBookmarksUITest() {
+    fun verifyBookmarksSearchItemsTest() {
        navigationToolbar {
        }.clickSearchSelectorButton {
            selectTemporarySearchMethod("Bookmarks")
@ -719,8 +724,9 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154204
    @Test
-    fun bookmarkSearchWithNoBookmarksTest() {
+    fun verifyBookmarkSearchWithNoBookmarksTest() {
        navigationToolbar {
        }.clickSearchSelectorButton {
            selectTemporarySearchMethod("Bookmarks")
@ -729,8 +735,9 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154206
    @Test
-    fun bookmarkSearchWhenBookmarksExistTest() {
+    fun verifyBookmarksSearchForBookmarkedItemsTest() {
        createBookmarkItem(url = "https://bookmarktest1.com", title = "Test1", position = 1u)
        createBookmarkItem(url = "https://bookmarktest2.com", title = "Test2", position = 2u)

@ -756,8 +763,9 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154212
    @Test
-    fun verifySearchHistoryItemsTest() {
+    fun verifyHistorySearchItemsTest() {
        navigationToolbar {
        }.clickUrlbar {
            clickSearchSelectorButton()
@ -769,8 +777,9 @@ class ComposeSearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154213
    @Test
-    fun verifySearchHistoryWithoutBrowsingDataTest() {
+    fun verifyHistorySearchWithoutBrowsingHistoryTest() {
        navigationToolbar {
        }.clickUrlbar {
            clickSearchSelectorButton()
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
@ -32,6 +32,7 @@ import org.mozilla.fenix.helpers.MockBrowserDataHelper.createTabItem
 import org.mozilla.fenix.helpers.MockBrowserDataHelper.setCustomSearchEngine
 import org.mozilla.fenix.helpers.SearchDispatcher
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
+import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.appContext
 import org.mozilla.fenix.helpers.TestHelper.assertNativeAppOpens
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
@ -49,6 +50,7 @@ import org.mozilla.fenix.ui.robots.longClickPageObject
 import org.mozilla.fenix.ui.robots.multipleSelectionToolbar
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import org.mozilla.fenix.ui.robots.searchScreen
+import java.util.Locale

 /**
 *  Tests for verifying the search fragment
@ -173,9 +175,10 @@ class SearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1059459
    @SmokeTest
    @Test
-    fun scanButtonDenyPermissionTest() {
+    fun verifyQRScanningCameraAccessDialogTest() {
        val cameraManager = appContext.getSystemService(Context.CAMERA_SERVICE) as CameraManager
        assumeTrue(cameraManager.cameraIdList.isNotEmpty())

@ -194,9 +197,10 @@ class SearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/235397
    @SmokeTest
    @Test
-    fun scanButtonAllowPermissionTest() {
+    fun scanQRCodeToOpenAWebpageTest() {
        val cameraManager = appContext.getSystemService(Context.CAMERA_SERVICE) as CameraManager
        assumeTrue(cameraManager.cameraIdList.isNotEmpty())

@ -230,10 +234,11 @@ class SearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/235395
    // Verifies a temporary change of search engine from the Search shortcut menu
    @SmokeTest
    @Test
-    fun selectSearchEnginesShortcutTest() {
+    fun searchEnginesCanBeChangedTemporarilyFromSearchSelectorMenuTest() {
        val enginesList = listOf("DuckDuckGo", "Google", "Amazon.com", "Wikipedia", "Bing", "eBay")

        enginesList.forEach {
@ -249,8 +254,9 @@ class SearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/233589
    @Test
-    fun accessSearchSettingFromSearchSelectorMenuTest() {
+    fun defaultSearchEnginesCanBeSetFromSearchSelectorMenuTest() {
        searchScreen {
            clickSearchSelectorButton()
        }.clickSearchEngineSettings {
@ -266,8 +272,9 @@ class SearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/522918
    @Test
-    fun clearSearchTest() {
+    fun verifyClearSearchButtonTest() {
        homeScreen {
        }.openSearch {
            typeSearch(queryString)
@ -641,9 +648,10 @@ class SearchTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2154215
    @SmokeTest
    @Test
-    fun verifySearchHistoryWithBrowsingDataTest() {
+    fun verifyHistorySearchWithBrowsingHistoryTest() {
        val firstPageUrl = getGenericAsset(searchMockServer, 1)
        val secondPageUrl = getGenericAsset(searchMockServer, 2)

@ -759,4 +767,29 @@ class SearchTest {
            )
        }
    }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1232631
+    // Expected for app language set to Arabic
+    @Test
+    fun verifySearchEnginesFunctionalityUsingRTLLocaleTest() {
+        val arabicLocale = Locale("ar", "AR")
+
+        TestHelper.runWithSystemLocaleChanged(arabicLocale, activityTestRule.activityRule) {
+            homeScreen {
+            }.openSearch {
+                verifyTranslatedFocusedNavigationToolbar("ابحث أو أدخِل عنوانا")
+                clickSearchSelectorButton()
+                verifySearchShortcutListContains(
+                    "Google",
+                    "Bing",
+                    "Amazon.com",
+                    "DuckDuckGo",
+                    "ويكيبيديا (ar)",
+                )
+                selectTemporarySearchMethod("ويكيبيديا (ar)")
+            }.submitQuery("firefox") {
+                verifyUrl("firefox")
+            }
+        }
+    }
 }
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt
@ -530,30 +530,6 @@ class SettingsSearchTest {
        }
    }

-    // Expected for app language set to Arabic
-    @Test
-    fun verifySearchEnginesWithRTLLocale() {
-        val arabicLocale = Locale("ar", "AR")
-
-        runWithSystemLocaleChanged(arabicLocale, activityTestRule.activityRule) {
-            homeScreen {
-            }.openSearch {
-                verifyTranslatedFocusedNavigationToolbar("ابحث أو أدخِل عنوانا")
-                clickSearchSelectorButton()
-                verifySearchShortcutListContains(
-                    "Google",
-                    "Bing",
-                    "Amazon.com",
-                    "DuckDuckGo",
-                    "ويكيبيديا (ar)",
-                )
-                selectTemporarySearchMethod("ويكيبيديا (ar)")
-            }.submitQuery("firefox") {
-                verifyUrl("firefox")
-            }
-        }
-    }
-
    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2233337
    @Test
    fun verifyTheSearchEnginesListsRespectTheLocaleTest() {