Skip to content

Fix failure message of XCTAssertMatchImpl #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2022
Merged

Fix failure message of XCTAssertMatchImpl #366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Sources/TSCTestSupport/AssertMatch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,21 @@ public func ~=(patterns: [StringPattern], input: [String]) -> Bool {
return matchAny(patterns[...], input: input[...])
}

private func XCTAssertMatchImpl<Pattern, Value>(_ result: Bool, _ value: Value, _ pattern: Pattern, file: StaticString, line: UInt) {
XCTAssert(result, "unexpected failure matching '\(value)' against pattern \(pattern)", file: file, line: line)
private func XCTAssertMatchImpl<Pattern, Value>(_ result: Bool, _ value: Value, _ pattern: Pattern, negativeMatch: Bool = false, file: StaticString, line: UInt) {
let message: String
if negativeMatch {
message = "did not expect '\(value)' to match pattern \(pattern)"
} else {
message = "unexpected failure matching '\(value)' against pattern \(pattern)"
}
XCTAssert(result, message, file: file, line: line)
}

public func XCTAssertMatch(_ value: String, _ pattern: StringPattern, file: StaticString = #file, line: UInt = #line) {
XCTAssertMatchImpl(pattern ~= value, value, pattern, file: file, line: line)
}
public func XCTAssertNoMatch(_ value: String, _ pattern: StringPattern, file: StaticString = #file, line: UInt = #line) {
XCTAssertMatchImpl(!(pattern ~= value), value, pattern, file: file, line: line)
XCTAssertMatchImpl(!(pattern ~= value), value, pattern, negativeMatch: true, file: file, line: line)
}

public func XCTAssertMatch(_ value: String?, _ pattern: StringPattern, file: StaticString = #file, line: UInt = #line) {
Expand All @@ -134,12 +140,12 @@ public func XCTAssertMatch(_ value: String?, _ pattern: StringPattern, file: Sta
}
public func XCTAssertNoMatch(_ value: String?, _ pattern: StringPattern, file: StaticString = #file, line: UInt = #line) {
guard let value = value else { return }
XCTAssertMatchImpl(!(pattern ~= value), value, pattern, file: file, line: line)
XCTAssertMatchImpl(!(pattern ~= value), value, pattern, negativeMatch: true, file: file, line: line)
}

public func XCTAssertMatch(_ value: [String], _ pattern: [StringPattern], file: StaticString = #file, line: UInt = #line) {
XCTAssertMatchImpl(pattern ~= value, value, pattern, file: file, line: line)
}
public func XCTAssertNoMatch(_ value: [String], _ pattern: [StringPattern], file: StaticString = #file, line: UInt = #line) {
XCTAssertMatchImpl(!(pattern ~= value), value, pattern, file: file, line: line)
XCTAssertMatchImpl(!(pattern ~= value), value, pattern, negativeMatch: true, file: file, line: line)
}