From a441190635d494f128cf02e07566ae2003af4e08 Mon Sep 17 00:00:00 2001 From: zxu Date: Tue, 6 Feb 2018 13:51:11 -0500 Subject: Implement Firestore DatabaseInfo and port both Database{Id,Info} C++ to the iOS code (#738) * implement Firestore DatabaseInfo in C++ * temporary stash changes; blocking on the massive renaming of .m to .mm * add database_info_test to project * finish port DatabaseId and fix style, modular fixing DatabaseInfo * port DatabaseInfo * remove FSTDatabase{ID,Info} and their tests from project * fix unit test * use namespace alias * use namespace alias, leftover * address more changes * refactoring to use raw pointer instead of value for property * address changes * remove self-> * fix style * remove the name suffix Alloc * fix a bug --- .../test/firebase/firestore/core/CMakeLists.txt | 1 + .../firebase/firestore/core/database_info_test.cc | 48 ++++++++++++++++++++++ .../firebase/firestore/model/database_id_test.cc | 2 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Firestore/core/test/firebase/firestore/core/database_info_test.cc (limited to 'Firestore/core/test') diff --git a/Firestore/core/test/firebase/firestore/core/CMakeLists.txt b/Firestore/core/test/firebase/firestore/core/CMakeLists.txt index 34993aa..5b4c55a 100644 --- a/Firestore/core/test/firebase/firestore/core/CMakeLists.txt +++ b/Firestore/core/test/firebase/firestore/core/CMakeLists.txt @@ -15,6 +15,7 @@ cc_test( firebase_firestore_core_test SOURCES + database_info_test.cc target_id_generator_test.cc DEPENDS firebase_firestore_core diff --git a/Firestore/core/test/firebase/firestore/core/database_info_test.cc b/Firestore/core/test/firebase/firestore/core/database_info_test.cc new file mode 100644 index 0000000..d865105 --- /dev/null +++ b/Firestore/core/test/firebase/firestore/core/database_info_test.cc @@ -0,0 +1,48 @@ +/* + * Copyright 2018 Google + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "Firestore/core/src/firebase/firestore/core/database_info.h" + +#include "gtest/gtest.h" + +namespace firebase { +namespace firestore { +namespace core { + +using firebase::firestore::model::DatabaseId; + +TEST(DatabaseInfo, Getter) { + DatabaseInfo info(DatabaseId("project id", "database id"), "key", + "http://host", true); + EXPECT_EQ(DatabaseId("project id", "database id"), info.database_id()); + EXPECT_EQ("key", info.persistence_key()); + EXPECT_EQ("http://host", info.host()); + EXPECT_TRUE(info.ssl_enabled()); +} + +TEST(DatabaseInfo, DefaultDatabase) { + DatabaseInfo info(DatabaseId("project id", DatabaseId::kDefaultDatabaseId), + "key", "http://host", false); + EXPECT_EQ("project id", info.database_id().project_id()); + EXPECT_EQ("(default)", info.database_id().database_id()); + EXPECT_EQ("key", info.persistence_key()); + EXPECT_EQ("http://host", info.host()); + EXPECT_FALSE(info.ssl_enabled()); +} + +} // namespace core +} // namespace firestore +} // namespace firebase diff --git a/Firestore/core/test/firebase/firestore/model/database_id_test.cc b/Firestore/core/test/firebase/firestore/model/database_id_test.cc index e9c9439..16b0e6b 100644 --- a/Firestore/core/test/firebase/firestore/model/database_id_test.cc +++ b/Firestore/core/test/firebase/firestore/model/database_id_test.cc @@ -32,7 +32,7 @@ TEST(DatabaseId, Constructor) { TEST(DatabaseId, DefaultDb) { DatabaseId id("p", DatabaseId::kDefaultDatabaseId); EXPECT_EQ("p", id.project_id()); - EXPECT_EQ(DatabaseId::kDefaultDatabaseId, id.database_id()); + EXPECT_EQ("(default)", id.database_id()); EXPECT_TRUE(id.IsDefaultDatabase()); } -- cgit v1.2.3