Skip to content

Commit

Permalink
Use SPM resource support for XcodeKitTests
Browse files Browse the repository at this point in the history
  • Loading branch information
@interstateone
interstateone committed Oct 14, 2020
1 parent 48516cc commit 6287f35
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 15 deletions.
3 changes: 3 additions & 0 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ let package = Package(
name: "XcodesKitTests",
dependencies: [
"XcodesKit", "Version"
],
resources: [
.copy("Fixtures"),
]),
.target(
name: "AppleAPI",
Expand Down
4 changes: 2 additions & 2 deletions Tests/XcodesKitTests/Environment+Mock.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ extension Files {
moveItem: { _, _ in return },
contentsAtPath: { path in
if path.contains("Info.plist") {
let url = URL(fileURLWithPath: "Stub-0.0.0.Info.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub-0.0.0.Info", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else if path.contains("version.plist") {
let url = URL(fileURLWithPath: "Stub.version.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub.version", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else {
Expand Down
0 ...codesKitTests/LogOutput-FullHappyPath.txt → ...ests/Fixtures/LogOutput-FullHappyPath.txt
View file
File renamed without changes.
0 Tests/XcodesKitTests/Stub-0.0.0.Info.plist → ...esKitTests/Fixtures/Stub-0.0.0.Info.plist
View file
File renamed without changes.
0 Tests/XcodesKitTests/Stub-2.0.0.Info.plist → ...esKitTests/Fixtures/Stub-2.0.0.Info.plist
View file
File renamed without changes.
0 Tests/XcodesKitTests/Stub-2.0.1.Info.plist → ...esKitTests/Fixtures/Stub-2.0.1.Info.plist
View file
File renamed without changes.
0 Tests/XcodesKitTests/Stub.version.plist → ...codesKitTests/Fixtures/Stub.version.plist
View file
File renamed without changes.
0 .../developer.apple.com-download-19-6-9.html → .../developer.apple.com-download-19-6-9.html
View file
File renamed without changes.
25 changes: 12 additions & 13 deletions Tests/XcodesKitTests/XcodesKitTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@ final class XcodesKitTests: XCTestCase {

installer.install(.version("0.0.0"))
.ensure {
let url = URL(fileURLWithPath: "LogOutput-FullHappyPath.txt",
relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "LogOutput-FullHappyPath", withExtension: "txt", subdirectory: "Fixtures")!
XCTAssertEqual(log, try! String(contentsOf: url))
expectation.fulfill()
}
Expand All @@ -221,19 +220,19 @@ final class XcodesKitTests: XCTestCase {
Current.files.installedXcodes = { installedXcodes }
Current.files.contentsAtPath = { path in
if path == "/Applications/Xcode-0.0.0.app/Contents/Info.plist" {
let url = URL(fileURLWithPath: "Stub-0.0.0.Info.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub-0.0.0.Info", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else if path == "/Applications/Xcode-2.0.0.app/Contents/Info.plist" {
let url = URL(fileURLWithPath: "Stub-2.0.0.Info.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub-2.0.0.Info", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else if path == "/Applications/Xcode-2.0.1.app/Contents/Info.plist" {
let url = URL(fileURLWithPath: "Stub-2.0.1.Info.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub-2.0.1.Info", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else if path.contains("version.plist") {
let url = URL(fileURLWithPath: "Stub.version.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub.version", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else {
Expand Down Expand Up @@ -344,7 +343,7 @@ final class XcodesKitTests: XCTestCase {
}

func test_ParsePrereleaseXcodes() {
let url = URL(fileURLWithPath: "developer.apple.com-download-19-6-9.html", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "developer.apple.com-download-19-6-9", withExtension: "html", subdirectory: "Fixtures")!
let data = try! Data(contentsOf: url)

let xcodes = try! XcodeList().parsePrereleaseXcodes(from: data)
Expand Down Expand Up @@ -380,15 +379,15 @@ final class XcodesKitTests: XCTestCase {
InstalledXcode(path: Path("/Applications/Xcode-2.0.1.app")!)!] }
Current.files.contentsAtPath = { path in
if path == "/Applications/Xcode-0.0.0.app/Contents/Info.plist" {
let url = URL(fileURLWithPath: "Stub-0.0.0.Info.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub-0.0.0.Info", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else if path == "/Applications/Xcode-2.0.1.app/Contents/Info.plist" {
let url = URL(fileURLWithPath: "Stub-2.0.1.Info.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub-2.0.1.Info", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else if path.contains("version.plist") {
let url = URL(fileURLWithPath: "Stub.version.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub.version", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else {
Expand Down Expand Up @@ -448,15 +447,15 @@ final class XcodesKitTests: XCTestCase {
InstalledXcode(path: Path("/Applications/Xcode-2.0.1.app")!)!] }
Current.files.contentsAtPath = { path in
if path == "/Applications/Xcode-0.0.0.app/Contents/Info.plist" {
let url = URL(fileURLWithPath: "Stub-0.0.0.Info.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub-0.0.0.Info", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else if path == "/Applications/Xcode-2.0.1.app/Contents/Info.plist" {
let url = URL(fileURLWithPath: "Stub-2.0.1.Info.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub-2.0.1.Info", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else if path.contains("version.plist") {
let url = URL(fileURLWithPath: "Stub.version.plist", relativeTo: URL(fileURLWithPath: #file).deletingLastPathComponent())
let url = Bundle.module.url(forResource: "Stub.version", withExtension: "plist", subdirectory: "Fixtures")!
return try? Data(contentsOf: url)
}
else {
Expand Down

0 comments on commit 6287f35

Please sign in to comment.