Skip to content

Commit a3e4b27

Browse files
wu-huiwu-hui
committed
[realppl 11] Add query to pipeline support
1 parent 59aa81d commit a3e4b27

File tree

20 files changed

+1391
-275
lines changed

20 files changed

+1391
-275
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ profile
6161
DerivedData
6262
*.hmap
6363
*.ipa
64+
# Xcode index build files
65+
.index-build/
6466

6567
# Swift Package Manager
6668
Package.resolved
@@ -166,3 +168,4 @@ Firestore/Example/GoogleService-Info.plist
166168

167169
# FirebaseVertexAI test data
168170
vertexai-sdk-test-data
171+

‎Firestore/Example/Firestore.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
1145D70555D8CDC75183A88C /* leveldb_mutation_queue_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C7942B6244F4C416B11B86C /* leveldb_mutation_queue_test.cc */; };
141141
11627F3A48F710D654829807 /* comparison_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 87DD1A65EBA9FFC1FFAAE657 /* comparison_test.cc */; };
142142
117AFA7934A52466633E12C1 /* FSTTestingHooks.mm in Sources */ = {isa = PBXBuildFile; fileRef = D85AC18C55650ED230A71B82 /* FSTTestingHooks.mm */; };
143-
11A5189E73D954824F015424 /* pipeline_util_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0401C6FDE59C493BFBD5DFED /* pipeline_util_test.cc */; };
144143
11BC867491A6631D37DE56A8 /* async_testing.cc in Sources */ = {isa = PBXBuildFile; fileRef = 872C92ABD71B12784A1C5520 /* async_testing.cc */; };
145144
11EBD28DBD24063332433947 /* value_util_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 40F9D09063A07F710811A84F /* value_util_test.cc */; };
146145
11F8EE69182C9699E90A9E3D /* database_info_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB38D92E20235D22000A432D /* database_info_test.cc */; };
@@ -149,6 +148,9 @@
149148
121F0FB9DCCBFB7573C7AF48 /* bundle_serializer_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5C2A94EE24E60543F62CC35 /* bundle_serializer_test.cc */; };
150149
124AAEE987451820F24EEA8E /* user_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = CCC9BD953F121B9E29F9AA42 /* user_test.cc */; };
151150
125B1048ECB755C2106802EB /* executor_std_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6FB4687208F9B9100554BA2 /* executor_std_test.cc */; };
151+
128F2B012E254E2C0006327E /* QueryToPipelineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 128F2B002E254E2C0006327E /* QueryToPipelineTests.swift */; };
152+
128F2B022E254E2C0006327E /* QueryToPipelineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 128F2B002E254E2C0006327E /* QueryToPipelineTests.swift */; };
153+
128F2B032E254E2C0006327E /* QueryToPipelineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 128F2B002E254E2C0006327E /* QueryToPipelineTests.swift */; };
152154
1290FA77A922B76503AE407C /* lru_garbage_collector_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 277EAACC4DD7C21332E8496A /* lru_garbage_collector_test.cc */; };
153155
1291D9F5300AFACD1FBD262D /* array_sorted_map_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54EB764C202277B30088B8F3 /* array_sorted_map_test.cc */; };
154156
1296CECE2DEE97F5007F8552 /* RealtimePipelineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1296CECD2DEE97EF007F8552 /* RealtimePipelineTests.swift */; };
@@ -524,7 +526,6 @@
524526
48720B5768AFA2B2F3E14C04 /* Validation_BloomFilterTest_MD5_500_1_bloom_filter_proto.json in Resources */ = {isa = PBXBuildFile; fileRef = D8E530B27D5641B9C26A452C /* Validation_BloomFilterTest_MD5_500_1_bloom_filter_proto.json */; };
525527
48926FF55484E996B474D32F /* Validation_BloomFilterTest_MD5_500_01_membership_test_result.json in Resources */ = {isa = PBXBuildFile; fileRef = DD990FD89C165F4064B4F608 /* Validation_BloomFilterTest_MD5_500_01_membership_test_result.json */; };
526528
489D672CAA09B9BC66798E9F /* status.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9920B89AAC00B5BCE7 /* status.pb.cc */; };
527-
48A9AD22B0601C52B0522CF7 /* pipeline_util_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0401C6FDE59C493BFBD5DFED /* pipeline_util_test.cc */; };
528529
48BC5801432127A90CFF55E3 /* index.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 395E8B07639E69290A929695 /* index.pb.cc */; };
529530
48D1B38B93D34F1B82320577 /* view_testing.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5466E7809AD2871FFDE6C76 /* view_testing.cc */; };
530531
48F44AA226FAD5DE4EAC3798 /* leveldb_query_engine_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = DB1F1E1B1ED15E8D042144B1 /* leveldb_query_engine_test.cc */; };
@@ -723,7 +724,6 @@
723724
5556B648B9B1C2F79A706B4F /* common.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D221C2DDC800EFB9CC /* common.pb.cc */; };
724725
55B9A6ACDF95D356EA501D92 /* Pods_Firestore_Example_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB5A5E6DD07DA3EB7AD46CA7 /* Pods_Firestore_Example_iOS.framework */; };
725726
55E84644D385A70E607A0F91 /* leveldb_local_store_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5FF903AEFA7A3284660FA4C5 /* leveldb_local_store_test.cc */; };
726-
563FE05627C7E66469E99292 /* pipeline_util_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0401C6FDE59C493BFBD5DFED /* pipeline_util_test.cc */; };
727727
568EC1C0F68A7B95E57C8C6C /* leveldb_key_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54995F6E205B6E12004EFFA0 /* leveldb_key_test.cc */; };
728728
56D85436D3C864B804851B15 /* string_format_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9CFD366B783AE27B9E79EE7A /* string_format_apple_test.mm */; };
729729
57171BD004A1691B19A76453 /* Validation_BloomFilterTest_MD5_1_0001_membership_test_result.json in Resources */ = {isa = PBXBuildFile; fileRef = C939D1789E38C09F9A0C1157 /* Validation_BloomFilterTest_MD5_1_0001_membership_test_result.json */; };
@@ -962,7 +962,6 @@
962962
75C6CECF607CA94F56260BAB /* memory_document_overlay_cache_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 29D9C76922DAC6F710BC1EF4 /* memory_document_overlay_cache_test.cc */; };
963963
75CC1D1F7F1093C2E09D9998 /* inequality_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = A410E38FA5C3EB5AECDB6F1C /* inequality_test.cc */; };
964964
75D124966E727829A5F99249 /* FIRTypeTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E071202154D600B64F25 /* FIRTypeTests.mm */; };
965-
7676C06AF7FF67806747E4F0 /* pipeline_util_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0401C6FDE59C493BFBD5DFED /* pipeline_util_test.cc */; };
966965
76A5447D76F060E996555109 /* task_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 899FC22684B0F7BEEAE13527 /* task_test.cc */; };
967966
76AD5862714F170251BDEACB /* Validation_BloomFilterTest_MD5_50000_0001_bloom_filter_proto.json in Resources */ = {isa = PBXBuildFile; fileRef = A5D9044B72061CAF284BC9E4 /* Validation_BloomFilterTest_MD5_50000_0001_bloom_filter_proto.json */; };
968967
76C18D1BA96E4F5DF1BF7F4B /* Validation_BloomFilterTest_MD5_500_1_membership_test_result.json in Resources */ = {isa = PBXBuildFile; fileRef = 8AB49283E544497A9C5A0E59 /* Validation_BloomFilterTest_MD5_500_1_membership_test_result.json */; };
@@ -1650,7 +1649,6 @@
16501649
E1016ECF143B732E7821358E /* byte_stream_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7628664347B9C96462D4BF17 /* byte_stream_apple_test.mm */; };
16511650
E11DDA3DD75705F26245E295 /* FIRCollectionReferenceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E045202154AA00B64F25 /* FIRCollectionReferenceTests.mm */; };
16521651
E1264B172412967A09993EC6 /* byte_string_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5342CDDB137B4E93E2E85CCA /* byte_string_test.cc */; };
1653-
E14DBE1D9FC94B5E7E391BEE /* pipeline_util_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0401C6FDE59C493BFBD5DFED /* pipeline_util_test.cc */; };
16541652
E15A05789FF01F44BCAE75EF /* fields_array_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = BA4CBA48204C9E25B56993BC /* fields_array_test.cc */; };
16551653
E186D002520881AD2906ADDB /* status.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9920B89AAC00B5BCE7 /* status.pb.cc */; };
16561654
E1DB8E1A4CF3DCE2AE8454D8 /* string_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = EEF23C7104A4D040C3A8CF9B /* string_test.cc */; };
@@ -1676,7 +1674,6 @@
16761674
E54AC3EA240C05B3720A2FE9 /* Validation_BloomFilterTest_MD5_5000_0001_bloom_filter_proto.json in Resources */ = {isa = PBXBuildFile; fileRef = 728F617782600536F2561463 /* Validation_BloomFilterTest_MD5_5000_0001_bloom_filter_proto.json */; };
16771675
E56EEC9DAC455E2BE77D110A /* memory_document_overlay_cache_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 29D9C76922DAC6F710BC1EF4 /* memory_document_overlay_cache_test.cc */; };
16781676
E59F597947D3E130A57E1B5E /* Validation_BloomFilterTest_MD5_1_1_membership_test_result.json in Resources */ = {isa = PBXBuildFile; fileRef = 3369AC938F82A70685C5ED58 /* Validation_BloomFilterTest_MD5_1_1_membership_test_result.json */; };
1679-
E5FE2BEECD70D59361B51540 /* pipeline_util_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0401C6FDE59C493BFBD5DFED /* pipeline_util_test.cc */; };
16801677
E63342115B1DA65DB6F2C59A /* leveldb_local_store_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5FF903AEFA7A3284660FA4C5 /* leveldb_local_store_test.cc */; };
16811678
E6357221227031DD77EE5265 /* index_manager_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AE4A9E38D65688EE000EE2A1 /* index_manager_test.cc */; };
16821679
E6603BA4B16C9E1422DD3A4B /* FSTTestingHooks.mm in Sources */ = {isa = PBXBuildFile; fileRef = D85AC18C55650ED230A71B82 /* FSTTestingHooks.mm */; };
@@ -1908,8 +1905,7 @@
19081905
014C60628830D95031574D15 /* random_access_queue_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = random_access_queue_test.cc; sourceTree = "<group>"; };
19091906
01D10113ECC5B446DB35E96D /* byte_stream_cpp_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = byte_stream_cpp_test.cc; sourceTree = "<group>"; };
19101907
03BD47161789F26754D3B958 /* Pods-Firestore_Benchmarks_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestore_Benchmarks_iOS.release.xcconfig"; path = "Target Support Files/Pods-Firestore_Benchmarks_iOS/Pods-Firestore_Benchmarks_iOS.release.xcconfig"; sourceTree = "<group>"; };
1911-
0401C6FDE59C493BFBD5DFED /* pipeline_util_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; path = pipeline_util_test.cc; sourceTree = "<group>"; };
1912-
0458BABD8F8738AD16F4A2FE /* array_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; name = array_test.cc; path = expressions/array_test.cc; sourceTree = "<group>"; };
1908+
0458BABD8F8738AD16F4A2FE /* array_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; name = array_test.cc; path = expressions/array_test.cc; sourceTree = "<group>"; };
19131909
045D39C4A7D52AF58264240F /* remote_document_cache_test.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = remote_document_cache_test.h; sourceTree = "<group>"; };
19141910
0473AFFF5567E667A125347B /* ordered_code_benchmark.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = ordered_code_benchmark.cc; sourceTree = "<group>"; };
19151911
062072B62773A055001655D7 /* AsyncAwaitIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncAwaitIntegrationTests.swift; sourceTree = "<group>"; };
@@ -1923,6 +1919,7 @@
19231919
1235769122B7E915007DDFA9 /* EncodableFieldValueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncodableFieldValueTests.swift; sourceTree = "<group>"; };
19241920
1235769422B86E65007DDFA9 /* FirestoreEncoderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirestoreEncoderTests.swift; sourceTree = "<group>"; };
19251921
124C932B22C1642C00CA8C2D /* CodableIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableIntegrationTests.swift; sourceTree = "<group>"; };
1922+
128F2B002E254E2C0006327E /* QueryToPipelineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueryToPipelineTests.swift; sourceTree = "<group>"; };
19261923
1296CECD2DEE97EF007F8552 /* RealtimePipelineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealtimePipelineTests.swift; sourceTree = "<group>"; };
19271924
129A369928CA555B005AE7E2 /* FIRCountTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FIRCountTests.mm; sourceTree = "<group>"; };
19281925
12F4357299652983A615F886 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
@@ -2505,6 +2502,7 @@
25052502
59BF06E5A4988F9F949DD871 /* PipelineApiTests.swift */,
25062503
861684E49DAC993D153E60D0 /* PipelineTests.swift */,
25072504
621D620928F9CE7400D2FA26 /* QueryIntegrationTests.swift */,
2505+
128F2B002E254E2C0006327E /* QueryToPipelineTests.swift */,
25082506
1296CECD2DEE97EF007F8552 /* RealtimePipelineTests.swift */,
25092507
4D65F6E69993611D47DC8E7C /* SnapshotListenerSourceTests.swift */,
25102508
EFF22EA92C5060A4009A369B /* VectorIntegrationTests.swift */,
@@ -4984,6 +4982,7 @@
49844982
3D5F7AA7BB68529F47BE4B12 /* PipelineApiTests.swift in Sources */,
49854983
655F8647F57E5F2155DFF7B5 /* PipelineTests.swift in Sources */,
49864984
621D620C28F9CE7400D2FA26 /* QueryIntegrationTests.swift in Sources */,
4985+
128F2B022E254E2C0006327E /* QueryToPipelineTests.swift in Sources */,
49874986
1296CECF2DEE97F5007F8552 /* RealtimePipelineTests.swift in Sources */,
49884987
1CFBD4563960D8A20C4679A3 /* SnapshotListenerSourceTests.swift in Sources */,
49894988
EE4C4BE7F93366AE6368EE02 /* TestHelper.swift in Sources */,
@@ -5265,6 +5264,7 @@
52655264
DF6FBE5BBD578B0DD34CEFA1 /* PipelineApiTests.swift in Sources */,
52665265
C8C2B945D84DD98391145F3F /* PipelineTests.swift in Sources */,
52675266
621D620B28F9CE7400D2FA26 /* QueryIntegrationTests.swift in Sources */,
5267+
128F2B032E254E2C0006327E /* QueryToPipelineTests.swift in Sources */,
52685268
1296CECE2DEE97F5007F8552 /* RealtimePipelineTests.swift in Sources */,
52695269
A0BC30D482B0ABD1A3A24CDC /* SnapshotListenerSourceTests.swift in Sources */,
52705270
A78366DBE0BFDE42474A728A /* TestHelper.swift in Sources */,
@@ -5828,6 +5828,7 @@
58285828
BD74B0E1FC752236A7376BC3 /* PipelineApiTests.swift in Sources */,
58295829
E04CB0D580980748D5DC453F /* PipelineTests.swift in Sources */,
58305830
621D620A28F9CE7400D2FA26 /* QueryIntegrationTests.swift in Sources */,
5831+
128F2B012E254E2C0006327E /* QueryToPipelineTests.swift in Sources */,
58315832
1296CED02DEE97F5007F8552 /* RealtimePipelineTests.swift in Sources */,
58325833
B00F8D1819EE20C45B660940 /* SnapshotListenerSourceTests.swift in Sources */,
58335834
AD34726BFD3461FF64BBD56D /* TestHelper.swift in Sources */,

‎Firestore/Example/Tests/SpecTests/FSTSpecTests.mm‎

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -918,37 +918,49 @@ - (void)validateExpectedState:(nullable NSDictionary *)expectedState {
918918
}
919919
if (expectedState[@"activeTargets"]) {
920920
__block ActiveTargetMap expectedActiveTargets;
921-
[expectedState[@"activeTargets"] enumerateKeysAndObjectsUsingBlock:^(NSString *targetIDString,
922-
NSDictionary *queryData,
923-
BOOL *) {
924-
TargetId targetID = [targetIDString intValue];
925-
NSArray *queriesJson = queryData[@"queries"];
926-
std::vector<TargetData> queries;
927-
for (id queryJson in queriesJson) {
928-
core::QueryOrPipeline qop;
929-
Query query = [self parseQuery:queryJson];
930-
931-
QueryPurpose purpose = QueryPurpose::Listen;
932-
if ([queryData objectForKey:@"targetPurpose"] != nil) {
933-
purpose = [self parseQueryPurpose:queryData[@"targetPurpose"]];
934-
}
935-
936-
TargetData target_data(core::TargetOrPipeline(query.ToTarget()), targetID, 0, purpose);
937-
if ([queryData objectForKey:@"resumeToken"] != nil) {
938-
target_data = target_data.WithResumeToken(MakeResumeToken(queryData[@"resumeToken"]),
939-
SnapshotVersion::None());
940-
} else {
941-
target_data = target_data.WithResumeToken(ByteString(),
942-
[self parseVersion:queryData[@"readTime"]]);
943-
}
944-
945-
if ([queryData objectForKey:@"expectedCount"] != nil) {
946-
target_data = target_data.WithExpectedCount([queryData[@"expectedCount"] intValue]);
947-
}
948-
queries.push_back(std::move(target_data));
949-
}
950-
expectedActiveTargets[targetID] = std::move(queries);
951-
}];
921+
[expectedState[@"activeTargets"]
922+
enumerateKeysAndObjectsUsingBlock:^(NSString *targetIDString, NSDictionary *queryData,
923+
BOOL *) {
924+
TargetId targetID = [targetIDString intValue];
925+
NSArray *queriesJson = queryData[@"queries"];
926+
std::vector<TargetData> queries;
927+
for (id queryJson in queriesJson) {
928+
QueryPurpose purpose = QueryPurpose::Listen;
929+
if ([queryData objectForKey:@"targetPurpose"] != nil) {
930+
purpose = [self parseQueryPurpose:queryData[@"targetPurpose"]];
931+
}
932+
933+
core::TargetOrPipeline top;
934+
Query query = [self parseQuery:queryJson];
935+
936+
if (self->_convertToPipeline &&
937+
purpose != firebase::firestore::local::QueryPurpose::LimboResolution) {
938+
std::vector<std::shared_ptr<api::EvaluableStage>> stages =
939+
core::ToPipelineStages(query);
940+
auto serializer =
941+
absl::make_unique<remote::Serializer>(self.driver.databaseInfo.database_id());
942+
top = core::TargetOrPipeline(
943+
api::RealtimePipeline(std::move(stages), std::move(serializer)));
944+
} else {
945+
top = core::TargetOrPipeline(query.ToTarget());
946+
}
947+
948+
TargetData target_data(top, targetID, 0, purpose);
949+
if ([queryData objectForKey:@"resumeToken"] != nil) {
950+
target_data = target_data.WithResumeToken(
951+
MakeResumeToken(queryData[@"resumeToken"]), SnapshotVersion::None());
952+
} else {
953+
target_data = target_data.WithResumeToken(
954+
ByteString(), [self parseVersion:queryData[@"readTime"]]);
955+
}
956+
957+
if ([queryData objectForKey:@"expectedCount"] != nil) {
958+
target_data = target_data.WithExpectedCount([queryData[@"expectedCount"] intValue]);
959+
}
960+
queries.push_back(std::move(target_data));
961+
}
962+
expectedActiveTargets[targetID] = std::move(queries);
963+
}];
952964
[self.driver setExpectedActiveTargets:std::move(expectedActiveTargets)];
953965
}
954966
}
@@ -1058,12 +1070,12 @@ - (void)validateActiveTargets {
10581070
// XCTAssertEqualObjects(actualTargets[targetID], TargetData);
10591071
const TargetData &actual = found->second;
10601072
auto left = actual.target_or_pipeline();
1061-
auto left_p = left.IsPipeline();
10621073
auto right = targetData.target_or_pipeline();
1074+
auto left_p = left.IsPipeline();
10631075
auto right_p = right.IsPipeline();
1064-
XCTAssertEqual(actual.purpose(), targetData.purpose());
10651076
XCTAssertEqual(left_p, right_p);
10661077
XCTAssertEqual(left, right);
1078+
XCTAssertEqual(actual.purpose(), targetData.purpose());
10671079
XCTAssertEqual(actual.target_id(), targetData.target_id());
10681080
XCTAssertEqual(actual.snapshot_version(), targetData.snapshot_version());
10691081
XCTAssertEqual(actual.resume_token(), targetData.resume_token());

0 commit comments

Comments
 (0)