Port FSTDocumentKeySet to C++ DocumentKeySet (#1229)

* Define a Comparator for DocumentKey

* Automated migration from FSTDocumentKeySet to DocumentKeySet

* Manual fixups for DocumentKeySet

* Delete FSTDocumentKeySet

1 files changed, 7 insertions, 4 deletions

diff --git a/Firestore/Example/Tests/SpecTests/FSTSpecTests.mm b/Firestore/Example/Tests/SpecTests/FSTSpecTests.mm
index 12be590..5a7cb72 100644
--- a/Firestore/Example/Tests/SpecTests/FSTSpecTests.mm
+++ b/Firestore/Example/Tests/SpecTests/FSTSpecTests.mm
@@ -603,10 +603,13 @@ static NSString *const kNoIOSTag = @"no-ios";
     // XCTAssertEqualObjects(actualTargets[targetID], queryData);
 
     FSTQueryData *actual = actualTargets[targetID];
-    XCTAssertEqualObjects(actual.query, queryData.query);
-    XCTAssertEqual(actual.targetID, queryData.targetID);
-    XCTAssertEqual(actual.snapshotVersion, queryData.snapshotVersion);
-    XCTAssertEqualObjects(actual.resumeToken, queryData.resumeToken);
+    XCTAssertNotNil(actual);
+    if (actual) {
+      XCTAssertEqualObjects(actual.query, queryData.query);
+      XCTAssertEqual(actual.targetID, queryData.targetID);
+      XCTAssertEqual(actual.snapshotVersion, queryData.snapshotVersion);
+      XCTAssertEqualObjects(actual.resumeToken, queryData.resumeToken);
+    }
 
     [actualTargets removeObjectForKey:targetID];
   }];