1 files changed, 21 insertions, 15 deletions
diff --git a/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.mm b/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.mm
index 53f0202..2cf530c 100644
--- a/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.mm
+++ b/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.mm
@@ -16,12 +16,18 @@
 
 #import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
 
+#include <set>
+
 #import <XCTest/XCTest.h>
 
 #import "Firestore/Source/Local/FSTReferenceSet.h"
 #import "Firestore/Source/Model/FSTDocumentKey.h"
 
-#import "Firestore/Example/Tests/Util/FSTHelpers.h"
+#include "Firestore/core/src/firebase/firestore/model/document_key.h"
+#include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
+
+namespace testutil = firebase::firestore::testutil;
+using firebase::firestore::model::DocumentKey;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -35,13 +41,13 @@ NS_ASSUME_NONNULL_BEGIN
   FSTReferenceSet *referenceSet = [[FSTReferenceSet alloc] init];
   [gc addGarbageSource:referenceSet];
 
-  FSTDocumentKey *key = FSTTestDocKey(@"foo/bar");
+  DocumentKey key = testutil::Key("foo/bar");
   [referenceSet addReferenceToKey:key forID:1];
-  FSTAssertEqualSets([gc collectGarbage], @[]);
+  XCTAssertEqual([gc collectGarbage], std::set<DocumentKey>({}));
   XCTAssertFalse([referenceSet isEmpty]);
 
   [referenceSet removeReferenceToKey:key forID:1];
-  FSTAssertEqualSets([gc collectGarbage], @[ key ]);
+  XCTAssertEqual([gc collectGarbage], std::set<DocumentKey>({key}));
   XCTAssertTrue([referenceSet isEmpty]);
 }
 
@@ -50,20 +56,20 @@ NS_ASSUME_NONNULL_BEGIN
   FSTReferenceSet *referenceSet = [[FSTReferenceSet alloc] init];
   [gc addGarbageSource:referenceSet];
 
-  FSTDocumentKey *key1 = FSTTestDocKey(@"foo/bar");
-  FSTDocumentKey *key2 = FSTTestDocKey(@"foo/baz");
-  FSTDocumentKey *key3 = FSTTestDocKey(@"foo/blah");
+  DocumentKey key1 = testutil::Key("foo/bar");
+  DocumentKey key2 = testutil::Key("foo/baz");
+  DocumentKey key3 = testutil::Key("foo/blah");
   [referenceSet addReferenceToKey:key1 forID:1];
   [referenceSet addReferenceToKey:key2 forID:1];
   [referenceSet addReferenceToKey:key3 forID:2];
   XCTAssertFalse([referenceSet isEmpty]);
 
   [referenceSet removeReferencesForID:1];
-  FSTAssertEqualSets([gc collectGarbage], (@[ key1, key2 ]));
+  XCTAssertEqual([gc collectGarbage], std::set<DocumentKey>({key1, key2}));
   XCTAssertFalse([referenceSet isEmpty]);
 
   [referenceSet removeReferencesForID:2];
-  FSTAssertEqualSets([gc collectGarbage], @[ key3 ]);
+  XCTAssertEqual([gc collectGarbage], std::set<DocumentKey>({key3}));
   XCTAssertTrue([referenceSet isEmpty]);
 }
 
@@ -77,12 +83,12 @@ NS_ASSUME_NONNULL_BEGIN
   [gc addGarbageSource:localViews];
   [gc addGarbageSource:mutations];
 
-  FSTDocumentKey *key1 = FSTTestDocKey(@"foo/bar");
+  DocumentKey key1 = testutil::Key("foo/bar");
   [remoteTargets addReferenceToKey:key1 forID:1];
   [localViews addReferenceToKey:key1 forID:1];
   [mutations addReferenceToKey:key1 forID:10];
 
-  FSTDocumentKey *key2 = FSTTestDocKey(@"foo/baz");
+  DocumentKey key2 = testutil::Key("foo/baz");
   [mutations addReferenceToKey:key2 forID:10];
 
   XCTAssertFalse([remoteTargets isEmpty]);
@@ -90,16 +96,16 @@ NS_ASSUME_NONNULL_BEGIN
   XCTAssertFalse([mutations isEmpty]);
 
   [localViews removeReferencesForID:1];
-  FSTAssertEqualSets([gc collectGarbage], @[]);
+  XCTAssertEqual([gc collectGarbage], std::set<DocumentKey>({}));
 
   [remoteTargets removeReferencesForID:1];
-  FSTAssertEqualSets([gc collectGarbage], @[]);
+  XCTAssertEqual([gc collectGarbage], std::set<DocumentKey>({}));
 
   [mutations removeReferenceToKey:key1 forID:10];
-  FSTAssertEqualSets([gc collectGarbage], @[ key1 ]);
+  XCTAssertEqual([gc collectGarbage], std::set<DocumentKey>({key1}));
 
   [mutations removeReferenceToKey:key2 forID:10];
-  FSTAssertEqualSets([gc collectGarbage], @[ key2 ]);
+  XCTAssertEqual([gc collectGarbage], std::set<DocumentKey>({key2}));
 
   XCTAssertTrue([remoteTargets isEmpty]);
   XCTAssertTrue([localViews isEmpty]);