Skip to content

Fix the failure message emitted by XCTAssertNotNil #67

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
Mar 10, 2016
Merged

Fix the failure message emitted by XCTAssertNotNil #67

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Sources/XCTest/XCTAssert.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(@autoclosure express
}

public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
_XCTEvaluateAssertion(.Nil, message: message, file: file, line: line) {
_XCTEvaluateAssertion(.NotNil, message: message, file: file, line: line) {
let value = try expression()
if value != nil {
return .Success
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/FailureMessagesTestCase/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class FailureMessagesTestCase: XCTestCase {
}

// CHECK: Test Case 'FailureMessagesTestCase.testAssertNotNil' started.
// CHECK: test.swift:177: error: FailureMessagesTestCase.testAssertNotNil : XCTAssertNil failed - message
// CHECK: test.swift:177: error: FailureMessagesTestCase.testAssertNotNil : XCTAssertNotNil failed - message
// CHECK: Test Case 'FailureMessagesTestCase.testAssertNotNil' failed \(\d+\.\d+ seconds\).
func testAssertNotNil() {
XCTAssertNotNil(nil, "message", file: "test.swift")
Expand Down