Update tests

Core/Tests/ServiceTests/Environment.swift

@@ -1,32 +1,15 @@
 import AppKit
 import Client
-import SuggestionModel
-import GitHubCopilotService
 import Environment
 import Foundation
+import GitHubCopilotService
+import SuggestionModel
+import Workspace
 import XCTest
 import XPCShared
 
 @testable import Service
 
-@ServiceActor func clearEnvironment() {
-    workspaces = [:]
-
-    Environment.now = { Date() }
-
-    Environment.fetchCurrentProjectRootURLFromXcode = { 
-        URL(fileURLWithPath: "/path/to/project")
-    }
-
-    Environment.fetchCurrentFileURL = {
-        URL(fileURLWithPath: "/path/to/project/file.swift")
-    }
-
-    Environment.triggerAction = { _ in }
-
-    Environment.guessProjectRootURLForFile = { $0 }
-}
-
 func completion(text: String, range: CursorRange, uuid: String = "") -> CodeSuggestion {
     .init(text: text, position: range.start, uuid: uuid, range: range, displayText: text)
 }
@@ -35,27 +18,27 @@ class MockSuggestionService: GitHubCopilotSuggestionServiceType {
     func terminate() async {
         fatalError()
     }
-    
+
     func cancelRequest() async {
         fatalError()
     }
-    
+
     func notifyOpenTextDocument(fileURL: URL, content: String) async throws {
         fatalError()
     }
-    
+
     func notifyChangeTextDocument(fileURL: URL, content: String) async throws {
         fatalError()
     }
-    
+
     func notifyCloseTextDocument(fileURL: URL) async throws {
         fatalError()
     }
-    
+
     func notifySaveTextDocument(fileURL: URL) async throws {
         fatalError()
     }
-    
+
     var completions = [CodeSuggestion]()
     var accepted: String?
     var rejected: [String] = []
@@ -85,3 +68,4 @@ class MockSuggestionService: GitHubCopilotSuggestionServiceType {
         rejected = completions.map(\.uuid)
     }
 }
+

Core/Tests/ServiceTests/FilespaceSuggestionInvalidationTests.swift

@@ -1,26 +1,28 @@
 import Foundation
-import XCTest
 import SuggestionModel
+import Workspace
+import XCTest
 
 @testable import Service
 
 class FilespaceSuggestionInvalidationTests: XCTestCase {
-    @ServiceActor
+    @WorkspaceActor
     func prepare(suggestionText: String, cursorPosition: CursorPosition) async throws -> Filespace {
-        let (_, filespace) = try await Workspace
-            .fetchOrCreateWorkspaceIfNeeded(fileURL: URL(fileURLWithPath: "file/path/to.swift"))
+        let pool = WorkspacePool()
+        let (_, filespace) = try await pool
+            .fetchOrCreateWorkspaceAndFilespace(fileURL: URL(fileURLWithPath: "file/path/to.swift"))
         filespace.suggestions = [
             .init(
                 text: suggestionText,
                 position: cursorPosition,
                 uuid: "",
                 range: .outOfScope,
                 displayText: ""
-            )
+            ),
         ]
         return filespace
     }
-    
+
     func test_text_typing_suggestion_should_be_valid() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
@@ -34,7 +36,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNotNil(suggestion)
     }
-    
+
     func test_text_typing_suggestion_in_the_middle_should_be_valid() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
@@ -48,7 +50,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNotNil(suggestion)
     }
-    
+
     func test_text_cursor_moved_to_another_line_should_invalidate() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
@@ -62,7 +64,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNil(suggestion)
     }
-    
+
     func test_text_cursor_is_invalid_should_invalidate() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
@@ -76,7 +78,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNil(suggestion)
     }
-    
+
     func test_line_content_does_not_match_input_should_invalidate() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
@@ -90,7 +92,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNil(suggestion)
     }
-    
+
     func test_line_content_does_not_match_input_should_invalidate_index_out_of_scope() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
@@ -104,7 +106,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNil(suggestion)
     }
-    
+
     func test_finish_typing_the_whole_single_line_suggestion_should_invalidate() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
@@ -118,8 +120,9 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNil(suggestion)
     }
-
-    func test_finish_typing_the_whole_single_line_suggestion_suggestion_is_incomplete_should_invalidate() async throws {
+
+    func test_finish_typing_the_whole_single_line_suggestion_suggestion_is_incomplete_should_invalidate(
+    ) async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
             cursorPosition: .init(line: 1, character: 0)
@@ -132,7 +135,7 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNil(suggestion)
     }
-    
+
     func test_finish_typing_the_whole_multiple_line_suggestion_should_be_valid() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man\nhow are you?",
@@ -146,8 +149,9 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         let suggestion = await filespace.presentingSuggestion
         XCTAssertNotNil(suggestion)
     }
-
-    func test_undo_text_to_a_state_before_the_suggestion_was_generated_should_invalidate() async throws {
+
+    func test_undo_text_to_a_state_before_the_suggestion_was_generated_should_invalidate(
+    ) async throws {
         let filespace = try await prepare(
             suggestionText: "hello man",
             cursorPosition: .init(line: 1, character: 5) // generating man from hello