Fix tests

intitni · intitni · commit 7c6dd0840739 · 2024-02-22T15:55:12.000+08:00
diff --git a/Core/Tests/SuggestionServiceTests/CodeSplitAtCursorTests.swift b/Core/Tests/SuggestionServiceTests/CodeSplitAtCursorTests.swift
@@ -1,5 +1,5 @@
 import Foundation
-import Shared
+import Fundamental
 import XCTest
 
 @testable import SuggestionService
@@ -16,14 +16,13 @@ class CodeSplitAtCursorTests: XCTestCase {
         }
         """
         let lines = code.breakLines()
-        let (previousLines, nextLines, prefix) = Service.split(
+        let (previousLines, nextLines) = Service.split(
             code: code,
             lines: lines,
             at: .init(line: 6, character: 1)
         )
         XCTAssertEqual(previousLines, lines)
         XCTAssertEqual(nextLines, [])
-        XCTAssertEqual(prefix, "}")
     }
     
     func test_split_in_the_middle() {
@@ -37,14 +36,13 @@ class CodeSplitAtCursorTests: XCTestCase {
         }
         """
         let lines = code.breakLines()
-        let (previousLines, nextLines, prefix) = Service.split(
+        let (previousLines, nextLines) = Service.split(
             code: code,
             lines: lines,
             at: .init(line: 2, character: 14)
         )
         XCTAssertEqual(previousLines, Array(lines[0...1]) + ["    let middle"])
         XCTAssertEqual(nextLines, [" = array.count / 2\n"] + Array(lines[3...]))
-        XCTAssertEqual(prefix, "    let middle")
     }
     
     func test_split_right_before_line_break() {
@@ -58,27 +56,25 @@ class CodeSplitAtCursorTests: XCTestCase {
         }
         """
         let lines = code.breakLines()
-        let (previousLines, nextLines, prefix) = Service.split(
+        let (previousLines, nextLines) = Service.split(
             code: code,
             lines: lines,
             at: .init(line: 2, character: 32)
         )
         XCTAssertEqual(previousLines, Array(lines[0...1]) + ["    let middle = array.count / 2"])
         XCTAssertEqual(nextLines, ["\n"] + Array(lines[3...]))
-        XCTAssertEqual(prefix, "    let middle")
     }
     
     func test_split_empty_file() {
         let code = ""
         let lines = code.breakLines()
-        let (previousLines, nextLines, prefix) = Service.split(
+        let (previousLines, nextLines) = Service.split(
             code: code,
             lines: lines,
             at: .init(line: 0, character: 0)
         )
         XCTAssertEqual(previousLines, [])
         XCTAssertEqual(nextLines, [])
-        XCTAssertEqual(prefix, "")
     }
     
     func test_split_at_out_of_scope_position() {
@@ -92,14 +88,13 @@ class CodeSplitAtCursorTests: XCTestCase {
         }
         """
         let lines = code.breakLines()
-        let (previousLines, nextLines, prefix) = Service.split(
+        let (previousLines, nextLines) = Service.split(
             code: code,
             lines: lines,
             at: .init(line: lines.endIndex, character: 0)
         )
         XCTAssertEqual(previousLines, lines)
         XCTAssertEqual(nextLines, [])
-        XCTAssertEqual(prefix, "")
     }
 }
 
diff --git a/Core/Tests/SuggestionServiceTests/DefaultRequestStrategyTests.swift b/Core/Tests/SuggestionServiceTests/DefaultRequestStrategyTests.swift
@@ -1,5 +1,5 @@
 import Foundation
-import Shared
+import Fundamental
 import XCTest
 
 @testable import SuggestionService
@@ -27,7 +27,8 @@ class DefaultRequestStrategyTests: XCTestCase {
 
         guard let (summary, infillBlock) = DefaultRequestStrategy.Prompt.createCodeSummary(
             truncatedPrefix: prefix.breakLines(),
-            truncatedSuffix: []
+            truncatedSuffix: [], 
+            suggestionPrefix: "let cat:"
         ) else {
             XCTFail()
             return
@@ -87,7 +88,8 @@ class DefaultRequestStrategyTests: XCTestCase {
 
         guard let (summary, infillBlock) = DefaultRequestStrategy.Prompt.createCodeSummary(
             truncatedPrefix: prefix.breakLines(),
-            truncatedSuffix: suffix.breakLines()
+            truncatedSuffix: suffix.breakLines(),
+            suggestionPrefix: "let cat:"
         ) else {
             XCTFail()
             return
diff --git a/CustomSuggestionService.xcodeproj/project.pbxproj b/CustomSuggestionService.xcodeproj/project.pbxproj
@@ -103,6 +103,7 @@
 		C8EA62D22B6BE4AC00E081FC /* BaseURLSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseURLSelection.swift; sourceTree = "<group>"; };
 		C8EA62D42B6BE4BE00E081FC /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = "<group>"; };
 		C8F0E4BA2B872B61004B45FB /* Core */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Core; sourceTree = "<group>"; };
+		C8F0E4BF2B872F9D004B45FB /* TestPlan.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestPlan.xctestplan; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -153,6 +154,7 @@
 				C84794A82B86EC6100483DF4 /* Version.xcconfig */,
 				C8D0115A2B5A59D100219412 /* Config.xcconfig */,
 				C8D0115B2B5A59D400219412 /* Config.debug.xcconfig */,
+				C8F0E4BF2B872F9D004B45FB /* TestPlan.xctestplan */,
 				C8F0E4BA2B872B61004B45FB /* Core */,
 				C8D0114A2B59912700219412 /* CustomSuggestionService */,
 				C8D011612B5A5B4D00219412 /* CopilotForXcodeExtension */,
diff --git a/TestPlan.xctestplan b/TestPlan.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "2CD745CA-E543-4414-9155-E331D21582A0",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "testTimeoutsEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:Core",
+        "identifier" : "SuggestionServiceTests",
+        "name" : "SuggestionServiceTests"
+      }
+    }
+  ],
+  "version" : 1
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import Foundation`
`2`		`-import Shared`
	`2`	`+import Fundamental`
`3`	`3`	`import XCTest`
`4`	`4`
`5`	`5`	`@testable import SuggestionService`
`@@ -16,14 +16,13 @@ class CodeSplitAtCursorTests: XCTestCase {`
`16`	`16`	`}`
`17`	`17`	`"""`
`18`	`18`	`let lines = code.breakLines()`
`19`		`- let (previousLines, nextLines, prefix) = Service.split(`
	`19`	`+ let (previousLines, nextLines) = Service.split(`
`20`	`20`	`code: code,`
`21`	`21`	`lines: lines,`
`22`	`22`	`at: .init(line: 6, character: 1)`
`23`	`23`	`)`
`24`	`24`	`XCTAssertEqual(previousLines, lines)`
`25`	`25`	`XCTAssertEqual(nextLines, [])`
`26`		`- XCTAssertEqual(prefix, "}")`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`func test_split_in_the_middle() {`
`@@ -37,14 +36,13 @@ class CodeSplitAtCursorTests: XCTestCase {`
`37`	`36`	`}`
`38`	`37`	`"""`
`39`	`38`	`let lines = code.breakLines()`
`40`		`- let (previousLines, nextLines, prefix) = Service.split(`
	`39`	`+ let (previousLines, nextLines) = Service.split(`
`41`	`40`	`code: code,`
`42`	`41`	`lines: lines,`
`43`	`42`	`at: .init(line: 2, character: 14)`
`44`	`43`	`)`
`45`	`44`	`XCTAssertEqual(previousLines, Array(lines[0...1]) + [" let middle"])`
`46`	`45`	`XCTAssertEqual(nextLines, [" = array.count / 2\n"] + Array(lines[3...]))`
`47`		`- XCTAssertEqual(prefix, " let middle")`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`func test_split_right_before_line_break() {`
`@@ -58,27 +56,25 @@ class CodeSplitAtCursorTests: XCTestCase {`
`58`	`56`	`}`
`59`	`57`	`"""`
`60`	`58`	`let lines = code.breakLines()`
`61`		`- let (previousLines, nextLines, prefix) = Service.split(`
	`59`	`+ let (previousLines, nextLines) = Service.split(`
`62`	`60`	`code: code,`
`63`	`61`	`lines: lines,`
`64`	`62`	`at: .init(line: 2, character: 32)`
`65`	`63`	`)`
`66`	`64`	`XCTAssertEqual(previousLines, Array(lines[0...1]) + [" let middle = array.count / 2"])`
`67`	`65`	`XCTAssertEqual(nextLines, ["\n"] + Array(lines[3...]))`
`68`		`- XCTAssertEqual(prefix, " let middle")`
`69`	`66`	`}`
`70`	`67`
`71`	`68`	`func test_split_empty_file() {`
`72`	`69`	`let code = ""`
`73`	`70`	`let lines = code.breakLines()`
`74`		`- let (previousLines, nextLines, prefix) = Service.split(`
	`71`	`+ let (previousLines, nextLines) = Service.split(`
`75`	`72`	`code: code,`
`76`	`73`	`lines: lines,`
`77`	`74`	`at: .init(line: 0, character: 0)`
`78`	`75`	`)`
`79`	`76`	`XCTAssertEqual(previousLines, [])`
`80`	`77`	`XCTAssertEqual(nextLines, [])`
`81`		`- XCTAssertEqual(prefix, "")`
`82`	`78`	`}`
`83`	`79`
`84`	`80`	`func test_split_at_out_of_scope_position() {`
`@@ -92,14 +88,13 @@ class CodeSplitAtCursorTests: XCTestCase {`
`92`	`88`	`}`
`93`	`89`	`"""`
`94`	`90`	`let lines = code.breakLines()`
`95`		`- let (previousLines, nextLines, prefix) = Service.split(`
	`91`	`+ let (previousLines, nextLines) = Service.split(`
`96`	`92`	`code: code,`
`97`	`93`	`lines: lines,`
`98`	`94`	`at: .init(line: lines.endIndex, character: 0)`
`99`	`95`	`)`
`100`	`96`	`XCTAssertEqual(previousLines, lines)`
`101`	`97`	`XCTAssertEqual(nextLines, [])`
`102`		`- XCTAssertEqual(prefix, "")`
`103`	`98`	`}`
`104`	`99`	`}`
`105`	`100`