From 343b292ac1e9e815e276549a777e83e9b2f8f109 Mon Sep 17 00:00:00 2001 From: Brian Gesiak Date: Fri, 5 Feb 2016 09:46:28 -0500 Subject: [PATCH] [XCTAssert] s/__FILE__/#file/g, s/__LINE__/#line/g "Screaming snake case" debugging identifiers like `__FILE__` and `__LINE__` are scheduled to be removed as per evolution proposal SE-0028 (https://github.com/apple/swift-evolution/blob/6e040b5d5d19df60329deffc125552a4cd63a21d/proposals/0028-modernizing-debug-identifiers.md). They were marked as deprecated in https://github.com/apple/swift/commit/0619e57a61f27f721e273ab6f808ac81011aeb2c#diff-b1b9777d77a07ee6e082cce7a2c52608R87. Replace all uses of `__FILE__` with `#file`, and `__LINE__` with `#line`. Keep in mind that this means people using swift-corelibs-xctest must build the latest version of Swift from source (which includes the commit referenced above) in order to maintain compatibility. To run the tests on OS X, users must launch Xcode pointing to a toolchain built from the latest source. --- Sources/XCTest/XCTAssert.swift | 50 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Sources/XCTest/XCTAssert.swift b/Sources/XCTest/XCTAssert.swift index 6eb499a61..6b4080487 100644 --- a/Sources/XCTest/XCTAssert.swift +++ b/Sources/XCTest/XCTAssert.swift @@ -81,7 +81,7 @@ private enum _XCTAssertionResult { } } -private func _XCTEvaluateAssertion(assertion: _XCTAssertion, @autoclosure message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__, @noescape expression: () throws -> _XCTAssertionResult) { +private func _XCTEvaluateAssertion(assertion: _XCTAssertion, @autoclosure message: () -> String = "", file: StaticString = #file, line: UInt = #line, @noescape expression: () throws -> _XCTAssertionResult) { let result: _XCTAssertionResult do { result = try expression() @@ -148,18 +148,18 @@ private func _XCTEvaluateAssertion(assertion: _XCTAssertion, @autoclosure messag /// ``` /// // AssertEmpty.swift /// -/// func AssertEmpty(elements: [T], file: StaticString = __FILE__, line: UInt = __LINE__) { +/// func AssertEmpty(elements: [T], file: StaticString = #file, line: UInt = #line) { /// XCTAssertEqual(elements.count, 0, "Array is not empty", file: file, line: line) /// } /// ``` /// /// Now calling failures in `AssertEmpty` will be reported in the file and on /// the line that the assert function is *called*, not where it is defined. -public func XCTAssert(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssert(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { XCTAssertTrue(expression, message, file: file, line: line) } -public func XCTAssertEqual(@autoclosure expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertEqual(@autoclosure expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 == value2 { @@ -170,7 +170,7 @@ public func XCTAssertEqual(@autoclosure expression1: () throws -> } } -public func XCTAssertEqual(@autoclosure expression1: () throws -> ArraySlice, @autoclosure _ expression2: () throws -> ArraySlice, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertEqual(@autoclosure expression1: () throws -> ArraySlice, @autoclosure _ expression2: () throws -> ArraySlice, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 == value2 { @@ -181,7 +181,7 @@ public func XCTAssertEqual(@autoclosure expression1: () throws -> } } -public func XCTAssertEqual(@autoclosure expression1: () throws -> ContiguousArray, @autoclosure _ expression2: () throws -> ContiguousArray, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertEqual(@autoclosure expression1: () throws -> ContiguousArray, @autoclosure _ expression2: () throws -> ContiguousArray, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 == value2 { @@ -192,7 +192,7 @@ public func XCTAssertEqual(@autoclosure expression1: () throws -> } } -public func XCTAssertEqual(@autoclosure expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertEqual(@autoclosure expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 == value2 { @@ -203,7 +203,7 @@ public func XCTAssertEqual(@autoclosure expression1: () throws -> } } -public func XCTAssertEqual(@autoclosure expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertEqual(@autoclosure expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 == value2 { @@ -214,7 +214,7 @@ public func XCTAssertEqual(@autoclosure expression1: () throws } } -public func XCTAssertEqualWithAccuracy(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertEqualWithAccuracy(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.EqualWithAccuracy, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if abs(value1.distanceTo(value2)) <= abs(accuracy.distanceTo(T(0))) { @@ -225,7 +225,7 @@ public func XCTAssertEqualWithAccuracy(@autoclosure expres } } -public func XCTAssertFalse(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertFalse(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.False, message: message, file: file, line: line) { let value = try expression() if !value.boolValue { @@ -236,7 +236,7 @@ public func XCTAssertFalse(@autoclosure expression: () throws -> BooleanType, @a } } -public func XCTAssertGreaterThan(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertGreaterThan(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.GreaterThan, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 > value2 { @@ -247,7 +247,7 @@ public func XCTAssertGreaterThan(@autoclosure expression1: () thr } } -public func XCTAssertGreaterThanOrEqual(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertGreaterThanOrEqual(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.GreaterThanOrEqual, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 >= value2 { @@ -258,7 +258,7 @@ public func XCTAssertGreaterThanOrEqual(@autoclosure expression1: } } -public func XCTAssertLessThan(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertLessThan(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.LessThan, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 < value2 { @@ -269,7 +269,7 @@ public func XCTAssertLessThan(@autoclosure expression1: () throws } } -public func XCTAssertLessThanOrEqual(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertLessThanOrEqual(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.LessThanOrEqual, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 <= value2 { @@ -280,7 +280,7 @@ public func XCTAssertLessThanOrEqual(@autoclosure expression1: () } } -public func XCTAssertNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.Nil, message: message, file: file, line: line) { let value = try expression() if value == nil { @@ -291,7 +291,7 @@ public func XCTAssertNil(@autoclosure expression: () throws -> Any?, @autoclosur } } -public func XCTAssertNotEqual(@autoclosure expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertNotEqual(@autoclosure expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 != value2 { @@ -302,7 +302,7 @@ public func XCTAssertNotEqual(@autoclosure expression1: () throws } } -public func XCTAssertNotEqual(@autoclosure expression1: () throws -> ContiguousArray, @autoclosure _ expression2: () throws -> ContiguousArray, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertNotEqual(@autoclosure expression1: () throws -> ContiguousArray, @autoclosure _ expression2: () throws -> ContiguousArray, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 != value2 { @@ -313,7 +313,7 @@ public func XCTAssertNotEqual(@autoclosure expression1: () throws } } -public func XCTAssertNotEqual(@autoclosure expression1: () throws -> ArraySlice, @autoclosure _ expression2: () throws -> ArraySlice, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertNotEqual(@autoclosure expression1: () throws -> ArraySlice, @autoclosure _ expression2: () throws -> ArraySlice, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 != value2 { @@ -324,7 +324,7 @@ public func XCTAssertNotEqual(@autoclosure expression1: () throws } } -public func XCTAssertNotEqual(@autoclosure expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertNotEqual(@autoclosure expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 != value2 { @@ -335,7 +335,7 @@ public func XCTAssertNotEqual(@autoclosure expression1: () throws } } -public func XCTAssertNotEqual(@autoclosure expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertNotEqual(@autoclosure expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if value1 != value2 { @@ -346,7 +346,7 @@ public func XCTAssertNotEqual(@autoclosure expression1: () thro } } -public func XCTAssertNotEqualWithAccuracy(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, _ accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertNotEqualWithAccuracy(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, _ accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.NotEqualWithAccuracy, message: message, file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if abs(value1.distanceTo(value2)) > abs(accuracy.distanceTo(T(0))) { @@ -357,7 +357,7 @@ public func XCTAssertNotEqualWithAccuracy(@autoclosure exp } } -public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.Nil, message: message, file: file, line: line) { let value = try expression() if value != nil { @@ -368,7 +368,7 @@ public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclo } } -public func XCTAssertTrue(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTAssertTrue(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.True, message: message, file: file, line: line) { let value = try expression() if value.boolValue { @@ -379,13 +379,13 @@ public func XCTAssertTrue(@autoclosure expression: () throws -> BooleanType, @au } } -public func XCTFail(message: String = "", file: StaticString = __FILE__, line: UInt = __LINE__) { +public func XCTFail(message: String = "", file: StaticString = #file, line: UInt = #line) { _XCTEvaluateAssertion(.Fail, message: message, file: file, line: line) { return .ExpectedFailure(nil) } } -public func XCTAssertThrowsError(@autoclosure expression: () throws -> T, _ message: String = "", file: StaticString = __FILE__, line: UInt = __LINE__, _ errorHandler: (error: ErrorType) -> Void = { _ in }) { +public func XCTAssertThrowsError(@autoclosure expression: () throws -> T, _ message: String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (error: ErrorType) -> Void = { _ in }) { _XCTEvaluateAssertion(.ThrowsError, message: message, file: file, line: line) { var caughtErrorOptional: ErrorType? do {