Refactor FXIOS-12796 [Swift 6 Migration] Fix Swift 6 errors in Client unit tests for setUp and tearDown - Batch 1 (#31010)

Fix some easy setup / teardown isolation warnings that are strict swift 6 errors.

Author: ih-codes

firefox-ios/firefox-ios-tests/Tests/ClientTests/BrowserViewControllerStateTests.swift

@@ -11,16 +11,16 @@ import SummarizeKit
 final class BrowserViewControllerStateTests: XCTestCase, StoreTestUtility {
     let storeUtilityHelper = StoreTestUtilityHelper()
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         DependencyHelperMock().bootstrapDependencies()
         setupStore()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         DependencyHelperMock().reset()
         resetStore()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     func testAddNewTabAction() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/BrowserViewControllerTests.swift

@@ -22,8 +22,8 @@ class BrowserViewControllerTests: XCTestCase, StoreTestUtility {
     var appState: AppState!
     var recordVisitManager: MockRecordVisitObservationManager!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         setIsSwipingTabsEnabled(false)
         setIsHostedSummarizerEnabled(false)
         tabManager = MockTabManager()
@@ -37,15 +37,15 @@ class BrowserViewControllerTests: XCTestCase, StoreTestUtility {
         setupStore()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         profile.shutdown()
         profile = nil
         tabManager = nil
         appStartupTelemetry = nil
         recordVisitManager = nil
         resetStore()
         DependencyHelperMock().reset()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     func testTrackVisibleSuggestion() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/CanRemoveQuickActionBookmarkTests.swift

@@ -13,12 +13,11 @@ class CanRemoveQuickActionBookmarkTests: XCTestCase {
     private var mockBookmarksHandler: BookmarksHandlerMock!
     private var mockQuickActions: MockQuickActions!
 
-    @MainActor
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         mockQuickActions = MockQuickActions()
         mockBookmarksHandler = BookmarksHandlerMock()
-        subject = MockCanRemoveQuickActionBookmark(bookmarksHandler: mockBookmarksHandler)
+        subject = await MockCanRemoveQuickActionBookmark(bookmarksHandler: mockBookmarksHandler)
     }
 
     override func tearDown() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/DefaultRouterTests.swift

@@ -8,10 +8,9 @@ import XCTest
 final class DefaultRouterTests: XCTestCase {
     var navigationController: MockNavigationController!
 
-    @MainActor
-    override func setUp() {
-        super.setUp()
-        navigationController = MockNavigationController()
+    override func setUp() async throws {
+        try await super.setUp()
+        navigationController = await MockNavigationController()
     }
 
     override func tearDown() {
@@ -53,6 +52,7 @@ final class DefaultRouterTests: XCTestCase {
         waitForExpectations(timeout: 0.1)
     }
 
+    @MainActor
     func testRunCompletion_DoesNotRunForNonExistingCompletion() {
         let subject = DefaultRouter(navigationController: navigationController)
 

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Summarizer/SummarizerMiddlewareTests.swift

@@ -14,8 +14,8 @@ final class SummarizerMiddlewareTests: XCTestCase, StoreTestUtility {
     private var mockProfile: MockProfile!
     private var mockStore: MockStoreForMiddleware<AppState>!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         mockProfile = MockProfile()
         mockTabManager = MockTabManager()
         mockWindowManager = MockWindowManager(
@@ -30,14 +30,15 @@ final class SummarizerMiddlewareTests: XCTestCase, StoreTestUtility {
         setupStore()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         mockProfile = nil
         mockWindowManager = nil
         mockSummarizationChecker = nil
         DependencyHelperMock().reset()
         resetStore()
-        super.tearDown()
+        try await super.tearDown()
     }
+
     // TODO(FXIOS-13126): Fix and uncomment this test
 //    func test_shakeMotionAction_withFeatureFlagEnabled_dispatchesMiddlewareAction() throws {
 //        setupNimbusHostedSummarizerTesting(isEnabled: true)

firefox-ios/firefox-ios-tests/Tests/ClientTests/Helpers/AccountSyncHandlerTests.swift

@@ -8,16 +8,16 @@ import Common
 
 @testable import Client
 
+@MainActor
 class AccountSyncHandlerTests: XCTestCase {
     private var profile: MockProfile!
     private var syncManager: ClientSyncManagerSpy!
     private var queue: MockDispatchQueue!
     private var mockWindowManager: MockWindowManager!
     let windowUUID: WindowUUID = .XCTestDefaultUUID
 
-    @MainActor
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         self.profile = MockProfile()
         self.syncManager = profile.syncManager as? ClientSyncManagerSpy
         self.queue = MockDispatchQueue()
@@ -33,16 +33,15 @@ class AccountSyncHandlerTests: XCTestCase {
         )
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         self.syncManager = nil
         self.profile = nil
         self.queue = nil
         self.mockWindowManager = nil
         DependencyHelperMock().reset()
-        super.tearDown()
+        try await super.tearDown()
     }
 
-    @MainActor
     func testTabDidGainFocus_doesntSyncWithoutAccount() {
         let expectation = XCTestExpectation(description: "sync is not called without an account")
         expectation.isInverted = true
@@ -57,7 +56,6 @@ class AccountSyncHandlerTests: XCTestCase {
         XCTAssertEqual(profile.storeAndSyncTabsCalled, 0)
     }
 
-    @MainActor
     func testTabDidGainFocus_syncWithAccount() {
         let expectation = XCTestExpectation(description: "storeAndSyncTabs called after listed time of tab gaining focus")
         let subject = AccountSyncHandler(with: profile, debounceTime: 0.1, queue: queue, queueDelay: 0.1, onSyncCompleted: {
@@ -70,7 +68,6 @@ class AccountSyncHandlerTests: XCTestCase {
         XCTAssertEqual(profile.storeAndSyncTabsCalled, 1)
     }
 
-    @MainActor
     func testTabDidGainFocus_multipleActions_executedAtMostOnce() {
         let expectation = XCTestExpectation(
             description: "storeAndSyncTabs only called once from multiple tab actions")
@@ -87,7 +84,6 @@ class AccountSyncHandlerTests: XCTestCase {
         XCTAssertEqual(profile.storeAndSyncTabsCalled, 1)
     }
 
-    @MainActor
     func testTabDidGainFocus_multipleDebounce_withWithMultipleSyncs() {
         let expectation = XCTestExpectation(
             description: "storeAndSyncTabs called multiple times if outside of debounce time")
@@ -111,7 +107,6 @@ class AccountSyncHandlerTests: XCTestCase {
 
 // MARK: - Helper methods
 private extension AccountSyncHandlerTests {
-    @MainActor
     func createTab(profile: MockProfile,
                    urlString: String? = "www.website.com") -> Tab {
         let tab = Tab(profile: profile, windowUUID: windowUUID)

firefox-ios/firefox-ios-tests/Tests/ClientTests/TabTray/TabManagerMiddlewareTests.swift

@@ -15,9 +15,8 @@ final class TabManagerMiddlewareTests: XCTestCase, StoreTestUtility {
     private var mockStore: MockStoreForMiddleware<AppState>!
     private var appState: AppState!
 
-    @MainActor
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         DependencyHelperMock().bootstrapDependencies()
         setIsHostedSummaryEnabled(false)
         mockProfile = MockProfile()
@@ -34,13 +33,13 @@ final class TabManagerMiddlewareTests: XCTestCase, StoreTestUtility {
         LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: mockProfile)
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         mockProfile = nil
         mockWindowManager = nil
         summarizationChecker = nil
         DependencyHelperMock().reset()
         resetStore()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     func test_screenshotAction_triggersRefresh() throws {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Toolbar/AddressToolbarContainerModelTests.swift

@@ -12,13 +12,12 @@ final class AddressToolbarContainerModelTests: XCTestCase {
     private var searchEnginesManager: SearchEnginesManagerProvider!
     private let windowUUID: WindowUUID = .XCTestDefaultUUID
 
-    @MainActor
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         DependencyHelperMock().bootstrapDependencies()
 
         mockProfile = MockProfile()
-        searchEnginesManager = SearchEnginesManager(
+        searchEnginesManager = await SearchEnginesManager(
             prefs: mockProfile.prefs,
             files: mockProfile.files,
             engineProvider: MockSearchEngineProvider()