Refactor FXIOS-12796 [Swift 6 Migration] Isolate Client unit test classes for UI-related work (#31024)

ih-codes · web-flow · commit 35fd93204421 · 2025-12-03T10:04:58.000-06:00
* Isolate unit test classes for UI-related test work to the main actor, fixing strict concurrency warnings in Client unit test target.
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/LaunchView/LaunchScreenViewControllerTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/LaunchView/LaunchScreenViewControllerTests.swift
@@ -6,14 +6,15 @@ import Common
 import XCTest
 @testable import Client
 
+@MainActor
 final class LaunchScreenViewControllerTests: XCTestCase {
     private var viewModel: MockLaunchScreenViewModel!
     private var profile: MockProfile!
     private var coordinatorDelegate: MockLaunchFinishedLoadingDelegate!
     let windowUUID: WindowUUID = .XCTestDefaultUUID
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         DependencyHelperMock().bootstrapDependencies()
         profile = MockProfile()
         LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
@@ -22,12 +23,13 @@ final class LaunchScreenViewControllerTests: XCTestCase {
         coordinatorDelegate = MockLaunchFinishedLoadingDelegate()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         DependencyHelperMock().reset()
         viewModel = nil
         profile = nil
         coordinatorDelegate = nil
-        super.tearDown()
+
+        try await super.tearDown()
     }
 
     func testNotLoaded_notCalled() {
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/ContentContainerTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/ContentContainerTests.swift
@@ -7,24 +7,25 @@ import WebKit
 import XCTest
 @testable import Client
 
+@MainActor
 final class ContentContainerTests: XCTestCase {
     private var profile: MockProfile!
     private var overlayModeManager: MockOverlayModeManager!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         setIsSwipingTabsEnabled(false)
         self.profile = MockProfile()
         DependencyHelperMock().bootstrapDependencies()
         LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
         self.overlayModeManager = MockOverlayModeManager()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         self.profile = nil
         self.overlayModeManager = nil
         DependencyHelperMock().reset()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     // MARK: - canAddHomepage
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/LabelButtonHeaderViewTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/LabelButtonHeaderViewTests.swift
@@ -7,6 +7,7 @@ import Common
 
 @testable import Client
 
+@MainActor
 final class LabelButtonHeaderViewTests: XCTestCase {
     let theme = DarkTheme()
     let sectionHeaderState = SectionHeaderConfiguration(title: "test title", a11yIdentifier: "test a11y identifier")
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/StoriesFeed/StoriesFeedViewControllerTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/StoriesFeed/StoriesFeedViewControllerTests.swift
@@ -10,16 +10,16 @@ import XCTest
 final class StoriesFeedViewControllerTests: XCTestCase {
     var mockStore: MockStoreForMiddleware<AppState>!
 
-    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 test_viewDidLoad_triggersStoriesFeedAction() throws {
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Microsurvey/Mock/MicrosurveyPromptMiddlewareTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Microsurvey/Mock/MicrosurveyPromptMiddlewareTests.swift
@@ -12,8 +12,8 @@ final class MicrosurveyPromptMiddlewareTests: XCTestCase {
     private var mockMicrosurveyManager: MockMicrosurveySurfaceManager!
     var mockStore: MockStoreForMiddleware<AppState>!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         let model = MicrosurveyModel(
             id: "survey-id",
             promptTitle: "title",
@@ -32,10 +32,10 @@ final class MicrosurveyPromptMiddlewareTests: XCTestCase {
         setupStore()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         DependencyHelperMock().reset()
         resetStore()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     func testShowPromptAction_withInvalidModel() {
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/OnboardingTests/OnboardingServiceTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/OnboardingTests/OnboardingServiceTests.swift
@@ -108,8 +108,8 @@ final class OnboardingServiceTests: XCTestCase {
     var mockProfile: MockProfile!
     var mockThemeManager: MockThemeManager!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
 
         mockDelegate = MockOnboardingServiceDelegate()
         mockNavigationDelegate = MockOnboardingNavigationDelegate()
@@ -137,8 +137,7 @@ final class OnboardingServiceTests: XCTestCase {
         DependencyHelperMock().bootstrapDependencies()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDown() async throws {
         DependencyHelperMock().reset()
         sut = nil
         mockDelegate = nil
@@ -150,7 +149,7 @@ final class OnboardingServiceTests: XCTestCase {
         mockSearchBarLocationSaver = nil
         mockProfile = nil
         mockThemeManager = nil
-        super.tearDown()
+        try await super.tearDown()
     }
 
     // MARK: - Request Notifications Tests
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Settings/HomePageSettingViewControllerTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Settings/HomePageSettingViewControllerTests.swift
@@ -7,13 +7,14 @@ import Shared
 
 @testable import Client
 
+@MainActor
 final class HomePageSettingViewControllerTests: XCTestCase {
     private var profile: MockProfile!
     private var wallpaperManager: WallpaperManagerMock!
     private var delegate: MockSettingsDelegate!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         profile = MockProfile()
         LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
         DependencyHelperMock().bootstrapDependencies()
@@ -22,19 +23,19 @@ final class HomePageSettingViewControllerTests: XCTestCase {
         self.wallpaperManager = WallpaperManagerMock()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDown() async throws {
         DependencyHelperMock().reset()
         self.profile = nil
         self.delegate = nil
+
+        try await super.tearDown()
     }
 
     func testHomePageSettingsLeaks_InitCall() throws {
         let subject = createSubject()
         trackForMemoryLeaks(subject)
     }
 
-    @MainActor
     func testHomepageSettings_containsBookmark_whenStoriesRedesignIsDisabled() throws {
         disableStoriesRedesignFlags()
         let subject = createSubject()
@@ -58,7 +59,6 @@ final class HomePageSettingViewControllerTests: XCTestCase {
         XCTAssertTrue(bookmarkSettingValue)
     }
 
-    @MainActor
     func testHomepageSettings_containsJumpBackIn_whenStoriesRedesignIsDisabled() throws {
         disableStoriesRedesignFlags()
         let subject = createSubject()
@@ -82,7 +82,6 @@ final class HomePageSettingViewControllerTests: XCTestCase {
         XCTAssertTrue(jumpBackInSettingValue)
     }
 
-    @MainActor
     func testHomepageSettings_doesNotContainsBookmark_whenStoriesRedesignIsEnabled() {
         enableStoriesRedesign()
         let subject = createSubject()
@@ -102,7 +101,6 @@ final class HomePageSettingViewControllerTests: XCTestCase {
         XCTAssertFalse(hasBookmarkSetting)
     }
 
-    @MainActor
     func testHomepageSettings_doesNotContainsJumpBackIn_whenStoriesRedesignIsEnabled() {
         enableStoriesRedesign()
         let subject = createSubject()
@@ -122,7 +120,6 @@ final class HomePageSettingViewControllerTests: XCTestCase {
         XCTAssertFalse(hasJumpBackInSetting)
     }
 
-    @MainActor
     func testHomepageSettings_containsBookmark_whenStoriesRedesignV2IsEnabled() throws {
         enableStoriesRedesignV2()
         let subject = createSubject()
@@ -146,7 +143,6 @@ final class HomePageSettingViewControllerTests: XCTestCase {
         XCTAssertFalse(bookmarkSettingValue)
     }
 
-    @MainActor
     func testHomepageSettings_containsJumpBackIn_whenStoriesRedesignV2IsEnabled() throws {
         enableStoriesRedesignV2()
         let subject = createSubject()
@@ -171,6 +167,7 @@ final class HomePageSettingViewControllerTests: XCTestCase {
     }
 
     // MARK: - Helper
+
     private func createSubject() -> HomePageSettingViewController {
         let subject = HomePageSettingViewController(prefs: profile.prefs,
                                                     wallpaperManager: wallpaperManager,
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/TabCellTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/TabCellTests.swift
@@ -5,20 +5,23 @@
 import XCTest
 
 @testable import Client
+
+@MainActor
 class TabCellTests: XCTestCase {
     var cellDelegate: MockTabCellDelegate!
     var profile: MockProfile!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         cellDelegate = MockTabCellDelegate()
         profile = MockProfile()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDown() async throws {
         cellDelegate = nil
         profile = nil
+
+        try await super.tearDown()
     }
 
     func testTabCellDeinit() {
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/TabTray/TabManagerMiddlewareTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/TabTray/TabManagerMiddlewareTests.swift
@@ -15,6 +15,7 @@ final class TabManagerMiddlewareTests: XCTestCase, StoreTestUtility {
     private var mockStore: MockStoreForMiddleware<AppState>!
     private var appState: AppState!
 
+    @MainActor
     override func setUp() async throws {
         try await super.setUp()
         DependencyHelperMock().bootstrapDependencies()
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/TabTray/TabTrayViewControllerTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/TabTray/TabTrayViewControllerTests.swift
@@ -7,14 +7,15 @@ import XCTest
 
 @testable import Client
 
+@MainActor
 final class TabTrayViewControllerTests: XCTestCase {
     var delegate: MockTabTrayViewControllerDelegate!
     var navigationController: DismissableNavigationViewController!
     private var tabManager: MockTabManager!
     let windowUUID: WindowUUID = .XCTestDefaultUUID
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         let mockTabManager = MockTabManager()
         DependencyHelperMock().bootstrapDependencies(injectedTabManager: mockTabManager)
         delegate = MockTabTrayViewControllerDelegate()
@@ -23,11 +24,12 @@ final class TabTrayViewControllerTests: XCTestCase {
         LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: MockProfile())
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDown() async throws {
         delegate = nil
         navigationController = nil
         DependencyHelperMock().reset()
+
+        try await super.tearDown()
     }
 
     // MARK: Compact layout
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/TranslationsTests/TranslationsMiddlewareTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/TranslationsTests/TranslationsMiddlewareTests.swift
@@ -16,8 +16,8 @@ final class TranslationsMiddlewareIntegrationTests: XCTestCase, StoreTestUtility
     private var mockTabManager: MockTabManager!
     private var mockTranslationsTelemetry: MockTranslationsTelemetry!
 
-    override func setUp() {
-        super.setUp()
+    override func setUp() async throws {
+        try await super.setUp()
         mockProfile = MockProfile()
         mockLogger = MockLogger()
         mockTabManager = MockTabManager()
@@ -34,15 +34,15 @@ final class TranslationsMiddlewareIntegrationTests: XCTestCase, StoreTestUtility
         setupStore()
     }
 
-    override func tearDown() {
+    override func tearDown() async throws {
         mockProfile = nil
         mockLogger = nil
         mockTabManager = nil
         mockWindowManager = nil
         mockTranslationsTelemetry = nil
         DependencyHelperMock().reset()
         resetStore()
-        super.tearDown()
+        try await super.tearDown()
     }
 
     func test_urlDidChangeAction_withoutTranslationConfiguration_doesNotDispatchAction() throws {
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/TranslationsTests/TranslationsSchemeHandlerTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/TranslationsTests/TranslationsSchemeHandlerTests.swift
@@ -6,6 +6,7 @@ import XCTest
 @testable import Client
 import WebKit
 
+@MainActor
 final class TranslationsSchemeHandlerTests: XCTestCase {
     func test_start_validModelsRequest_sendsResponseAndFinishes() {
         let subject = createSubject()
