Skip to content

Commit

Permalink
update expectNoDifference
Browse files Browse the repository at this point in the history
  • Loading branch information
@rcarver
rcarver committed Jan 13, 2025
1 parent 26d978b commit 920ae3e
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 35 deletions.
4 changes: 2 additions & 2 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "27d767d643fa2cf083d0a73d74fa84cacb53e85c",
"version" : "1.4.1"
"revision" : "a3f634d1a409c7979cabc0a71b3f26ffa9fc8af1",
"version" : "1.4.3"
}
}
],
Expand Down
38 changes: 19 additions & 19 deletions Tests/ElasticsearchQueryBuilderTests/BuilderTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ final class ElasticsearchQueryBuilderTests: XCTestCase {
esb.Pagination(from: 10)
}
let query = build(tags: nil)
XCTAssertNoDifference(query.makeQuery(), [
expectNoDifference(query.makeQuery(), [
"query": [
"match": [
"title": "Hello World"
Expand All @@ -32,11 +32,11 @@ final class ElasticsearchQueryBuilderTests: XCTestCase {
}
}
let queryTrue = build(bool: true)
XCTAssertNoDifference(queryTrue.makeQuery(), [
expectNoDifference(queryTrue.makeQuery(), [
"from": 10
])
let queryFalse = build(bool: false)
XCTAssertNoDifference(queryFalse.makeQuery(), [:])
expectNoDifference(queryFalse.makeQuery(), [:])
}
}

Expand All @@ -46,7 +46,7 @@ final class DictQueryBuilderTests: XCTestCase {
esb.Pagination(from: 10)
}
let query = build(tags: nil)
XCTAssertNoDifference(query.makeQuery(), [
expectNoDifference(query.makeQuery(), [
"from": 10
])
}
Expand All @@ -56,7 +56,7 @@ final class DictQueryBuilderTests: XCTestCase {
esb.Pagination(size: 20)
}
let query = build(tags: nil)
XCTAssertNoDifference(query.makeQuery(), [
expectNoDifference(query.makeQuery(), [
"from": 10,
"size": 20
])
Expand All @@ -70,13 +70,13 @@ final class DictQueryBuilderTests: XCTestCase {
}
}
let queryTrue = build(bool: true)
XCTAssertNoDifference(queryTrue.makeQuery(), [
expectNoDifference(queryTrue.makeQuery(), [
"query": [
"from": 10
]
])
let queryFalse = build(bool: false)
XCTAssertNoDifference(queryFalse.makeQuery(), [:])
expectNoDifference(queryFalse.makeQuery(), [:])
}
func testBuildEither() throws {
@ElasticsearchQueryBuilder func build(bool: Bool) -> some esb.QueryDSL {
Expand All @@ -89,13 +89,13 @@ final class DictQueryBuilderTests: XCTestCase {
}
}
let queryTrue = build(bool: true)
XCTAssertNoDifference(queryTrue.makeQuery(), [
expectNoDifference(queryTrue.makeQuery(), [
"query": [
"from": 10
]
])
let queryFalse = build(bool: false)
XCTAssertNoDifference(queryFalse.makeQuery(), [
expectNoDifference(queryFalse.makeQuery(), [
"query": [
"from": 20,
]
Expand All @@ -115,7 +115,7 @@ final class ArrayQueryBuilderTests: XCTestCase {
}
}
let query = build()
XCTAssertNoDifference(query.makeQuery(), [
expectNoDifference(query.makeQuery(), [
"should": [
[ "match": [ "title": "Hello World" ] ]
]
Expand All @@ -137,7 +137,7 @@ final class ArrayQueryBuilderTests: XCTestCase {
}
}
let query = build()
XCTAssertNoDifference(query.makeQuery(), [
expectNoDifference(query.makeQuery(), [
"should": [
[ "match": [ "title": "Hello World" ] ],
[ "match": [ "content": "Elasticsearch" ] ],
Expand All @@ -156,7 +156,7 @@ final class ArrayQueryBuilderTests: XCTestCase {
}
}
let query = build()
XCTAssertNoDifference(query.makeQuery(), [
expectNoDifference(query.makeQuery(), [
"should": [
[ "match": [ "title": "Hello World" ] ],
[ "from": 10 ]
Expand All @@ -181,13 +181,13 @@ final class ArrayQueryBuilderTests: XCTestCase {
}
}
let queryFalse = build(title: nil)
XCTAssertNoDifference(queryFalse.makeQuery(), [
expectNoDifference(queryFalse.makeQuery(), [
"should": [
[ "match": [ "content": "Elasticsearch" ] ],
]
])
let queryTrue = build(title: "Hello World")
XCTAssertNoDifference(queryTrue.makeQuery(), [
expectNoDifference(queryTrue.makeQuery(), [
"should": [
[ "match": [ "title": "Hello World" ] ],
[ "match": [ "content": "Elasticsearch" ] ],
Expand All @@ -214,9 +214,9 @@ final class ArrayQueryBuilderTests: XCTestCase {
}
}
let queryFalse = build(title: nil)
XCTAssertNoDifference(queryFalse.makeQuery(), [:])
expectNoDifference(queryFalse.makeQuery(), [:])
let queryTrue = build(title: "Hello World")
XCTAssertNoDifference(queryTrue.makeQuery(), [
expectNoDifference(queryTrue.makeQuery(), [
"should": [
[ "match": [ "title": "Hello World" ] ],
[ "match": [ "content": "Hello World" ] ],
Expand All @@ -234,13 +234,13 @@ final class ArrayQueryBuilderTests: XCTestCase {
}
}
let queryTrue = build(true)
XCTAssertNoDifference(queryTrue.makeQuery(), [
expectNoDifference(queryTrue.makeQuery(), [
"should": [
[ "from": 10 ]
]
])
let queryFalse = build(false)
XCTAssertNoDifference(queryFalse.makeQuery(), [
expectNoDifference(queryFalse.makeQuery(), [
"should": [
[ "from": 20 ]
]
Expand All @@ -259,7 +259,7 @@ final class ArrayQueryBuilderTests: XCTestCase {
}
}
let query = build()
XCTAssertNoDifference(query.makeQuery(), [
expectNoDifference(query.makeQuery(), [
"should": [
[ "match": [ "title": "Hello" ] ],
[ "match": [ "title": "World" ] ],
Expand Down
20 changes: 12 additions & 8 deletions Tests/ElasticsearchQueryBuilderTests/EncodingTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,31 @@ final class EncodingTests: XCTestCase {
func assertFormattedDate(
_ value: QueryValue,
_ want: String,
file: StaticString = #file,
line: UInt = #line
fileID: StaticString = #fileID,
filePath: StaticString = #filePath,
line: UInt = #line,
column: UInt = #column
) throws {
let encoder = JSONEncoder()
let got = try encoder.encode(value)
let gotString = try XCTUnwrap(String(data: got, encoding: .utf8), file: file, line: line)
XCTAssertNoDifference(gotString, want, file: file, line: line)
let gotString = try XCTUnwrap(String(data: got, encoding: .utf8), file: filePath, line: line)
expectNoDifference(gotString, want, fileID: fileID, filePath: filePath, line: line, column: column)
}

func assertFormattedDate(
_ value: Date,
dateEncodingStrategy: JSONEncoder.DateEncodingStrategy,
_ want: String,
file: StaticString = #file,
line: UInt = #line
fileID: StaticString = #fileID,
filePath: StaticString = #filePath,
line: UInt = #line,
column: UInt = #column
) throws {
let encoder = JSONEncoder()
encoder.dateEncodingStrategy = dateEncodingStrategy
let got = try encoder.encode(value)
let gotString = try XCTUnwrap(String(data: got, encoding: .utf8), file: file, line: line)
XCTAssertNoDifference(gotString, want, file: file, line: line)
let gotString = try XCTUnwrap(String(data: got, encoding: .utf8), file: filePath, line: line)
expectNoDifference(gotString, want, fileID: fileID, filePath: filePath, line: line, column: column)
}

let date = Date(timeIntervalSince1970: 1001.12345)
Expand Down
12 changes: 6 additions & 6 deletions Tests/ElasticsearchQueryBuilderTests/QueryValueTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ import XCTest
final class QueryValueTests: XCTestCase {

func test_array() {
XCTAssertNoDifference(
expectNoDifference(
QueryValue.array([Float(0.1), 0.2]),
QueryValue.array([.float(0.1), .float(0.2)])
)
XCTAssertNoDifference(
expectNoDifference(
QueryValue.array([Double(0.1), 0.2]),
QueryValue.array([.float(0.1), .float(0.2)])
)
XCTAssertNoDifference(
expectNoDifference(
QueryValue.array([1, 2]),
QueryValue.array([.int(1), .int(2)])
)
XCTAssertNoDifference(
expectNoDifference(
QueryValue.array(["a", "b"]),
QueryValue.array([.string("a"), .string("b")])
)
struct Custom: CustomStringConvertible {
var description: String
}
XCTAssertNoDifference(
expectNoDifference(
QueryValue.array(describing: [Custom(description: "a"), Custom(description: "b")]),
QueryValue.array([.string("a"), .string("b")])
)
Expand All @@ -35,7 +35,7 @@ final class QueryValueTests: XCTestCase {
struct Custom: CustomStringConvertible {
var description: String
}
XCTAssertNoDifference(
expectNoDifference(
QueryValue.string(describing: Custom(description: "a")),
QueryValue.string("a")
)
Expand Down

0 comments on commit 920ae3e

Please sign in to comment.