Update tests

Author: intitni

Core/Tests/ServiceTests/AcceptSuggestionTests.swift

@@ -14,7 +14,7 @@ final class AcceptSuggestionTests: XCTestCase {
     }
 
     func test_accept_suggestion_and_clear_all_sugguestions() async throws {
-        let service = getService()
+        let service = CommentBaseCommandHandler()
         mock.completions = [
             completion(
                 text: """
@@ -33,7 +33,7 @@ final class AcceptSuggestionTests: XCTestCase {
             "\n",
         ]
 
-        let result1 = try await service.getSuggestedCode(editorContent: .init(
+        let result1 = try await service.presentSuggestions(editor: .init(
             content: lines.joined(),
             lines: lines,
             uti: "",
@@ -45,7 +45,7 @@ final class AcceptSuggestionTests: XCTestCase {
 
         let result1Lines = lines.applying(result1.modifications)
 
-        let result2 = try await service.getSuggestionAcceptedCode(editorContent: .init(
+        let result2 = try await service.acceptSuggestion(editor: .init(
             content: result1Lines.joined(),
             lines: result1Lines,
             uti: "",
@@ -71,7 +71,7 @@ final class AcceptSuggestionTests: XCTestCase {
             "Move cursor to the end of suggestion"
         )
 
-        let result3 = try await service.getSuggestionAcceptedCode(editorContent: .init(
+        let result3 = try await service.acceptSuggestion(editor: .init(
             content: lines.joined(),
             lines: lines,
             uti: "",

Core/Tests/ServiceTests/Environment.swift

@@ -32,21 +32,6 @@ import XPCShared
     Environment.triggerAction = { _ in }
 }
 
-func getService() -> AsyncXPCService {
-    AsyncXPCService(connection: {
-        class FakeConnection: NSXPCConnection {
-            let xpcService = XPCService()
-            override func remoteObjectProxyWithErrorHandler(_: @escaping (Error) -> Void) -> Any {
-                xpcService
-            }
-        }
-        let connection = FakeConnection(machServiceName: "anything")
-        connection.remoteObjectInterface = NSXPCInterface(with: XPCServiceProtocol.self)
-        connection.resume()
-        return connection
-    }())
-}
-
 func completion(text: String, range: CursorRange, uuid: String = "") -> CopilotCompletion {
     .init(text: text, position: range.start, uuid: uuid, range: range, displayText: text)
 }
@@ -61,13 +46,14 @@ class MockSuggestionService: CopilotSuggestionServiceType {
     }
 
     func getCompletions(
-        fileURL _: URL,
-        content _: String,
-        cursorPosition _: CursorPosition,
-        tabSize _: Int,
-        indentSize _: Int,
-        usesTabsForIndentation _: Bool
-    ) async throws -> [CopilotCompletion] {
+        fileURL: URL,
+        content: String,
+        cursorPosition: CopilotModel.CursorPosition,
+        tabSize: Int,
+        indentSize: Int,
+        usesTabsForIndentation: Bool,
+        ignoreSpaceOnlySuggestions: Bool
+    ) async throws -> [CopilotModel.CopilotCompletion] {
         completions
     }
 

Core/Tests/ServiceTests/GetNextSuggestionTests.swift

@@ -14,7 +14,7 @@ final class GetNextSuggestionTests: XCTestCase {
     }
 
     func test_get_next_suggestions_without_rejecting_previous_suggestions() async throws {
-        let service = getService()
+        let service = CommentBaseCommandHandler()
         mock.completions = [
             completion(
                 text: """
@@ -43,7 +43,7 @@ final class GetNextSuggestionTests: XCTestCase {
             "\n",
         ]
 
-        let result1 = try await service.getSuggestedCode(editorContent: .init(
+        let result1 = try await service.presentSuggestions(editor: .init(
             content: lines.joined(),
             lines: lines,
             uti: "",
@@ -55,7 +55,7 @@ final class GetNextSuggestionTests: XCTestCase {
 
         let result1Lines = lines.applying(result1.modifications)
 
-        let result2 = try await service.getNextSuggestedCode(editorContent: .init(
+        let result2 = try await service.presentNextSuggestion(editor: .init(
             content: result1Lines.joined(),
             lines: result1Lines,
             uti: "",
@@ -84,7 +84,7 @@ final class GetNextSuggestionTests: XCTestCase {
             "The cursor was in the deleted suggestion, reset it to 1 line above the suggestion, set its col to 0"
         )
 
-        let result3 = try await service.getNextSuggestedCode(editorContent: .init(
+        let result3 = try await service.presentNextSuggestion(editor: .init(
             content: result2Lines.joined(),
             lines: result2Lines,
             uti: "",

Core/Tests/ServiceTests/GetPreviousSuggestionTests.swift

@@ -14,7 +14,7 @@ final class GetPreviousSuggestionTests: XCTestCase {
     }
 
     func test_get_next_suggestions_without_rejecting_previous_suggestions() async throws {
-        let service = getService()
+        let service = CommentBaseCommandHandler()
         mock.completions = [
             completion(
                 text: """
@@ -43,7 +43,7 @@ final class GetPreviousSuggestionTests: XCTestCase {
             "\n",
         ]
 
-        let result1 = try await service.getSuggestedCode(editorContent: .init(
+        let result1 = try await service.presentSuggestions(editor: .init(
             content: lines.joined(),
             lines: lines,
             uti: "",
@@ -55,7 +55,7 @@ final class GetPreviousSuggestionTests: XCTestCase {
 
         let result1Lines = lines.applying(result1.modifications)
 
-        let result2 = try await service.getPreviousSuggestedCode(editorContent: .init(
+        let result2 = try await service.presentPreviousSuggestion(editor: .init(
             content: result1Lines.joined(),
             lines: result1Lines,
             uti: "",
@@ -84,7 +84,7 @@ final class GetPreviousSuggestionTests: XCTestCase {
             "The cursor was in the deleted suggestion, reset it to 1 line above the suggestion, set its col to 0"
         )
 
-        let result3 = try await service.getPreviousSuggestedCode(editorContent: .init(
+        let result3 = try await service.presentPreviousSuggestion(editor: .init(
             content: result2Lines.joined(),
             lines: result2Lines,
             uti: "",

Core/Tests/ServiceTests/GetSuggestionsTests.swift

@@ -14,7 +14,7 @@ final class GetSuggestionsTests: XCTestCase {
     }
 
     func test_suggestion_should_be_corretly_included_in_code() async throws {
-        let service = getService()
+        let service = CommentBaseCommandHandler()
         mock.completions = [
             completion(
                 text: """
@@ -34,7 +34,7 @@ final class GetSuggestionsTests: XCTestCase {
             "}\n",
         ]
 
-        let result = try await service.getSuggestedCode(editorContent: .init(
+        let result = try await service.presentSuggestions(editor: .init(
             content: lines.joined(),
             lines: lines,
             uti: "",
@@ -62,7 +62,7 @@ final class GetSuggestionsTests: XCTestCase {
     }
 
     func test_get_new_suggestions_without_rejecting_previous_suggestions() async throws {
-        let service = getService()
+        let service = CommentBaseCommandHandler()
         mock.completions = [
             completion(
                 text: """
@@ -87,7 +87,7 @@ final class GetSuggestionsTests: XCTestCase {
             "\n",
         ]
 
-        let result = try await service.getSuggestedCode(editorContent: .init(
+        let result = try await service.presentSuggestions(editor: .init(
             content: lines.joined(),
             lines: lines,
             uti: "",

Core/Tests/ServiceTests/RejectSuggestionTests.swift

@@ -14,7 +14,7 @@ final class RejectSuggestionTests: XCTestCase {
     }
 
     func test_reject_suggestion_and_clear_all_sugguestions() async throws {
-        let service = getService()
+        let service = CommentBaseCommandHandler()
         mock.completions = [
             completion(
                 text: """
@@ -33,7 +33,7 @@ final class RejectSuggestionTests: XCTestCase {
             "\n",
         ]
 
-        let result1 = try await service.getSuggestedCode(editorContent: .init(
+        let result1 = try await service.presentSuggestions(editor: .init(
             content: lines.joined(),
             lines: lines,
             uti: "",
@@ -45,7 +45,7 @@ final class RejectSuggestionTests: XCTestCase {
 
         let result1Lines = lines.applying(result1.modifications)
 
-        let result2 = try await service.getSuggestionRejectedCode(editorContent: .init(
+        let result2 = try await service.rejectSuggestion(editor: .init(
             content: result1Lines.joined(),
             lines: result1Lines,
             uti: "",
@@ -65,7 +65,7 @@ final class RejectSuggestionTests: XCTestCase {
             "cursor inside suggestion should move up"
         )
 
-        let result3 = try await service.getSuggestionRejectedCode(editorContent: .init(
+        let result3 = try await service.rejectSuggestion(editor: .init(
             content: result1Lines.joined(),
             lines: result1Lines,
             uti: "",