Skip to content

Show failures on same line as caller #4

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

Open
joemasilotti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show failures on same line as caller #4

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
36 changes: 21 additions & 15 deletions src/CatchingFire.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,20 @@ import XCTest
///
/// If the expression fails, your test fails.
///
public func AssertNoThrow<R>(@autoclosure closure: () throws -> R) -> R? {
public func AssertNoThrow<R>(@autoclosure closure: () throws -> R, file: String = __FILE__, line: UInt = __LINE__) -> R? {
var result: R?
AssertNoThrow() {
AssertNoThrow(file: file, line: line) {
result = try closure()
}
return result
}

public func AssertNoThrow(@noescape closure: () throws -> ()) {
public func AssertNoThrow(file file: String = __FILE__, line: UInt = __LINE__, @noescape closure: () throws -> ()) {
do {
try closure()
} catch let error {
XCTFail("Caught unexpected error <\(error)>.")
XCTFail("Caught unexpected error <\(error)>.",
file: file, line: line)
}
}

Expand Down Expand Up @@ -77,41 +78,46 @@ public func AssertNoThrow(@noescape closure: () throws -> ()) {
///
/// If the expression or closure doesn't throw the expected error, your test fails.
///
public func AssertThrows<R, E where E: ErrorType>(expectedError: E, @autoclosure _ closure: () throws -> R) -> () {
AssertThrows(expectedError) { try closure() }
public func AssertThrows<R, E where E: ErrorType>(expectedError: E, file: String = __FILE__, line: UInt = __LINE__, @autoclosure _ closure: () throws -> R) -> () {
AssertThrows(expectedError, file: file, line: line) { try closure() }
}

public func AssertThrows<E where E: ErrorType>(expectedError: E, @noescape _ closure: () throws -> ()) -> () {
public func AssertThrows<E where E: ErrorType>(expectedError: E, file: String = __FILE__, line: UInt = __LINE__, @noescape _ closure: () throws -> ()) -> () {
do {
try closure()
XCTFail("Expected to catch <\(expectedError)>, "
+ "but no error was thrown.")
+ "but no error was thrown.",
file: file, line: line)
} catch expectedError {
return // that's what we expected
} catch {
XCTFail("Caught error <\(error)>, "
+ "but not of the expected type and value "
+ "<\(expectedError)>.")
+ "<\(expectedError)>.",
file: file, line: line)
}
}

public func AssertThrows<R, E where E: ErrorType, E: Equatable>(expectedError: E, @autoclosure _ closure: () throws -> R) -> () {
AssertThrows(expectedError) { try closure() }
public func AssertThrows<R, E where E: ErrorType, E: Equatable>(expectedError: E, @autoclosure _ closure: () throws -> R, file: String = __FILE__, line: UInt = __LINE__) -> () {
AssertThrows(expectedError, file: file, line: line) { try closure() }
}

public func AssertThrows<E where E: ErrorType, E: Equatable>(expectedError: E, @noescape _ closure: () throws -> ()) -> () {
public func AssertThrows<E where E: ErrorType, E: Equatable>(expectedError: E, file: String = __FILE__, line: UInt = __LINE__, @noescape _ closure: () throws -> ()) -> () {
do {
try closure()
XCTFail("Expected to catch <\(expectedError)>, "
+ "but no error was thrown.")
+ "but no error was thrown.",
file: file, line: line)
} catch let error as E {
XCTAssertEqual(error, expectedError,
"Caught error <\(error)> is of the expected type <\(E.self)>, "
+ "but not the expected case <\(expectedError)>.")
+ "but not the expected case <\(expectedError)>.",
file: file, line: line)
} catch {
XCTFail("Caught error <\(error)>, "
+ "but not of the expected type and value "
+ "<\(expectedError)>.")
+ "<\(expectedError)>.",
file: file, line: line)
}
}

Expand Down