Skip to content

Commit 4ce221a

Browse files
Make tests compile again. Change __FILE__ and __LINE__ to #file and #line
1 parent fd946ac commit 4ce221a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

SQLiteTests/TestHelpers.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ class SQLiteTestCase : XCTestCase {
4747
)
4848
}
4949

50-
func AssertSQL(SQL: String, _ executions: Int = 1, _ message: String? = nil, file: String = __FILE__, line: UInt = __LINE__) {
50+
func AssertSQL(SQL: String, _ executions: Int = 1, _ message: String? = nil, file: StaticString = #file, line: UInt = #line) {
5151
XCTAssertEqual(
5252
executions, trace[SQL] ?? 0,
5353
message ?? SQL,
5454
file: file, line: line
5555
)
5656
}
5757

58-
func AssertSQL(SQL: String, _ statement: Statement, _ message: String? = nil, file: String = __FILE__, line: UInt = __LINE__) {
58+
func AssertSQL(SQL: String, _ statement: Statement, _ message: String? = nil, file: StaticString = #file, line: UInt = #line) {
5959
try! statement.run()
6060
AssertSQL(SQL, 1, message, file: file, line: line)
6161
if let count = trace[SQL] { trace[SQL] = count - 1 }
@@ -96,11 +96,11 @@ let int64Optional = Expression<Int64?>("int64Optional")
9696
let string = Expression<String>("string")
9797
let stringOptional = Expression<String?>("stringOptional")
9898

99-
func AssertSQL(@autoclosure expression1: () -> String, @autoclosure _ expression2: () -> Expressible, file: String = __FILE__, line: UInt = __LINE__) {
99+
func AssertSQL(@autoclosure expression1: () -> String, @autoclosure _ expression2: () -> Expressible, file: StaticString = #file, line: UInt = #line) {
100100
XCTAssertEqual(expression1(), expression2().asSQL(), file: file, line: line)
101101
}
102102

103-
func AssertThrows<T>(@autoclosure expression: () throws -> T, file: String = __FILE__, line: UInt = __LINE__) {
103+
func AssertThrows<T>(@autoclosure expression: () throws -> T, file: StaticString = #file, line: UInt = #line) {
104104
do {
105105
try expression()
106106
XCTFail("expression expected to throw", file: file, line: line)

0 commit comments

Comments
 (0)