Refactor FXIOS-13481 [Swift 6 Migration] Turn on Concurrency for TabDataStoreTests in BrowserKit #29763 (#29765)

Author: dataports

BrowserKit/Package.swift

@@ -155,7 +155,11 @@ let package = Package(
             ]),
         .testTarget(
             name: "TabDataStoreTests",
-            dependencies: ["TabDataStore"]),
+            dependencies: ["TabDataStore"],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency"),
+            ]
+        ),
         .target(
             name: "Redux",
             dependencies: ["Common"],

BrowserKit/Tests/TabDataStoreTests/TabDataStoreTests.swift

@@ -5,7 +5,7 @@
 import XCTest
 @testable import TabDataStore
 
-final class TabDataStoreTests: XCTestCase {
+final class TabDataStoreTests: XCTestCase, @unchecked Sendable {
     private var mockFileManager: TabFileManagerMock!
     private let sleepTime: UInt64 = 1 * NSEC_PER_SEC
     private let defaultTestTabWindowUUID = UUID(uuidString: "E3FF60DA-D1E7-407B-AA3B-130D48B3909D")!
@@ -16,12 +16,12 @@ final class TabDataStoreTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         mockFileManager = nil
+        super.tearDown()
     }
 
     // MARK: - Saving Data
-
+    @MainActor
     func testSaveWindowData_noWindowDataDirectory_returns() async throws {
         let windowData = createMockWindow(uuid: defaultTestTabWindowUUID)
         let subject = createSubject()
@@ -36,6 +36,7 @@ final class TabDataStoreTests: XCTestCase {
         XCTAssertEqual(mockFileManager.writeWindowDataCalledCount, 0)
     }
 
+    @MainActor
     func testSaveWindowData_createsDirectory_notForced() async throws {
         let subject = createSubject()
         let windowData = createMockWindow(uuid: defaultTestTabWindowUUID)
@@ -54,6 +55,7 @@ final class TabDataStoreTests: XCTestCase {
         XCTAssertEqual(mockFileManager.writeWindowDataCalledCount, 1)
     }
 
+    @MainActor
     func testSaveWindowDataWithBackup_doesntCreateDirectory_notForced() async throws {
         let subject = createSubject()
         let windowData = createMockWindow(uuid: defaultTestTabWindowUUID)
@@ -74,7 +76,7 @@ final class TabDataStoreTests: XCTestCase {
     }
 
     func testSaveWindowDataForceAndNotForcedMix() async throws {
-        let subject = createSubject()
+        let subject = await createSubject()
         let windowData = createMockWindow(uuid: defaultTestTabWindowUUID)
         mockFileManager.primaryDirectoryURL = URL(string: "some/directory1")
         mockFileManager.backupDirectoryURL = URL(string: "some/directory2")
@@ -95,7 +97,7 @@ final class TabDataStoreTests: XCTestCase {
     }
 
     // MARK: - Fetching Data
-
+    @MainActor
     func testFetchWindowData_withoutDirectory_returnEmpty() async throws {
         let subject = createSubject()
 
@@ -109,6 +111,7 @@ final class TabDataStoreTests: XCTestCase {
         XCTAssertNil(fetchedWindowData)
     }
 
+    @MainActor
     func testFetchWindowData_withoutWindowDataAndBackupURL_returnEmpty() async throws {
         let subject = createSubject()
         mockFileManager.primaryDirectoryURL = URL(string: "some/directory")
@@ -120,6 +123,7 @@ final class TabDataStoreTests: XCTestCase {
         XCTAssertNil(fetchedWindowData)
     }
 
+    @MainActor
     func testFetchWindowData_withoutWindowDataEmptyData_useBackupReturnEmpty() async throws {
         let subject = createSubject()
         mockFileManager.primaryDirectoryURL = URL(string: "some/directory")
@@ -132,6 +136,7 @@ final class TabDataStoreTests: XCTestCase {
         XCTAssertNil(fetchedWindowData)
     }
 
+    @MainActor
     func testFetchWindowData_withWindowData_returnFetchedWindow() async throws {
         let subject = createSubject()
         let windowData = createMockWindow(uuid: defaultTestTabWindowUUID)
@@ -149,7 +154,7 @@ final class TabDataStoreTests: XCTestCase {
     }
 
     // MARK: - Fetching and Saving Data
-
+    @MainActor
     func testPreserveBeforeRestore() async throws {
         let subject = createSubject()
         let windowData = createMockWindow(uuid: defaultTestTabWindowUUID)
@@ -167,6 +172,7 @@ final class TabDataStoreTests: XCTestCase {
         XCTAssertEqual(fetchedWindowData?.tabData.count, windowData.tabData.count)
     }
 
+    @MainActor
     func testRestoreBeforePreserve() async throws {
         let subject = createSubject()
         let windowData = createMockWindow(uuid: defaultTestTabWindowUUID)
@@ -182,6 +188,7 @@ final class TabDataStoreTests: XCTestCase {
         XCTAssertNil(fetchedWindowData)
     }
 
+    @MainActor
     func testSavingTwiceReturnsMostRecentData() async throws {
         let subject = createSubject()
         let windowData1 = createMockWindow(uuid: defaultTestTabWindowUUID)
@@ -203,7 +210,7 @@ final class TabDataStoreTests: XCTestCase {
     }
 
     // MARK: - Clearing Data
-
+    @MainActor
     func testClearAllTabData() async throws {
         let subject = createSubject()
         mockFileManager.primaryDirectoryURL = URL(string: "some/directory1")
@@ -213,7 +220,7 @@ final class TabDataStoreTests: XCTestCase {
     }
 
     // MARK: - Helpers
-
+    @MainActor
     func createSubject(throttleTime: UInt64 = 100) -> TabDataStore {
         let subject = DefaultTabDataStore(fileManager: mockFileManager,
                                           throttleTime: 100)

BrowserKit/Tests/TabDataStoreTests/TabSessionStoreTests.swift

@@ -15,8 +15,8 @@ final class TabSessionStoreTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         mockFileManager = nil
+        super.tearDown()
     }
 
     // MARK: Save
@@ -70,7 +70,7 @@ final class TabSessionStoreTests: XCTestCase {
     }
 
     // MARK: Helper functions
-
+    @MainActor
     func createSubject() -> DefaultTabSessionStore {
         let subject = DefaultTabSessionStore(fileManager: mockFileManager)
         trackForMemoryLeaks(subject)

BrowserKit/Tests/TabDataStoreTests/XCTestCaseExtension.swift

@@ -6,6 +6,7 @@ import Foundation
 import XCTest
 
 extension XCTestCase {
+    @MainActor
     func trackForMemoryLeaks(_ instance: AnyObject, file: StaticString = #filePath, line: UInt = #line) {
         addTeardownBlock { [weak instance] in
             XCTAssertNil(