Skip to content

Commit 802db5d

Browse files
authored
cleanup test manifest creation (#3724)
motivation: address correctness issues with tests that create in-memory manifests changes: * test helper function to create in-memopry manifest should take a path instead of a string representing a path * in-memory test manifest packageLocation is equal to the path in most test cases, remove redundancy where possible to avoid correctness issues * adjust tests
1 parent 329da56 commit 802db5d

File tree

10 files changed

+207
-392
lines changed

10 files changed

+207
-392
lines changed

Sources/SPMTestSupport/ManifestExtensions.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import TSCUtility
1515
public extension Manifest {
1616
static func createV4Manifest(
1717
name: String,
18-
path: String = "/",
18+
path: AbsolutePath = .root,
1919
packageKind: PackageReference.Kind = .root,
20-
packageLocation: String = "/",
20+
packageLocation: String? = nil,
2121
version: TSCUtility.Version? = nil,
2222
toolsVersion: ToolsVersion = .v4,
2323
pkgConfig: String? = nil,
@@ -31,9 +31,9 @@ public extension Manifest {
3131
) -> Manifest {
3232
return Manifest(
3333
name: name,
34-
path: AbsolutePath(path).appending(component: Manifest.filename),
34+
path: path.appending(component: Manifest.filename),
3535
packageKind: packageKind,
36-
packageLocation: packageLocation,
36+
packageLocation: packageLocation ?? path.pathString,
3737
platforms: [],
3838
version: version,
3939
toolsVersion: toolsVersion,
@@ -50,9 +50,9 @@ public extension Manifest {
5050

5151
static func createManifest(
5252
name: String,
53-
path: String = "/",
53+
path: AbsolutePath = .root,
5454
packageKind: PackageReference.Kind = .root,
55-
packageLocation: String = "/",
55+
packageLocation: String? = nil,
5656
defaultLocalization: String? = nil,
5757
platforms: [PlatformDescription] = [],
5858
version: TSCUtility.Version? = nil,
@@ -68,9 +68,9 @@ public extension Manifest {
6868
) -> Manifest {
6969
return Manifest(
7070
name: name,
71-
path: AbsolutePath(path).appending(component: Manifest.filename),
71+
path: path.appending(component: Manifest.filename),
7272
packageKind: packageKind,
73-
packageLocation: packageLocation,
73+
packageLocation: packageLocation ?? path.pathString,
7474
defaultLocalization: defaultLocalization,
7575
platforms: platforms,
7676
version: version,

0 commit comments

Comments
 (0)