Code Review Bench PR #31027 - Refactor FXIOS-12796 [Swift 6 Migration] Fix main actor isolation warnings in XCUITests - Batch 2

firefox-ios/firefox-ios-tests/Tests/XCUITests/A11yOnboardingTests.swift

@@ -11,17 +11,17 @@ class A11yOnboardingTests: BaseTestCase {
         return "\(AccessibilityIdentifiers.Onboarding.onboarding)\(currentScreen)"
     }
 
-    override func setUp() {
+    override func setUp() async throws {
         launchArguments = [LaunchArguments.ClearProfile,
                            LaunchArguments.DisableAnimations,
                            LaunchArguments.SkipSplashScreenExperiment]
         currentScreen = 0
-        super.setUp()
+        try await super.setUp()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         app.terminate()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     func testA11yFirstRunTour() throws {

firefox-ios/firefox-ios-tests/Tests/XCUITests/A11yUtils.swift

@@ -1,9 +1,6 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/
-
 import XCTest
 
+@MainActor
 class A11yUtils: XCTestCase {
     public struct MissingAccessibilityElement {
         public let elementType: String

firefox-ios/firefox-ios-tests/Tests/XCUITests/ActivityStreamTest.swift

@@ -27,7 +27,8 @@ class ActivityStreamTest: FeatureFlaggedTestBase {
     let testWithDB = ["testTopSites2Add", "testTopSitesRemoveAllExceptDefaultClearPrivateData"]
     // Using the DDDBBs created for these tests containing enough entries for the tests that used them listed above
     let pagesVisited = "browserActivityStreamPages-places.db"
-    override func setUp() {
+
+    override func setUp() async throws {
         // Test name looks like: "[Class testFunc]", parse out the function name
         let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
         let key = String(parts[1])
@@ -41,16 +42,17 @@ class ActivityStreamTest: FeatureFlaggedTestBase {
         }
         launchArguments.append(LaunchArguments.SkipAddingGoogleTopSite)
         launchArguments.append(LaunchArguments.SkipSponsoredShortcuts)
-        super.setUp()
+        try await super.setUp()
         topSites = TopSitesScreen(app: app)
         contextMenu = ContextMenuScreen(app: app)
         tabTray = TabTrayScreen(app: app)
         browser = BrowserScreen(app: app)
         toolbar = ToolbarScreen(app: app)
     }
-    override func tearDown() {
+
+    override func tearDown() async throws {
         XCUIDevice.shared.orientation = .portrait
-        super.tearDown()
+        try await super.tearDown()
     }
 
     // https://mozilla.testrail.io/index.php?/cases/view/2273342

firefox-ios/firefox-ios-tests/Tests/XCUITests/BaseTestCase.swift

@@ -10,7 +10,9 @@ import Shared
 let page1 = "http://localhost:\(serverPort)/test-fixture/find-in-page-test.html"
 let page2 = "http://localhost:\(serverPort)/test-fixture/test-example.html"
 let serverPort = ProcessInfo.processInfo.environment["WEBSERVER_PORT"] ?? "\(Int.random(in: 1025..<65000))"
+@MainActor
 let urlBarAddress = XCUIApplication().textFields[AccessibilityIdentifiers.Browser.AddressToolbar.searchTextField]
+@MainActor
 let homepageSearchBar = XCUIApplication().cells[AccessibilityIdentifiers.FirefoxHomepage.SearchBar.itemCell]
 
 func path(forTestPage page: String) -> String {
@@ -107,16 +109,16 @@ class BaseTestCase: XCTestCase {
         }
     }
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         continueAfterFailure = false
         setUpApp()
         setUpScreenGraph()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         app.terminate()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     var skipPlatform: Bool {
@@ -503,19 +505,19 @@ class BaseTestCase: XCTestCase {
 }
 
 class IpadOnlyTestCase: BaseTestCase {
-    override func setUp() {
+    override func setUp() async throws {
         specificForPlatform = .pad
         if iPad() {
-            super.setUp()
+            await super.setUp()
         }
     }
 }
 
 class IphoneOnlyTestCase: BaseTestCase {
-    override func setUp() {
+    override func setUp() async throws {
         specificForPlatform = .phone
         if !iPad() {
-            super.setUp()
+            try await super.setUp()
         }
     }
 }

firefox-ios/firefox-ios-tests/Tests/XCUITests/BookmarksTests.swift

@@ -18,8 +18,8 @@ class BookmarksTests: FeatureFlaggedTestBase {
     private var homepageSettingsScreen: HomepageSettingsScreen!
     private var firefoxHomeScreen: FirefoxHomePageScreen!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         topSitesScreen = TopSitesScreen(app: app)
         browserScreen = BrowserScreen(app: app)
         toolbarScreen = ToolbarScreen(app: app)
@@ -28,9 +28,9 @@ class BookmarksTests: FeatureFlaggedTestBase {
         firefoxHomeScreen = FirefoxHomePageScreen(app: app)
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         XCUIDevice.shared.orientation = .portrait
-        super.tearDown()
+        try await super.tearDown()
     }
 
     private func checkBookmarked() {

firefox-ios/firefox-ios-tests/Tests/XCUITests/BrowsingPDFTests.swift

@@ -21,9 +21,9 @@ class BrowsingPDFTests: BaseTestCase {
     private var contextMenu: ContextMenuScreen!
     private var library: LibraryScreen!
 
-    override func setUp() {
+    override func setUp() async throws {
         // Test name looks like: "[Class testFunc]", parse out the function name
-        super.setUp()
+        try await super.setUp()
         topSites = TopSitesScreen(app: app)
         contextMenu = ContextMenuScreen(app: app)
         pdf = PDFScreen(app: app)

firefox-ios/firefox-ios-tests/Tests/XCUITests/C_AddressesTests.swift

@@ -13,8 +13,9 @@ class O_AddressesTests: BaseTestCase {
     private var settingsScreen: SettingScreen!
     private var browserScreen: BrowserScreen!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
+
         if #available(iOS 16, *) {
             if !name.contains("testAddressOptionIsAvailableInSettingsMenu") {
                 navigator.nowAt(NewTabScreen)
@@ -34,13 +35,13 @@ class O_AddressesTests: BaseTestCase {
         browserScreen = BrowserScreen(app: app)
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         if name.contains("testAddressOptionIsAvailableInSettingsMenu") {
             switchThemeToDarkOrLight(theme: "Light")
             XCUIDevice.shared.orientation = .portrait
         }
         app.terminate()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     // https://mozilla.testrail.io/index.php?/cases/view/2618637

firefox-ios/firefox-ios-tests/Tests/XCUITests/CookiePersistenceTests.swift

@@ -8,15 +8,15 @@ final class CookiePersistenceTests: BaseTestCase {
     let cookieSiteURL = "http://localhost:\(serverPort)/test-fixture/test-cookie-store.html"
     let topSitesTitle = ["Facebook", "YouTube", "Wikipedia"]
 
-    override func setUp() {
+    override func setUp() async throws {
         // Fresh install the app
         // removeApp() does not work on iOS 15 and 16 intermittently
         if #available(iOS 17, *) {
             removeApp()
         }
 
         // The app is correctly installed
-        super.setUp()
+        try await super.setUp()
     }
 
     func testCookiePersistenceBasic() {

firefox-ios/firefox-ios-tests/Tests/XCUITests/DatabaseFixtureTest.swift

@@ -11,7 +11,7 @@ class DatabaseFixtureTest: BaseTestCase {
         "testHistoryDatabaseFixture": "testHistoryDatabase100-places.db"
     ]
 
-    override func setUp() {
+    override func setUp() async throws {
         // Test name looks like: "[Class testFunc]", parse out the function name
         let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
         let key = String(parts[1])
@@ -21,7 +21,7 @@ class DatabaseFixtureTest: BaseTestCase {
                            LaunchArguments.LoadDatabasePrefix + fixtures[key]!,
                            LaunchArguments.SkipContextualHints,
                            LaunchArguments.DisableAnimations]
-        super.setUp()
+        try await super.setUp()
     }
 
     // https://mozilla.testrail.io/index.php?/cases/view/2458579

firefox-ios/firefox-ios-tests/Tests/XCUITests/DesktopModeTests.swift

@@ -93,10 +93,10 @@ class DesktopModeTestsIphone: BaseTestCase {
     var toolbarScreen: ToolbarScreen!
     var mainMenuScreen: MainMenuScreen!
 
-    override func setUp() {
+    override func setUp() async throws {
         specificForPlatform = .phone
         if !iPad() {
-            super.setUp()
+            try await super.setUp()
         }
         browserScreen = BrowserScreen(app: app)
         toolbarScreen = ToolbarScreen(app: app)

firefox-ios/firefox-ios-tests/Tests/XCUITests/DisplaySettingsTests.swift

@@ -5,7 +5,7 @@
 import XCTest
 
 class DisplaySettingTests: BaseTestCase {
-    override func setUp() {
+    override func setUp() async throws {
         // Fresh install the app
         // removeApp() does not work on iOS 15 and 16 intermittently
         if name.contains("testCheckDisplaySettingsDefault") {
@@ -14,7 +14,7 @@ class DisplaySettingTests: BaseTestCase {
             }
         }
         // The app is correctly installed
-        super.setUp()
+        try await super.setUp()
     }
 
     // https://mozilla.testrail.io/index.php?/cases/view/2337485

firefox-ios/firefox-ios-tests/Tests/XCUITests/DomainAutocompleteTests.swift

@@ -28,7 +28,7 @@ class DomainAutocompleteTests: BaseTestCase {
     // This DB contains 3 entries mozilla.com/github.com/git.es
     let historyDB = "browserAutocomplete-places.db"
 
-    override func setUp() {
+    override func setUp() async throws {
         // Test name looks like: "[Class testFunc]", parse out the function name
         let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
         let key = String(parts[1])
@@ -41,7 +41,7 @@ class DomainAutocompleteTests: BaseTestCase {
                                LaunchArguments.SkipContextualHints,
                                LaunchArguments.DisableAnimations]
         }
-        super.setUp()
+        try await super.setUp()
     }
 
     // https://mozilla.testrail.io/index.php?/cases/view/2334558

firefox-ios/firefox-ios-tests/Tests/XCUITests/DragAndDropTests.swift

@@ -291,7 +291,7 @@ class DragAndDropTestIpad: IpadOnlyTestCase {
         // This DDBB contains those 4 websites listed in the name
     let historyAndBookmarksDB = "browserYoutubeTwitterMozillaExample-places.db"
 
-    override func setUp() {
+    override func setUp() async throws {
         // Test name looks like: "[Class testFunc]", parse out the function name
         let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
         let key = String(parts[1])
@@ -304,12 +304,12 @@ class DragAndDropTestIpad: IpadOnlyTestCase {
                                    LaunchArguments.SkipContextualHints,
                                    LaunchArguments.DisableAnimations]
         }
-        super.setUp()
+        try await super.setUp()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         XCUIDevice.shared.orientation = UIDeviceOrientation.portrait
-        super.tearDown()
+        try await super.tearDown()
     }
 
     // https://mozilla.testrail.io/index.php?/cases/view/2307024

firefox-ios/firefox-ios-tests/Tests/XCUITests/EngagementNotificationTests.swift

@@ -5,14 +5,14 @@
 import XCTest
 
 class EngagementNotificationTests: BaseTestCase {
-    override func setUp() {
+    override func setUp() async throws {
         // Fresh install the app
         // removeApp() does not work on iOS 15 and 16 intermittently
         if #available(iOS 17, *) {
             removeApp()
         }
         // The app is correctly installed
-        super.setUp()
+        try await super.setUp()
     }
 
     // https://mozilla.testrail.io/index.php?/cases/view/2307101

firefox-ios/firefox-ios-tests/Tests/XCUITests/FeatureFlaggedTestBase.swift

@@ -43,10 +43,10 @@ class FeatureFlaggedTestSuite: FeatureFlaggedTestBase {
         addLaunchArgument(jsonFileName: jsonFileName, featureName: featureName)
     }
 
-    override func setUp() {
+    override func setUp() async throws {
         continueAfterFailure = false
-        setUpExperimentVariables()
         setUpApp()
+        setUpExperimentVariables()
         setUpLaunchArguments()
         setUpScreenGraph()
     }

firefox-ios/firefox-ios-tests/Tests/XCUITests/FxScreenGraph.swift

@@ -7,6 +7,7 @@ import Foundation
 import MappaMundi
 import XCTest
 
+@MainActor
 func createScreenGraph(for test: XCTestCase, with app: XCUIApplication) -> MMScreenGraph<FxUserState> {
     let map = MMScreenGraph(for: test, with: FxUserState.self)
 
@@ -123,31 +124,38 @@ let allHomePanels = [
     LibraryPanel_Downloads
 ]
 
+@MainActor
 let iOS_Settings = XCUIApplication(bundleIdentifier: "com.apple.Preferences")
+@MainActor
 let springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard")
 
+@MainActor
 func navigationControllerBackAction(for app: XCUIApplication) -> () -> Void {
     return {
         app.navigationBars.element(boundBy: 0).buttons.element(boundBy: 0).waitAndTap()
     }
 }
 
+@MainActor
 func cancelBackAction(for app: XCUIApplication) -> () -> Void {
     return {
         app.otherElements["PopoverDismissRegion"].waitAndTap()
     }
 }
 
+@MainActor
 func dismissContextMenuAction(app: XCUIApplication) -> () -> Void {
     return {
         app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.25)).tap()
     }
 }
 
+@MainActor
 func select(rows: Int, in app: XCUIApplication) {
     app.staticTexts[String(rows)].firstMatch.waitAndTap()
 }
 
+@MainActor
 func type(text: String, in app: XCUIApplication) {
      text.forEach { char in
          app.keys[String(char)].waitAndTap()

firefox-ios/firefox-ios-tests/Tests/XCUITests/HistoryTests.swift

@@ -43,7 +43,7 @@ class HistoryTests: BaseTestCase {
     var browserScreen: BrowserScreen!
     var historyScreen: HistoryScreen!
 
-    override func setUp() {
+    override func setUp() async throws {
         // Test name looks like: "[Class testFunc]", parse out the function name
         let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
         let key = String(parts[1])
@@ -57,7 +57,7 @@ class HistoryTests: BaseTestCase {
                                LaunchArguments.SkipContextualHints,
                                LaunchArguments.DisableAnimations]
         }
-        super.setUp()
+        try await super.setUp()
         toolbarScreen = ToolbarScreen(app: app)
         settingScreen = SettingScreen(app: app)
         browserScreen = BrowserScreen(app: app)