Skip to content

Commit 8a381b2

Browse files
committed
The failure message of XCTAssertNil shouldn't output the value as optional
This fix makes it match Darwin XCTest again.
1 parent e5cf2f4 commit 8a381b2

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Sources/XCTest/XCTAssert.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,10 @@ public func XCTAssertLessThanOrEqual<T : Comparable>(@autoclosure expression1: (
282282

283283
public func XCTAssertNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
284284
_XCTEvaluateAssertion(.Nil, message: message, file: file, line: line) {
285-
let value = try expression()
286-
if value == nil {
287-
return .Success
288-
} else {
285+
if let value = try expression() {
289286
return .ExpectedFailure("\"\(value)\"")
287+
} else {
288+
return .Success
290289
}
291290
}
292291
}

0 commit comments

Comments
 (0)