update firestore_test file

firebase · May 18, 2023 · 7639a73 · 7639a73
1 parent 158986f
commit 7639a73
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/firestore/integration_test_internal/src/firestore_test.cc b/firestore/integration_test_internal/src/firestore_test.cc
@@ -67,8 +67,8 @@ using ::testing::HasSubstr;
 
 class FirestoreTest : public FirestoreIntegrationTest {
  protected:
-  const std::string GetFirestoreDatabaseId(Firestore* firestore) {
-    return GetInternal(firestore)->database_name();
+  const std::string& GetFirestoreDatabaseId(Firestore* firestore) {
+    return GetInternal(firestore)->database_id().database_id();
   }
 };
 

diff --git a/firestore/src/android/firestore_android.h b/firestore/src/android/firestore_android.h
@@ -166,9 +166,7 @@ class FirestoreInternal {
     firestore_public_ = firestore_public;
   }
 
-  const model::DatabaseId& database_id() const {
-    return this->database_id();
-  }
+  const model::DatabaseId& database_id() const { return this->database_id(); }
 
   Firestore* firestore_public() { return firestore_public_; }
   const Firestore* firestore_public() const { return firestore_public_; }

diff --git a/firestore/src/common/firestore.cc b/firestore/src/common/firestore.cc
@@ -199,8 +199,8 @@ Firestore* Firestore::AddFirestoreToCache(Firestore* firestore,
     return nullptr;
   }
 
-  FirestoreMap::key_type key =
-      MakeKey(firestore->app(), firestore->internal_->database_id().database_id());
+  FirestoreMap::key_type key = MakeKey(
+      firestore->app(), firestore->internal_->database_id().database_id());
   FirestoreCache()->emplace(key, firestore);
   return firestore;
 }
@@ -381,7 +381,8 @@ Future<void> Firestore::EnableNetwork() {
 
 Future<void> Firestore::Terminate() {
   if (!internal_) return FailedFuture<void>();
-  FirestoreMap::key_type key = MakeKey(app(), internal_->database_id().database_id());
+  FirestoreMap::key_type key =
+      MakeKey(app(), internal_->database_id().database_id());
 
   FirestoreCache()->erase(key);
   return internal_->Terminate();