Skip to content

Commit 920ae3e

Browse files
rcarverrcarver
committed
update expectNoDifference
1 parent 26d978b commit 920ae3e

File tree

4 files changed

+39
-35
lines changed

4 files changed

+39
-35
lines changed

‎Package.resolved‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tests/ElasticsearchQueryBuilderTests/BuilderTests.swift‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class ElasticsearchQueryBuilderTests: XCTestCase {
1616
esb.Pagination(from: 10)
1717
}
1818
let query = build(tags: nil)
19-
XCTAssertNoDifference(query.makeQuery(), [
19+
expectNoDifference(query.makeQuery(), [
2020
"query": [
2121
"match": [
2222
"title": "Hello World"
@@ -32,11 +32,11 @@ final class ElasticsearchQueryBuilderTests: XCTestCase {
3232
}
3333
}
3434
let queryTrue = build(bool: true)
35-
XCTAssertNoDifference(queryTrue.makeQuery(), [
35+
expectNoDifference(queryTrue.makeQuery(), [
3636
"from": 10
3737
])
3838
let queryFalse = build(bool: false)
39-
XCTAssertNoDifference(queryFalse.makeQuery(), [:])
39+
expectNoDifference(queryFalse.makeQuery(), [:])
4040
}
4141
}
4242

@@ -46,7 +46,7 @@ final class DictQueryBuilderTests: XCTestCase {
4646
esb.Pagination(from: 10)
4747
}
4848
let query = build(tags: nil)
49-
XCTAssertNoDifference(query.makeQuery(), [
49+
expectNoDifference(query.makeQuery(), [
5050
"from": 10
5151
])
5252
}
@@ -56,7 +56,7 @@ final class DictQueryBuilderTests: XCTestCase {
5656
esb.Pagination(size: 20)
5757
}
5858
let query = build(tags: nil)
59-
XCTAssertNoDifference(query.makeQuery(), [
59+
expectNoDifference(query.makeQuery(), [
6060
"from": 10,
6161
"size": 20
6262
])
@@ -70,13 +70,13 @@ final class DictQueryBuilderTests: XCTestCase {
7070
}
7171
}
7272
let queryTrue = build(bool: true)
73-
XCTAssertNoDifference(queryTrue.makeQuery(), [
73+
expectNoDifference(queryTrue.makeQuery(), [
7474
"query": [
7575
"from": 10
7676
]
7777
])
7878
let queryFalse = build(bool: false)
79-
XCTAssertNoDifference(queryFalse.makeQuery(), [:])
79+
expectNoDifference(queryFalse.makeQuery(), [:])
8080
}
8181
func testBuildEither() throws {
8282
@ElasticsearchQueryBuilder func build(bool: Bool) -> some esb.QueryDSL {
@@ -89,13 +89,13 @@ final class DictQueryBuilderTests: XCTestCase {
8989
}
9090
}
9191
let queryTrue = build(bool: true)
92-
XCTAssertNoDifference(queryTrue.makeQuery(), [
92+
expectNoDifference(queryTrue.makeQuery(), [
9393
"query": [
9494
"from": 10
9595
]
9696
])
9797
let queryFalse = build(bool: false)
98-
XCTAssertNoDifference(queryFalse.makeQuery(), [
98+
expectNoDifference(queryFalse.makeQuery(), [
9999
"query": [
100100
"from": 20,
101101
]
@@ -115,7 +115,7 @@ final class ArrayQueryBuilderTests: XCTestCase {
115115
}
116116
}
117117
let query = build()
118-
XCTAssertNoDifference(query.makeQuery(), [
118+
expectNoDifference(query.makeQuery(), [
119119
"should": [
120120
[ "match": [ "title": "Hello World" ] ]
121121
]
@@ -137,7 +137,7 @@ final class ArrayQueryBuilderTests: XCTestCase {
137137
}
138138
}
139139
let query = build()
140-
XCTAssertNoDifference(query.makeQuery(), [
140+
expectNoDifference(query.makeQuery(), [
141141
"should": [
142142
[ "match": [ "title": "Hello World" ] ],
143143
[ "match": [ "content": "Elasticsearch" ] ],
@@ -156,7 +156,7 @@ final class ArrayQueryBuilderTests: XCTestCase {
156156
}
157157
}
158158
let query = build()
159-
XCTAssertNoDifference(query.makeQuery(), [
159+
expectNoDifference(query.makeQuery(), [
160160
"should": [
161161
[ "match": [ "title": "Hello World" ] ],
162162
[ "from": 10 ]
@@ -181,13 +181,13 @@ final class ArrayQueryBuilderTests: XCTestCase {
181181
}
182182
}
183183
let queryFalse = build(title: nil)
184-
XCTAssertNoDifference(queryFalse.makeQuery(), [
184+
expectNoDifference(queryFalse.makeQuery(), [
185185
"should": [
186186
[ "match": [ "content": "Elasticsearch" ] ],
187187
]
188188
])
189189
let queryTrue = build(title: "Hello World")
190-
XCTAssertNoDifference(queryTrue.makeQuery(), [
190+
expectNoDifference(queryTrue.makeQuery(), [
191191
"should": [
192192
[ "match": [ "title": "Hello World" ] ],
193193
[ "match": [ "content": "Elasticsearch" ] ],
@@ -214,9 +214,9 @@ final class ArrayQueryBuilderTests: XCTestCase {
214214
}
215215
}
216216
let queryFalse = build(title: nil)
217-
XCTAssertNoDifference(queryFalse.makeQuery(), [:])
217+
expectNoDifference(queryFalse.makeQuery(), [:])
218218
let queryTrue = build(title: "Hello World")
219-
XCTAssertNoDifference(queryTrue.makeQuery(), [
219+
expectNoDifference(queryTrue.makeQuery(), [
220220
"should": [
221221
[ "match": [ "title": "Hello World" ] ],
222222
[ "match": [ "content": "Hello World" ] ],
@@ -234,13 +234,13 @@ final class ArrayQueryBuilderTests: XCTestCase {
234234
}
235235
}
236236
let queryTrue = build(true)
237-
XCTAssertNoDifference(queryTrue.makeQuery(), [
237+
expectNoDifference(queryTrue.makeQuery(), [
238238
"should": [
239239
[ "from": 10 ]
240240
]
241241
])
242242
let queryFalse = build(false)
243-
XCTAssertNoDifference(queryFalse.makeQuery(), [
243+
expectNoDifference(queryFalse.makeQuery(), [
244244
"should": [
245245
[ "from": 20 ]
246246
]
@@ -259,7 +259,7 @@ final class ArrayQueryBuilderTests: XCTestCase {
259259
}
260260
}
261261
let query = build()
262-
XCTAssertNoDifference(query.makeQuery(), [
262+
expectNoDifference(query.makeQuery(), [
263263
"should": [
264264
[ "match": [ "title": "Hello" ] ],
265265
[ "match": [ "title": "World" ] ],

‎Tests/ElasticsearchQueryBuilderTests/EncodingTests.swift‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,31 @@ final class EncodingTests: XCTestCase {
88
func assertFormattedDate(
99
_ value: QueryValue,
1010
_ want: String,
11-
file: StaticString = #file,
12-
line: UInt = #line
11+
fileID: StaticString = #fileID,
12+
filePath: StaticString = #filePath,
13+
line: UInt = #line,
14+
column: UInt = #column
1315
) throws {
1416
let encoder = JSONEncoder()
1517
let got = try encoder.encode(value)
16-
let gotString = try XCTUnwrap(String(data: got, encoding: .utf8), file: file, line: line)
17-
XCTAssertNoDifference(gotString, want, file: file, line: line)
18+
let gotString = try XCTUnwrap(String(data: got, encoding: .utf8), file: filePath, line: line)
19+
expectNoDifference(gotString, want, fileID: fileID, filePath: filePath, line: line, column: column)
1820
}
1921

2022
func assertFormattedDate(
2123
_ value: Date,
2224
dateEncodingStrategy: JSONEncoder.DateEncodingStrategy,
2325
_ want: String,
24-
file: StaticString = #file,
25-
line: UInt = #line
26+
fileID: StaticString = #fileID,
27+
filePath: StaticString = #filePath,
28+
line: UInt = #line,
29+
column: UInt = #column
2630
) throws {
2731
let encoder = JSONEncoder()
2832
encoder.dateEncodingStrategy = dateEncodingStrategy
2933
let got = try encoder.encode(value)
30-
let gotString = try XCTUnwrap(String(data: got, encoding: .utf8), file: file, line: line)
31-
XCTAssertNoDifference(gotString, want, file: file, line: line)
34+
let gotString = try XCTUnwrap(String(data: got, encoding: .utf8), file: filePath, line: line)
35+
expectNoDifference(gotString, want, fileID: fileID, filePath: filePath, line: line, column: column)
3236
}
3337

3438
let date = Date(timeIntervalSince1970: 1001.12345)

‎Tests/ElasticsearchQueryBuilderTests/QueryValueTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ import XCTest
66
final class QueryValueTests: XCTestCase {
77

88
func test_array() {
9-
XCTAssertNoDifference(
9+
expectNoDifference(
1010
QueryValue.array([Float(0.1), 0.2]),
1111
QueryValue.array([.float(0.1), .float(0.2)])
1212
)
13-
XCTAssertNoDifference(
13+
expectNoDifference(
1414
QueryValue.array([Double(0.1), 0.2]),
1515
QueryValue.array([.float(0.1), .float(0.2)])
1616
)
17-
XCTAssertNoDifference(
17+
expectNoDifference(
1818
QueryValue.array([1, 2]),
1919
QueryValue.array([.int(1), .int(2)])
2020
)
21-
XCTAssertNoDifference(
21+
expectNoDifference(
2222
QueryValue.array(["a", "b"]),
2323
QueryValue.array([.string("a"), .string("b")])
2424
)
2525
struct Custom: CustomStringConvertible {
2626
var description: String
2727
}
28-
XCTAssertNoDifference(
28+
expectNoDifference(
2929
QueryValue.array(describing: [Custom(description: "a"), Custom(description: "b")]),
3030
QueryValue.array([.string("a"), .string("b")])
3131
)
@@ -35,7 +35,7 @@ final class QueryValueTests: XCTestCase {
3535
struct Custom: CustomStringConvertible {
3636
var description: String
3737
}
38-
XCTAssertNoDifference(
38+
expectNoDifference(
3939
QueryValue.string(describing: Custom(description: "a")),
4040
QueryValue.string("a")
4141
)

0 commit comments

Comments
 (0)