-
Notifications
You must be signed in to change notification settings - Fork 816
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support test target for local Swift Package (#1169)
* support local Swift Package test case into test scheme * update test * add test * update CHABGELOG.md * Update CHANGELOG.md * revert resolved package test * Update Sources/XcodeGenKit/SchemeGenerator.swift Co-authored-by: Kohki Miki <[email protected]> * make TargetReference convert from new JSON format * add .package for location of target reference * receive target reference format at target of scheme * update test * update XcodeProj * add test and fix small bugs * update docs * support multiple style of coverageTargets * add edge case of parsing test targets * fix docs * Update Docs/ProjectSpec.md Co-authored-by: Yonas Kolb <[email protected]> * create TestableTargetReference for not making API complex * fix code format * fix parameter name to Testable Target Reference * support directly writing key of Testable Target Reference * fix compile error in build Co-authored-by: Kohki Miki <[email protected]> Co-authored-by: Yonas Kolb <[email protected]>
- Loading branch information
3 people
committed
Mar 20, 2022
1 parent
146eaad
commit 245f171
Showing
13 changed files
with
284 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| import Foundation | ||
| import JSONUtilities | ||
|
|
||
| public struct TestableTargetReference: Hashable { | ||
| public var name: String | ||
| public var location: Location | ||
|
|
||
| public var targetReference: TargetReference { | ||
| switch location { | ||
| case .local: | ||
| return TargetReference(name: name, location: .local) | ||
| case .project(let projectName): | ||
| return TargetReference(name: name, location: .project(projectName)) | ||
| case .package: | ||
| fatalError("Package target is only available for testable") | ||
| } | ||
| } | ||
|
|
||
| public enum Location: Hashable { | ||
| case local | ||
| case project(String) | ||
| case package(String) | ||
| } | ||
|
|
||
| public init(name: String, location: Location) { | ||
| self.name = name | ||
| self.location = location | ||
| } | ||
| } | ||
|
|
||
| extension TestableTargetReference { | ||
| public init(_ string: String) throws { | ||
| let paths = string.split(separator: "/") | ||
| switch paths.count { | ||
| case 2: | ||
| location = .project(String(paths[0])) | ||
| name = String(paths[1]) | ||
| case 1: | ||
| location = .local | ||
| name = String(paths[0]) | ||
| default: | ||
| throw SpecParsingError.invalidTargetReference(string) | ||
| } | ||
| } | ||
|
|
||
| public static func local(_ name: String) -> TestableTargetReference { | ||
| TestableTargetReference(name: name, location: .local) | ||
| } | ||
|
|
||
| public static func project(_ name: String) -> TestableTargetReference { | ||
| let paths = name.split(separator: "/") | ||
| return TestableTargetReference(name: String(paths[1]), location: .project(String(paths[0]))) | ||
| } | ||
|
|
||
| public static func package(_ name: String) -> TestableTargetReference { | ||
| let paths = name.split(separator: "/") | ||
| return TestableTargetReference(name: String(paths[1]), location: .package(String(paths[0]))) | ||
| } | ||
| } | ||
|
|
||
| extension TestableTargetReference: ExpressibleByStringLiteral { | ||
| public init(stringLiteral value: String) { | ||
| try! self.init(value) | ||
| } | ||
| } | ||
|
|
||
| extension TestableTargetReference: CustomStringConvertible { | ||
| public var reference: String { | ||
| switch location { | ||
| case .local: return name | ||
| case .project(let root), .package(let root): | ||
| return "\(root)/\(name)" | ||
| } | ||
| } | ||
|
|
||
| public var description: String { | ||
| reference | ||
| } | ||
| } | ||
|
|
||
| extension TestableTargetReference: JSONObjectConvertible { | ||
|
|
||
| public init(jsonDictionary: JSONDictionary) throws { | ||
| if let project: String = jsonDictionary.json(atKeyPath: "project") { | ||
| let paths = project.split(separator: "/") | ||
| name = String(paths[1]) | ||
| location = .project(String(paths[0])) | ||
| } else if let project: String = jsonDictionary.json(atKeyPath: "package") { | ||
| let paths = project.split(separator: "/") | ||
| name = String(paths[1]) | ||
| location = .package(String(paths[0])) | ||
| } else { | ||
| name = try jsonDictionary.json(atKeyPath: "local") | ||
| location = .local | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension TestableTargetReference: JSONEncodable { | ||
| public func toJSONValue() -> Any { | ||
| var dictionary: JSONDictionary = [:] | ||
| switch self.location { | ||
| case .package(let packageName): | ||
| dictionary["package"] = "\(packageName)/\(name)" | ||
| case .project(let projectName): | ||
| dictionary["project"] = "\(projectName)/\(name)" | ||
| case .local: | ||
| dictionary["local"] = name | ||
| } | ||
| return dictionary | ||
| } | ||
| } |
Oops, something went wrong.