Fix the failure message emitted by XCTAssertNotNil

briancroom · briancroom · commit 4ab41c8f0e45 · 2016-03-10T21:53:11.000+01:00
diff --git a/Sources/XCTest/XCTAssert.swift b/Sources/XCTest/XCTAssert.swift
@@ -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
diff --git a/Tests/Functional/FailureMessagesTestCase/main.swift b/Tests/Functional/FailureMessagesTestCase/main.swift
@@ -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")

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(@autoclosure express`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {`
`361`		`- _XCTEvaluateAssertion(.Nil, message: message, file: file, line: line) {`
	`361`	`+ _XCTEvaluateAssertion(.NotNil, message: message, file: file, line: line) {`
`362`	`362`	`let value = try expression()`
`363`	`363`	`if value != nil {`
`364`	`364`	`return .Success`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ class FailureMessagesTestCase: XCTestCase {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`// CHECK: Test Case 'FailureMessagesTestCase.testAssertNotNil' started.`
`174`		`-// CHECK: test.swift:177: error: FailureMessagesTestCase.testAssertNotNil : XCTAssertNil failed - message`
	`174`	`+// CHECK: test.swift:177: error: FailureMessagesTestCase.testAssertNotNil : XCTAssertNotNil failed - message`
`175`	`175`	`// CHECK: Test Case 'FailureMessagesTestCase.testAssertNotNil' failed \(\d+\.\d+ seconds\).`
`176`	`176`	`func testAssertNotNil() {`
`177`	`177`	`XCTAssertNotNil(nil, "message", file: "test.swift")`