fix tests

Author: Cramsden

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/StoriesFeed/StoriesFeedViewControllerTests.swift

@@ -6,6 +6,7 @@ import XCTest
 
 @testable import Client
 
+@MainActor
 final class StoriesFeedViewControllerTests: XCTestCase {
     var mockStore: MockStoreForMiddleware<AppState>!
 

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

@@ -19,6 +19,7 @@ final class RemoteTabPanelTests: XCTestCase {
         DependencyHelperMock().reset()
     }
 
+    @MainActor
     func testTableView_emptyStateNoRows() {
         let remotePanel = createSubject(state: generateEmptyState())
         let tableView = remotePanel.tabsDisplayViewController.tableView
@@ -27,6 +28,7 @@ final class RemoteTabPanelTests: XCTestCase {
         XCTAssertEqual(tableView.numberOfSections, 0)
     }
 
+    @MainActor
     func testTableView_oneClientTwoRows() {
         let remotePanel = createSubject(state: generateStateOneClientTwoTabs())
         let tableView = remotePanel.tabsDisplayViewController.tableView
@@ -75,6 +77,7 @@ final class RemoteTabPanelTests: XCTestCase {
                                     devices: [])
     }
 
+    @MainActor
     private func createSubject(state: RemoteTabsPanelState,
                                file: StaticString = #filePath,
                                line: UInt = #line) -> RemoteTabsPanel {

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

@@ -17,6 +17,7 @@ final class TabDisplayPanelTests: XCTestCase {
         DependencyHelperMock().reset()
     }
 
+    @MainActor
     func testExpandedInactiveTabs_InitialState() {
         let subject = createSubject(isPrivateMode: false,
                                     emptyTabs: false,
@@ -25,6 +26,7 @@ final class TabDisplayPanelTests: XCTestCase {
         XCTAssertTrue(subject.tabsState.isInactiveTabsExpanded)
     }
 
+    @MainActor
     func testIsPrivateTabsEmpty() {
         let subject = createSubject(isPrivateMode: true,
                                     emptyTabs: true,
@@ -33,6 +35,7 @@ final class TabDisplayPanelTests: XCTestCase {
         XCTAssertTrue(subject.tabsState.isPrivateTabsEmpty)
     }
 
+    @MainActor
     func testIsPrivateTabsNotEmpty() {
         let subject = createSubject(isPrivateMode: true,
                                     emptyTabs: false,
@@ -42,6 +45,7 @@ final class TabDisplayPanelTests: XCTestCase {
     }
 
     // MARK: - Private
+    @MainActor
     private func createSubject(isPrivateMode: Bool,
                                emptyTabs: Bool,
                                emptyInactiveTabs: Bool,

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

@@ -31,11 +31,13 @@ final class AddressToolbarContainerModelTests: XCTestCase {
         super.tearDown()
     }
 
+    @MainActor
     func testSearchWordFromURLWhenUrlIsNilThenSearchWordIsNil() {
         let viewModel = createSubject(withState: createToolbarState())
         XCTAssertNil(viewModel.searchTermFromURL(nil))
     }
 
+    @MainActor
     func testSearchWordFromURLWhenUsingGoogleSearchThenSearchWordIsCorrect() {
         let viewModel = createSubject(withState: createToolbarState())
         let searchTerm = "test"
@@ -44,13 +46,15 @@ final class AddressToolbarContainerModelTests: XCTestCase {
         XCTAssertEqual(searchTerm, result)
     }
 
+    @MainActor
     func testSearchWordFromURLWhenUsingInternalUrlThenSearchWordIsNil() {
         let viewModel = createSubject(withState: createToolbarState())
         let searchTerm = "test"
         let url = URL(string: "internal://local?q=\(searchTerm)")
         XCTAssertNil(viewModel.searchTermFromURL(url))
     }
 
+    @MainActor
     func testUsesDefaultSearchEngine_WhenNoSearchEngineSelected() {
         let viewModel = createSubject(withState: createToolbarState())
 
@@ -63,6 +67,7 @@ final class AddressToolbarContainerModelTests: XCTestCase {
         XCTAssertEqual(viewModel.searchEngineImage, defaultEngine.image)
     }
 
+    @MainActor
     func testUsesAlternativeSearchEngine_WhenSearchEngineSelected() {
         let searchEngineImage = UIImage()
         let selectedSearchEngine = OpenSearchEngineTests.generateOpenSearchEngine(
@@ -119,45 +124,53 @@ final class AddressToolbarContainerModelTests: XCTestCase {
         XCTAssertEqual(config.locationViewConfiguration.url, testURL)
     }
 
+    @MainActor
     func testToolbarColor_withTopToolbar_andNavigationToolbar_andNoTopTabs_hasAlternativeColor() {
         let viewModel = createSubject(withState: createToolbarState(isShowingTopTabs: false))
         XCTAssertTrue(viewModel.hasAlternativeLocationColor)
     }
 
+    @MainActor
     func testToolbarColor_withTopToolbar_andNavigationToolbar_andTopTabs_hasNormalColor() {
         let viewModel = createSubject(withState: createToolbarState())
         XCTAssertFalse(viewModel.hasAlternativeLocationColor)
     }
 
+    @MainActor
     func testToolbarColor_withTopToolbar_andNoNavigationToolbar_andTopTabs_hasNormalColor() {
         let viewModel = createSubject(withState: createToolbarState(isShowingNavigationToolbar: false))
         XCTAssertFalse(viewModel.hasAlternativeLocationColor)
     }
 
+    @MainActor
     func testToolbarColor_withTopToolbar_andNoNavigationToolbar_andNoTopTabs_hasNormalColor() {
         let viewModel = createSubject(withState: createToolbarState(isShowingNavigationToolbar: false,
                                                                     isShowingTopTabs: false))
         XCTAssertFalse(viewModel.hasAlternativeLocationColor)
     }
 
+    @MainActor
     func testToolbarColor_withBottomToolbar_andNavigationToolbar_andTopTabs_hasNormalColor() {
         let viewModel = createSubject(withState: createToolbarState(toolbarPosition: .bottom))
         XCTAssertFalse(viewModel.hasAlternativeLocationColor)
     }
 
+    @MainActor
     func testToolbarColor_withBottomToolbar_andNoNavigationToolbar_andTopTabs_hasNormalColor() {
         let viewModel = createSubject(withState: createToolbarState(toolbarPosition: .bottom,
                                                                     isShowingNavigationToolbar: false))
         XCTAssertFalse(viewModel.hasAlternativeLocationColor)
     }
 
+    @MainActor
     func testToolbarColor_withBottomToolbar_andNoNavigationToolbar_andNoTopTabs_hasNormalColor() {
         let viewModel = createSubject(withState: createToolbarState(toolbarPosition: .bottom,
                                                                     isShowingNavigationToolbar: false,
                                                                     isShowingTopTabs: false))
         XCTAssertFalse(viewModel.hasAlternativeLocationColor)
     }
 
+    @MainActor
     func testToolbarColor_withBottomToolbar_andNavigationToolbar_andNoTopTabs_hasNormalColor() {
         let viewModel = createSubject(withState: createToolbarState(toolbarPosition: .bottom,
                                                                     isShowingTopTabs: false))
@@ -166,6 +179,7 @@ final class AddressToolbarContainerModelTests: XCTestCase {
 
     // MARK: - Private helpers
 
+    @MainActor
     private func createSubject(withState state: ToolbarState) -> AddressToolbarContainerModel {
         return AddressToolbarContainerModel(state: state,
                                             profile: mockProfile,

firefox-ios/firefox-ios-tests/Tests/ClientTests/Utils/StoreTestUtility.swift

@@ -16,6 +16,7 @@ protocol StoreTestUtility {
 
 /// Utility class used when replacing the global store for testing purposes
 class StoreTestUtilityHelper {
+    @MainActor
     static func setupStore(with appState: AppState, middlewares: [Middleware<AppState>]) {
 #if TESTING
         store = Store(
@@ -33,6 +34,7 @@ class StoreTestUtilityHelper {
     }
 
     /// In order to avoid flaky tests, we should reset the store similar to production
+    @MainActor
     static func resetStore() {
 #if TESTING
         store = Store(