Bug 1849599 - Reorganize the Smoke tests suite

app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt

@@ -22,6 +22,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
+import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
@@ -80,6 +81,7 @@ class SyncIntegrationTest {
         bookmarkAfterSyncIsShown()
     }
 
+    @SmokeTest
     @Test
     fun checkAccountSettings() {
         signInFxSync()

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

@@ -10,7 +10,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
-import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
@@ -50,7 +49,6 @@ class ContextualHintsTest {
         mockWebServer.shutdown()
     }
 
-    @SmokeTest
     @Test
     fun openTotalCookieProtectionLearnMoreLinkTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)
@@ -63,7 +61,6 @@ class ContextualHintsTest {
         }
     }
 
-    @SmokeTest
     @Test
     fun dismissTotalCookieProtectionHintTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)

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

@@ -12,6 +12,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.RetryTestRule
@@ -90,6 +91,7 @@ class HomeScreenTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1364362
+    @SmokeTest
     @Test
     fun verifyJumpBackInSectionTest() {
         activityTestRule.activityRule.applySettingsExceptions {

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

@@ -152,7 +152,6 @@ class LoginsTest {
         }
     }
 
-    @SmokeTest
     @Test
     fun openWebsiteForSavedLoginTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@@ -462,6 +461,7 @@ class LoginsTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun verifyNeverSaveLoginOptionTest() {
         val loginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)

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

@@ -218,6 +218,7 @@ class NavigationToolbarTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun verifySecurePageSecuritySubMenuTest() {
         val defaultWebPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@@ -232,6 +233,7 @@ class NavigationToolbarTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun verifyInsecurePageSecuritySubMenuTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)

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

@@ -8,7 +8,6 @@ import androidx.core.net.toUri
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.Constants.PackageName.GMAIL_APP
 import org.mozilla.fenix.helpers.Constants.PackageName.PHONE_APP
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -92,7 +91,6 @@ class PwaTest {
         }
     }
 
-    @SmokeTest
     @Test
     fun appLikeExperiencePWATest() {
         navigationToolbar {

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

@@ -85,6 +85,7 @@ class SettingsAdvancedTest {
     }
 
     // Assumes Youtube is installed and enabled
+    @SmokeTest
     @Test
     fun neverOpenLinkInAppTest() {
         val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
@@ -198,7 +199,6 @@ class SettingsAdvancedTest {
     }
 
     // Assumes Youtube is installed and enabled
-    @SmokeTest
     @Test
     fun privateBrowsingAskBeforeOpeningLinkInAppCancelTest() {
         val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
@@ -232,7 +232,6 @@ class SettingsAdvancedTest {
     }
 
     // Assumes Youtube is installed and enabled
-    @SmokeTest
     @Test
     fun privateBrowsingAskBeforeOpeningLinkInAppOpenTest() {
         val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)

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

@@ -76,6 +76,7 @@ class SettingsGeneralTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun changeAccessibiltySettings() {
         // Goes through the settings and changes the default text on a webpage, then verifies if the text has changed.
@@ -192,6 +193,18 @@ class SettingsGeneralTest {
         }
     }
 
+    @Test
+    fun tabsSettingsMenuItemsTest() {
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.openTabsSubMenu {
+            verifyTabViewOptions()
+            verifyCloseTabsOptions()
+            verifyMoveOldTabsToInactiveOptions()
+        }
+    }
+
     @Test
     fun verifyTabsOptionSummaryUpdatesTest() {
         homeScreen {

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

@@ -230,9 +230,8 @@ class SettingsHomepageTest {
         }
     }
 
-    @SmokeTest
-    @Test
     @Ignore("Intermittent test: https://github.com/mozilla-mobile/fenix/issues/26559")
+    @Test
     fun setWallpaperTest() {
         val wallpapers = listOf(
             "Wallpaper Item: amethyst",

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

@@ -286,6 +286,7 @@ class SitePermissionsTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun allowLocationPermissionsTest() {
         mockLocationUpdatesRule.setMockLocation()
@@ -300,6 +301,7 @@ class SitePermissionsTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun blockLocationPermissionsTest() {
         navigationToolbar {

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

@@ -17,7 +17,6 @@ import mozilla.components.concept.engine.mediasession.MediaSession
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.IntentReceiverActivity
@@ -48,7 +47,6 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 class SmokeTest {
     private lateinit var mDevice: UiDevice
     private lateinit var mockWebServer: MockWebServer
-    private val customMenuItem = "TestMenuItem"
     private lateinit var browserStore: BrowserStore
 
     @get:Rule(order = 0)
@@ -86,34 +84,6 @@ class SmokeTest {
         mockWebServer.shutdown()
     }
 
-    /* Verifies the nav bar:
-     - opening a web page
-     - the existence of nav bar items
-     - editing the url bar
-     - the tab drawer button
-     - opening a new search and dismissing the nav bar
-     */
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1807268")
-    @Test
-    fun verifyBasicNavigationToolbarFunctionality() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-            navigationToolbar {
-            }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-                mDevice.waitForIdle()
-                verifyNavURLBarItems()
-            }.openNavigationToolbar {
-            }.goBackToWebsite {
-            }.openTabDrawer {
-                verifyExistingTabList()
-            }.openNewTab {
-            }.dismissSearchBar {
-                verifyHomeScreen()
-            }
-        }
-    }
-
     // Device or AVD requires a Google Services Android OS installation with Play Store installed
     // Verifies the Open in app button when an app is installed
     @Test
@@ -207,21 +177,6 @@ class SmokeTest {
         }
     }
 
-    @Test
-    fun emptyTabsTrayViewPrivateBrowsingTest() {
-        navigationToolbar {
-        }.openTabTray {
-        }.toggleToPrivateTabs() {
-            verifyNormalBrowsingButtonIsSelected(false)
-            verifyPrivateBrowsingButtonIsSelected(true)
-            verifySyncedTabsButtonIsSelected(false)
-            verifyNoOpenTabsInPrivateBrowsing()
-            verifyPrivateBrowsingNewTabButton()
-            verifyTabTrayOverflowMenu(true)
-            verifyEmptyTabsTrayMenuButtons()
-        }
-    }
-
     @Test
     fun privateTabsTrayWithOpenedTabTest() {
         val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -422,16 +377,4 @@ class SmokeTest {
             verifyHomeScreen()
         }
     }
-
-    @Test
-    fun tabsSettingsMenuItemsTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openTabsSubMenu {
-            verifyTabViewOptions()
-            verifyCloseTabsOptions()
-            verifyMoveOldTabsToInactiveOptions()
-        }
-    }
 }

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

@@ -256,6 +256,7 @@ class TabbedBrowsingTest {
         }
     }
 
+    @SmokeTest
     @Test
     fun closePrivateTabsNotificationTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -312,6 +313,21 @@ class TabbedBrowsingTest {
         }
     }
 
+    @Test
+    fun emptyTabsTrayViewPrivateBrowsingTest() {
+        navigationToolbar {
+        }.openTabTray {
+        }.toggleToPrivateTabs {
+            verifyNormalBrowsingButtonIsSelected(false)
+            verifyPrivateBrowsingButtonIsSelected(true)
+            verifySyncedTabsButtonIsSelected(false)
+            verifyNoOpenTabsInPrivateBrowsing()
+            verifyPrivateBrowsingNewTabButton()
+            verifyTabTrayOverflowMenu(true)
+            verifyEmptyTabsTrayMenuButtons()
+        }
+    }
+
     @Test
     fun verifyOpenTabDetails() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)