Skip to content

Commit 343b292

Browse files
modocachemodocache
committed
[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 swiftlang/swift@0619e57#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.
1 parent 73ff15a commit 343b292

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎Sources/XCTest/XCTAssert.swift

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private enum _XCTAssertionResult {
8181
}
8282
}
8383

84-
private func _XCTEvaluateAssertion(assertion: _XCTAssertion, @autoclosure message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__, @noescape expression: () throws -> _XCTAssertionResult) {
84+
private func _XCTEvaluateAssertion(assertion: _XCTAssertion, @autoclosure message: () -> String = "", file: StaticString = #file, line: UInt = #line, @noescape expression: () throws -> _XCTAssertionResult) {
8585
let result: _XCTAssertionResult
8686
do {
8787
result = try expression()
@@ -148,18 +148,18 @@ private func _XCTEvaluateAssertion(assertion: _XCTAssertion, @autoclosure messag
148148
/// ```
149149
/// // AssertEmpty.swift
150150
///
151-
/// func AssertEmpty<T>(elements: [T], file: StaticString = __FILE__, line: UInt = __LINE__) {
151+
/// func AssertEmpty<T>(elements: [T], file: StaticString = #file, line: UInt = #line) {
152152
/// XCTAssertEqual(elements.count, 0, "Array is not empty", file: file, line: line)
153153
/// }
154154
/// ```
155155
///
156156
/// Now calling failures in `AssertEmpty` will be reported in the file and on
157157
/// the line that the assert function is *called*, not where it is defined.
158-
public func XCTAssert(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
158+
public func XCTAssert(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
159159
XCTAssertTrue(expression, message, file: file, line: line)
160160
}
161161

162-
public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
162+
public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
163163
_XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) {
164164
let (value1, value2) = (try expression1(), try expression2())
165165
if value1 == value2 {
@@ -170,7 +170,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws ->
170170
}
171171
}
172172

173-
public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws -> ArraySlice<T>, @autoclosure _ expression2: () throws -> ArraySlice<T>, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
173+
public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws -> ArraySlice<T>, @autoclosure _ expression2: () throws -> ArraySlice<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
174174
_XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) {
175175
let (value1, value2) = (try expression1(), try expression2())
176176
if value1 == value2 {
@@ -181,7 +181,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws ->
181181
}
182182
}
183183

184-
public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws -> ContiguousArray<T>, @autoclosure _ expression2: () throws -> ContiguousArray<T>, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
184+
public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws -> ContiguousArray<T>, @autoclosure _ expression2: () throws -> ContiguousArray<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
185185
_XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) {
186186
let (value1, value2) = (try expression1(), try expression2())
187187
if value1 == value2 {
@@ -192,7 +192,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws ->
192192
}
193193
}
194194

195-
public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
195+
public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
196196
_XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) {
197197
let (value1, value2) = (try expression1(), try expression2())
198198
if value1 == value2 {
@@ -203,7 +203,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure expression1: () throws ->
203203
}
204204
}
205205

206-
public func XCTAssertEqual<T, U: Equatable>(@autoclosure expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
206+
public func XCTAssertEqual<T, U: Equatable>(@autoclosure expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
207207
_XCTEvaluateAssertion(.Equal, message: message, file: file, line: line) {
208208
let (value1, value2) = (try expression1(), try expression2())
209209
if value1 == value2 {
@@ -214,7 +214,7 @@ public func XCTAssertEqual<T, U: Equatable>(@autoclosure expression1: () throws
214214
}
215215
}
216216

217-
public func XCTAssertEqualWithAccuracy<T: FloatingPointType>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
217+
public func XCTAssertEqualWithAccuracy<T: FloatingPointType>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
218218
_XCTEvaluateAssertion(.EqualWithAccuracy, message: message, file: file, line: line) {
219219
let (value1, value2) = (try expression1(), try expression2())
220220
if abs(value1.distanceTo(value2)) <= abs(accuracy.distanceTo(T(0))) {
@@ -225,7 +225,7 @@ public func XCTAssertEqualWithAccuracy<T: FloatingPointType>(@autoclosure expres
225225
}
226226
}
227227

228-
public func XCTAssertFalse(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
228+
public func XCTAssertFalse(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
229229
_XCTEvaluateAssertion(.False, message: message, file: file, line: line) {
230230
let value = try expression()
231231
if !value.boolValue {
@@ -236,7 +236,7 @@ public func XCTAssertFalse(@autoclosure expression: () throws -> BooleanType, @a
236236
}
237237
}
238238

239-
public func XCTAssertGreaterThan<T: Comparable>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
239+
public func XCTAssertGreaterThan<T: Comparable>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
240240
_XCTEvaluateAssertion(.GreaterThan, message: message, file: file, line: line) {
241241
let (value1, value2) = (try expression1(), try expression2())
242242
if value1 > value2 {
@@ -247,7 +247,7 @@ public func XCTAssertGreaterThan<T: Comparable>(@autoclosure expression1: () thr
247247
}
248248
}
249249

250-
public func XCTAssertGreaterThanOrEqual<T: Comparable>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
250+
public func XCTAssertGreaterThanOrEqual<T: Comparable>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
251251
_XCTEvaluateAssertion(.GreaterThanOrEqual, message: message, file: file, line: line) {
252252
let (value1, value2) = (try expression1(), try expression2())
253253
if value1 >= value2 {
@@ -258,7 +258,7 @@ public func XCTAssertGreaterThanOrEqual<T: Comparable>(@autoclosure expression1:
258258
}
259259
}
260260

261-
public func XCTAssertLessThan<T: Comparable>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
261+
public func XCTAssertLessThan<T: Comparable>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
262262
_XCTEvaluateAssertion(.LessThan, message: message, file: file, line: line) {
263263
let (value1, value2) = (try expression1(), try expression2())
264264
if value1 < value2 {
@@ -269,7 +269,7 @@ public func XCTAssertLessThan<T: Comparable>(@autoclosure expression1: () throws
269269
}
270270
}
271271

272-
public func XCTAssertLessThanOrEqual<T: Comparable>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
272+
public func XCTAssertLessThanOrEqual<T: Comparable>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
273273
_XCTEvaluateAssertion(.LessThanOrEqual, message: message, file: file, line: line) {
274274
let (value1, value2) = (try expression1(), try expression2())
275275
if value1 <= value2 {
@@ -280,7 +280,7 @@ public func XCTAssertLessThanOrEqual<T: Comparable>(@autoclosure expression1: ()
280280
}
281281
}
282282

283-
public func XCTAssertNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
283+
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) {
285285
let value = try expression()
286286
if value == nil {
@@ -291,7 +291,7 @@ public func XCTAssertNil(@autoclosure expression: () throws -> Any?, @autoclosur
291291
}
292292
}
293293

294-
public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
294+
public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
295295
_XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) {
296296
let (value1, value2) = (try expression1(), try expression2())
297297
if value1 != value2 {
@@ -302,7 +302,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws
302302
}
303303
}
304304

305-
public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws -> ContiguousArray<T>, @autoclosure _ expression2: () throws -> ContiguousArray<T>, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
305+
public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws -> ContiguousArray<T>, @autoclosure _ expression2: () throws -> ContiguousArray<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
306306
_XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) {
307307
let (value1, value2) = (try expression1(), try expression2())
308308
if value1 != value2 {
@@ -313,7 +313,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws
313313
}
314314
}
315315

316-
public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws -> ArraySlice<T>, @autoclosure _ expression2: () throws -> ArraySlice<T>, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
316+
public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws -> ArraySlice<T>, @autoclosure _ expression2: () throws -> ArraySlice<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
317317
_XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) {
318318
let (value1, value2) = (try expression1(), try expression2())
319319
if value1 != value2 {
@@ -324,7 +324,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws
324324
}
325325
}
326326

327-
public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
327+
public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
328328
_XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) {
329329
let (value1, value2) = (try expression1(), try expression2())
330330
if value1 != value2 {
@@ -335,7 +335,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure expression1: () throws
335335
}
336336
}
337337

338-
public func XCTAssertNotEqual<T, U: Equatable>(@autoclosure expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
338+
public func XCTAssertNotEqual<T, U: Equatable>(@autoclosure expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
339339
_XCTEvaluateAssertion(.NotEqual, message: message, file: file, line: line) {
340340
let (value1, value2) = (try expression1(), try expression2())
341341
if value1 != value2 {
@@ -346,7 +346,7 @@ public func XCTAssertNotEqual<T, U: Equatable>(@autoclosure expression1: () thro
346346
}
347347
}
348348

349-
public func XCTAssertNotEqualWithAccuracy<T: FloatingPointType>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, _ accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
349+
public func XCTAssertNotEqualWithAccuracy<T: FloatingPointType>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, _ accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
350350
_XCTEvaluateAssertion(.NotEqualWithAccuracy, message: message, file: file, line: line) {
351351
let (value1, value2) = (try expression1(), try expression2())
352352
if abs(value1.distanceTo(value2)) > abs(accuracy.distanceTo(T(0))) {
@@ -357,7 +357,7 @@ public func XCTAssertNotEqualWithAccuracy<T: FloatingPointType>(@autoclosure exp
357357
}
358358
}
359359

360-
public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
360+
public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
361361
_XCTEvaluateAssertion(.Nil, message: message, file: file, line: line) {
362362
let value = try expression()
363363
if value != nil {
@@ -368,7 +368,7 @@ public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclo
368368
}
369369
}
370370

371-
public func XCTAssertTrue(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
371+
public func XCTAssertTrue(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
372372
_XCTEvaluateAssertion(.True, message: message, file: file, line: line) {
373373
let value = try expression()
374374
if value.boolValue {
@@ -379,13 +379,13 @@ public func XCTAssertTrue(@autoclosure expression: () throws -> BooleanType, @au
379379
}
380380
}
381381

382-
public func XCTFail(message: String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
382+
public func XCTFail(message: String = "", file: StaticString = #file, line: UInt = #line) {
383383
_XCTEvaluateAssertion(.Fail, message: message, file: file, line: line) {
384384
return .ExpectedFailure(nil)
385385
}
386386
}
387387

388-
public func XCTAssertThrowsError<T>(@autoclosure expression: () throws -> T, _ message: String = "", file: StaticString = __FILE__, line: UInt = __LINE__, _ errorHandler: (error: ErrorType) -> Void = { _ in }) {
388+
public func XCTAssertThrowsError<T>(@autoclosure expression: () throws -> T, _ message: String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (error: ErrorType) -> Void = { _ in }) {
389389
_XCTEvaluateAssertion(.ThrowsError, message: message, file: file, line: line) {
390390
var caughtErrorOptional: ErrorType?
391391
do {

0 commit comments

Comments
 (0)