Allow Tests using Temp Dir to run in parallel

Author: thecoolwinter

CodeEditTests/Features/CodeFile/CodeFileDocumentTests.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import Testing
 @testable import CodeEdit
 
-@Suite(.serialized)
+@Suite
 struct CodeFileDocumentTests {
     let defaultString = "func test() { }"
 

CodeEditTests/Features/Documents/WorkspaceDocument+SearchState+FindAndReplaceTests.swift

@@ -8,8 +8,8 @@
 import XCTest
 @testable import CodeEdit
 
-// swiftlint:disable:next type_body_length
-final class FindAndReplaceTests: XCTestCase {
+@MainActor
+final class FindAndReplaceTests: XCTestCase { // swiftlint:disable:this type_body_length
     private var directory: URL!
     private var files: [CEWorkspaceFile] = []
     private var mockWorkspace: WorkspaceDocument!
@@ -34,8 +34,8 @@ final class FindAndReplaceTests: XCTestCase {
         try? FileManager.default.removeItem(at: directory)
         try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
 
-        mockWorkspace = try await WorkspaceDocument(for: directory, withContentsOf: directory, ofType: "")
-        searchState = await mockWorkspace.searchState
+        mockWorkspace = try WorkspaceDocument(for: directory, withContentsOf: directory, ofType: "")
+        searchState = mockWorkspace.searchState
 
         // Add a few files
         let folder1 = directory.appending(path: "Folder 2")
@@ -64,7 +64,7 @@ final class FindAndReplaceTests: XCTestCase {
         files[1].parent = folder1File
         files[2].parent = folder2File
 
-        await mockWorkspace.searchState?.addProjectToIndex()
+        mockWorkspace.searchState?.addProjectToIndex()
 
         // NOTE: This is a temporary solution. In the future, a file watcher should track file updates
         // and trigger an index update.

CodeEditTests/Features/Editor/EditorStateRestorationTests.swift

@@ -9,7 +9,7 @@ import Testing
 import Foundation
 @testable import CodeEdit
 
-@Suite(.serialized)
+@Suite
 struct EditorStateRestorationTests {
     @Test
     func createsDatabase() throws {

CodeEditTests/Utils/withTempDir.swift

@@ -6,9 +6,14 @@
 //
 
 import Foundation
+import Testing
 
 func withTempDir(_ test: (URL) async throws -> Void) async throws {
-    let tempDirURL = try createAndClearDir()
+    guard let currentTest = Test.current else {
+        #expect(Bool(false))
+        return
+    }
+    let tempDirURL = try createAndClearDir(file: currentTest.sourceLocation.fileID + currentTest.name)
     do {
         try await test(tempDirURL)
     } catch {
@@ -19,7 +24,11 @@ func withTempDir(_ test: (URL) async throws -> Void) async throws {
 }
 
 func withTempDir(_ test: (URL) throws -> Void) throws {
-    let tempDirURL = try createAndClearDir()
+    guard let currentTest = Test.current else {
+        #expect(Bool(false))
+        return
+    }
+    let tempDirURL = try createAndClearDir(file: currentTest.sourceLocation.fileID + currentTest.name)
     do {
         try test(tempDirURL)
     } catch {
@@ -29,9 +38,10 @@ func withTempDir(_ test: (URL) throws -> Void) throws {
     try clearDir(tempDirURL)
 }
 
-private func createAndClearDir() throws -> URL {
+private func createAndClearDir(file: String) throws -> URL {
+    let file = file.components(separatedBy: CharacterSet(charactersIn: "/:?%*|\"<>")).joined()
     let tempDirURL = FileManager.default.temporaryDirectory
-        .appending(path: "CodeEditTestDirectory", directoryHint: .isDirectory)
+        .appending(path: "CodeEditTestDirectory" + file, directoryHint: .isDirectory)
 
     // If it exists, delete it before the test
     try clearDir(tempDirURL)