Skip to content

Commit 5fd1c1c

Browse files
ehsannasehsannas
committed
Fix merge conflicts.
1 parent 9271067 commit 5fd1c1c

File tree

1 file changed

+51
-22
lines changed

1 file changed

+51
-22
lines changed

‎Firestore/Swift/Tests/Integration/BsonTypesIntegrationTests.swift

Lines changed: 51 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
7777
// 2. Performing the given query using source=server.
7878
// 3. Performing the given query using source=cache.
7979
func assertSdkQueryResultsConsistentWithBackend(_ documentDataMap: [String: [String: Any]],
80+
collection: CollectionReference,
8081
query: Query,
8182
expectedResult: [String]) async throws {
8283
let watchSnapshot = try await Future<QuerySnapshot, Error>() { promise in
@@ -97,7 +98,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
9798
description: "snapshot listener"
9899
)
99100

100-
checkOnlineAndOfflineQuery(query, matchesResult: expectedResult)
101+
checkOnlineAndOfflineCollection(collection, query: query, matchesResult: expectedResult)
101102
}
102103

103104
func testCanWriteAndReadBsonTypes() async throws {
@@ -216,6 +217,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
216217

217218
try await assertSdkQueryResultsConsistentWithBackend(
218219
testDocs,
220+
collection: collection,
219221
query: query,
220222
expectedResult: ["c", "b"]
221223
)
@@ -229,6 +231,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
229231
.order(by: "key", descending: true)
230232
try await assertSdkQueryResultsConsistentWithBackend(
231233
testDocs,
234+
collection: collection,
232235
query: query,
233236
expectedResult: ["b", "a"]
234237
)
@@ -249,6 +252,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
249252
.order(by: "key", descending: true)
250253
try await assertSdkQueryResultsConsistentWithBackend(
251254
testDocs,
255+
collection: collection,
252256
query: query,
253257
expectedResult: ["c", "b"]
254258
)
@@ -258,6 +262,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
258262
.order(by: "key", descending: true)
259263
try await assertSdkQueryResultsConsistentWithBackend(
260264
testDocs,
265+
collection: collection,
261266
query: query,
262267
expectedResult: ["c", "a"]
263268
)
@@ -278,6 +283,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
278283
.order(by: "key", descending: true)
279284
try await assertSdkQueryResultsConsistentWithBackend(
280285
testDocs,
286+
collection: collection,
281287
query: query,
282288
expectedResult: ["c", "b"]
283289
)
@@ -287,6 +293,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
287293
.order(by: "key", descending: true)
288294
try await assertSdkQueryResultsConsistentWithBackend(
289295
testDocs,
296+
collection: collection,
290297
query: query,
291298
expectedResult: ["c", "b"]
292299
)
@@ -310,6 +317,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
310317
.order(by: "key", descending: true)
311318
try await assertSdkQueryResultsConsistentWithBackend(
312319
testDocs,
320+
collection: collection,
313321
query: query,
314322
expectedResult: ["c", "b"]
315323
)
@@ -326,6 +334,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
326334
.order(by: "key", descending: true)
327335
try await assertSdkQueryResultsConsistentWithBackend(
328336
testDocs,
337+
collection: collection,
329338
query: query,
330339
expectedResult: ["b", "a"]
331340
)
@@ -350,6 +359,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
350359
).order(by: "key", descending: true)
351360
try await assertSdkQueryResultsConsistentWithBackend(
352361
testDocs,
362+
collection: collection,
353363
query: query,
354364
expectedResult: ["c", "a"]
355365
)
@@ -372,6 +382,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
372382
.order(by: "key", descending: true)
373383
try await assertSdkQueryResultsConsistentWithBackend(
374384
testDocs,
385+
collection: collection,
375386
query: query,
376387
expectedResult: ["b", "a"]
377388
)
@@ -383,6 +394,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
383394
// .order(by: "key")
384395
// try await assertSdkQueryResultsConsistentWithBackend(
385396
// testDocs,
397+
// collection: collection,
386398
// query: query2,
387399
// expectedResult: ["d", "e"]
388400
// )
@@ -392,6 +404,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
392404
.order(by: "key")
393405
try await assertSdkQueryResultsConsistentWithBackend(
394406
testDocs,
407+
collection: collection,
395408
query: query,
396409
expectedResult: ["a", "b"]
397410
)
@@ -401,6 +414,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
401414
.order(by: "key")
402415
try await assertSdkQueryResultsConsistentWithBackend(
403416
testDocs,
417+
collection: collection,
404418
query: query,
405419
expectedResult: ["a", "b"]
406420
)
@@ -410,6 +424,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
410424
.order(by: "key")
411425
try await assertSdkQueryResultsConsistentWithBackend(
412426
testDocs,
427+
collection: collection,
413428
query: query,
414429
expectedResult: []
415430
)
@@ -419,6 +434,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
419434
.order(by: "key")
420435
try await assertSdkQueryResultsConsistentWithBackend(
421436
testDocs,
437+
collection: collection,
422438
query: query,
423439
expectedResult: []
424440
)
@@ -428,6 +444,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
428444
.order(by: "key")
429445
try await assertSdkQueryResultsConsistentWithBackend(
430446
testDocs,
447+
collection: collection,
431448
query: query,
432449
expectedResult: []
433450
)
@@ -450,6 +467,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
450467
.order(by: "key")
451468
try await assertSdkQueryResultsConsistentWithBackend(
452469
testDocs,
470+
collection: collection,
453471
query: query,
454472
expectedResult: ["c", "d"]
455473
)
@@ -461,6 +479,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
461479
// .order(by: "key")
462480
// try await assertSdkQueryResultsConsistentWithBackend(
463481
// testDocs,
482+
// collection: collection,
464483
// query: query,
465484
// expectedResult: ["a", "b"]
466485
// )
@@ -470,6 +489,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
470489
.order(by: "key")
471490
try await assertSdkQueryResultsConsistentWithBackend(
472491
testDocs,
492+
collection: collection,
473493
query: query,
474494
expectedResult: ["c", "d"]
475495
)
@@ -479,6 +499,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
479499
.order(by: "key")
480500
try await assertSdkQueryResultsConsistentWithBackend(
481501
testDocs,
502+
collection: collection,
482503
query: query,
483504
expectedResult: ["c", "d"]
484505
)
@@ -488,6 +509,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
488509
.order(by: "key")
489510
try await assertSdkQueryResultsConsistentWithBackend(
490511
testDocs,
512+
collection: collection,
491513
query: query,
492514
expectedResult: []
493515
)
@@ -497,6 +519,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
497519
.order(by: "key")
498520
try await assertSdkQueryResultsConsistentWithBackend(
499521
testDocs,
522+
collection: collection,
500523
query: query,
501524
expectedResult: []
502525
)
@@ -506,6 +529,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
506529
.order(by: "key")
507530
try await assertSdkQueryResultsConsistentWithBackend(
508531
testDocs,
532+
collection: collection,
509533
query: query,
510534
expectedResult: []
511535
)
@@ -528,6 +552,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
528552
.order(by: "key")
529553
try await assertSdkQueryResultsConsistentWithBackend(
530554
testDocs,
555+
collection: collection,
531556
query: query,
532557
expectedResult: ["b", "c"]
533558
)
@@ -537,6 +562,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
537562
.order(by: "key")
538563
try await assertSdkQueryResultsConsistentWithBackend(
539564
testDocs,
565+
collection: collection,
540566
query: query,
541567
expectedResult: ["a", "d", "e"]
542568
)
@@ -571,27 +597,29 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
571597
await setDocumentData(testDocs, toCollection: collection)
572598

573599
let query = collection.order(by: "key", descending: true)
574-
try await assertSdkQueryResultsConsistentWithBackend(testDocs, query: query, expectedResult: [
575-
"maxKey2",
576-
"maxKey1",
577-
"regex3",
578-
"regex1",
579-
"regex2",
580-
"bsonObjectId2",
581-
"bsonObjectId1",
582-
"bsonObjectId3",
583-
"bsonBinary3",
584-
"bsonBinary2",
585-
"bsonBinary1",
586-
"bsonTimestamp1",
587-
"bsonTimestamp2",
588-
"bsonTimestamp3",
589-
"int32Value2",
590-
"int32Value3",
591-
"int32Value1",
592-
"minKey2",
593-
"minKey1",
594-
])
600+
try await assertSdkQueryResultsConsistentWithBackend(testDocs,
601+
collection: collection,
602+
query: query, expectedResult: [
603+
"maxKey2",
604+
"maxKey1",
605+
"regex3",
606+
"regex1",
607+
"regex2",
608+
"bsonObjectId2",
609+
"bsonObjectId1",
610+
"bsonObjectId3",
611+
"bsonBinary3",
612+
"bsonBinary2",
613+
"bsonBinary1",
614+
"bsonTimestamp1",
615+
"bsonTimestamp2",
616+
"bsonTimestamp3",
617+
"int32Value2",
618+
"int32Value3",
619+
"int32Value1",
620+
"minKey2",
621+
"minKey1",
622+
])
595623
}
596624

597625
func testCanOrderValuesOfDifferentTypes() async throws {
@@ -652,6 +680,7 @@ class BsonTypesIntegrationTests: FSTIntegrationTestCase {
652680

653681
try await assertSdkQueryResultsConsistentWithBackend(
654682
testDocs,
683+
collection: collection,
655684
query: orderedQuery,
656685
expectedResult: expectedOrder
657686
)

0 commit comments

Comments
 (0)