From a080e481b5e6fcbc2b645920051cf20fc8cad7a7 Mon Sep 17 00:00:00 2001 From: Gil Date: Sat, 5 May 2018 08:10:51 -0700 Subject: Port FSTDocumentKeySet to C++ DocumentKeySet (#1229) * Define a Comparator for DocumentKey * Automated migration from FSTDocumentKeySet to DocumentKeySet * Manual fixups for DocumentKeySet * Delete FSTDocumentKeySet --- .../firebase/firestore/model/document_key_test.cc | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'Firestore/core/test') diff --git a/Firestore/core/test/firebase/firestore/model/document_key_test.cc b/Firestore/core/test/firebase/firestore/model/document_key_test.cc index 619ee7f..71b78d1 100644 --- a/Firestore/core/test/firebase/firestore/model/document_key_test.cc +++ b/Firestore/core/test/firebase/firestore/model/document_key_test.cc @@ -21,8 +21,11 @@ #include "Firestore/core/src/firebase/firestore/model/document_key.h" #include "Firestore/core/src/firebase/firestore/model/resource_path.h" +#include "Firestore/core/test/firebase/firestore/testutil/testutil.h" #include "gtest/gtest.h" +using firebase::firestore::testutil::Key; + namespace firebase { namespace firestore { namespace model { @@ -112,16 +115,16 @@ TEST(DocumentKey, IsDocumentKey) { } TEST(DocumentKey, Comparison) { - const DocumentKey abcd({"a", "b", "c", "d"}); - const DocumentKey abcd_too({"a", "b", "c", "d"}); - const DocumentKey xyzw({"x", "y", "z", "w"}); + DocumentKey abcd = Key("a/b/c/d"); + DocumentKey abcd_too = Key("a/b/c/d"); + DocumentKey xyzw = Key("x/y/z/w"); EXPECT_EQ(abcd, abcd_too); EXPECT_NE(abcd, xyzw); - const DocumentKey empty; - const DocumentKey a({"a", "a"}); - const DocumentKey b({"b", "b"}); - const DocumentKey ab({"a", "a", "b", "b"}); + DocumentKey empty; + DocumentKey a = Key("a/a"); + DocumentKey b = Key("b/b"); + DocumentKey ab = Key("a/a/b/b"); EXPECT_FALSE(empty < empty); EXPECT_TRUE(empty <= empty); @@ -148,6 +151,12 @@ TEST(DocumentKey, Comparison) { EXPECT_TRUE(ab >= a); } +TEST(DocumentKey, Comparator) { + DocumentKey abcd = Key("a/b/c/d"); + DocumentKey xyzw = Key("x/y/z/w"); + EXPECT_TRUE(util::Comparator{}(abcd, xyzw)); +} + } // namespace model } // namespace firestore } // namespace firebase -- cgit v1.2.3