Skip to content

Commit bcbd9ea

Browse files
committed
Address review feedback
1 parent 165e3fc commit bcbd9ea

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

Sources/PackageModel/InstalledSwiftPMConfiguration.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public struct InstalledSwiftPMConfiguration {
4949
private static var defaultSwiftTestingVersionForTestTemplate: Version {
5050
.init(
5151
major: 0,
52-
minor: 7,
52+
minor: 8,
5353
patch: 0,
5454
prereleaseIdentifier: nil
5555
)

Sources/PackageModelSyntax/AddTarget.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,25 @@ public struct AddTarget {
203203
}
204204

205205
// Add appropriate test module dependencies.
206+
let testFuncName: String?
206207
if target.type == .test {
207208
switch configuration.testHarness {
208209
case .none:
210+
testFuncName = nil
209211
break
210212

211213
case .xctest:
212214
importModuleNames.append("XCTest")
215+
testFuncName = "test\(target.name)"
213216

214217
case .swiftTesting:
215218
// Import is handled by the added dependency.
219+
testFuncName = "example"
216220
break
217221
}
222+
} else {
223+
testFuncName = nil
224+
218225
}
219226

220227
let importDecls = importModuleNames.lazy.sorted().map { name in
@@ -256,7 +263,7 @@ public struct AddTarget {
256263
"""
257264
\(imports)
258265
class \(raw: target.name): XCTestCase {
259-
func test\(raw: target.name)() {
266+
func \(raw: testFuncName!)() {
260267
XCTAssertEqual(42, 17 + 25)
261268
}
262269
}

Tests/PackageModelSyntaxTests/ManifestEditTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ class ManifestEditTests: XCTestCase {
576576
let package = Package(
577577
name: "packages",
578578
dependencies: [
579-
.package(url: "https://github.com/apple/swift-testing.git", from: "0.7.0"),
579+
.package(url: "https://github.com/apple/swift-testing.git", from: "0.8.0"),
580580
],
581581
targets: [
582582
.testTarget(

Utilities/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{"version":1,
22
"swiftSyntaxVersionForMacroTemplate":{"major":600,"minor":0,"patch":0, "prereleaseIdentifier":"latest"},
3-
"swiftTestingVersionForTestTemplate":{"major":0,"minor":7,"patch":0}}
3+
"swiftTestingVersionForTestTemplate":{"major":0,"minor":8,"patch":0}}

0 commit comments

Comments
 (0)