Update FirestoreCache key type

firestore/integration_test_internal/src/firestore_integration_test.cc

@@ -116,11 +116,19 @@ Firestore* FirestoreIntegrationTest::TestFirestore(
   return TestFirestoreWithProjectId(name, /*project_id=*/"");
 }
 
+Firestore* FirestoreIntegrationTest::TestFirestoreWithDatabaseId(
+    const std::string& name, const std::string& database_id) const {
+  return TestFirestoreWithProjectId(name, /*project_id=*/"", database_id);
+}
+
 Firestore* FirestoreIntegrationTest::TestFirestoreWithProjectId(
-    const std::string& name, const std::string& project_id) const {
+    const std::string& name,
+    const std::string& project_id,
+    const std::string& database_id) const {
   for (const auto& entry : firestores_) {
     const FirestoreInfo& firestore_info = entry.second;
-    if (firestore_info.name() == name) {
+    if (firestore_info.name() == name &&
+        firestore_info.database_id() == database_id) {
       return firestore_info.firestore();
     }
   }
@@ -129,9 +137,9 @@ Firestore* FirestoreIntegrationTest::TestFirestoreWithProjectId(
   if (apps_.find(app) == apps_.end()) {
     apps_[app] = std::unique_ptr<App>(app);
   }
-
-  Firestore* db = new Firestore(CreateTestFirestoreInternal(app));
-  firestores_[db] = FirestoreInfo(name, std::unique_ptr<Firestore>(db));
+  Firestore* db = new Firestore(CreateTestFirestoreInternal(app, database_id));
+  firestores_[db] =
+      FirestoreInfo(name, database_id, std::unique_ptr<Firestore>(db));
 
   firestore::LocateEmulator(db);
   return db;

firestore/integration_test_internal/src/firestore_integration_test.h

@@ -49,7 +49,8 @@ const int kCheckIntervalMillis = 100;
 // The timeout of waiting for a Future or a listener.
 const int kTimeOutMillis = 15000;
 
-FirestoreInternal* CreateTestFirestoreInternal(App* app);
+FirestoreInternal* CreateTestFirestoreInternal(
+    App* app, const std::string& database_id = kDefaultDatabase);
 
 App* GetApp();
 App* GetApp(const char* name, const std::string& override_project_id);
@@ -253,8 +254,15 @@ class FirestoreIntegrationTest : public testing::Test {
 
   // Returns a Firestore instance for an app with the given `name`, associated
   // with the database with the given `project_id`.
-  Firestore* TestFirestoreWithProjectId(const std::string& name,
-                                        const std::string& project_id) const;
+  Firestore* TestFirestoreWithProjectId(
+      const std::string& name,
+      const std::string& project_id,
+      const std::string& database_id = kDefaultDatabase) const;
+
+  // Returns a Firestore instance for an app with the given `name`, associated
+  // with the database with the given `database_id`.
+  Firestore* TestFirestoreWithDatabaseId(const std::string& name,
+                                         const std::string& database_id) const;
 
   // Deletes the given `Firestore` instance, which must have been returned by a
   // previous invocation of `TestFirestore()`, and removes it from the cache of
@@ -419,15 +427,22 @@ class FirestoreIntegrationTest : public testing::Test {
   class FirestoreInfo {
    public:
     FirestoreInfo() = default;
-    FirestoreInfo(const std::string& name, std::unique_ptr<Firestore> firestore)
-        : name_(name), firestore_(std::move(firestore)) {}
+    FirestoreInfo(const std::string& name,
+                  const std::string& database_id,
+                  std::unique_ptr<Firestore> firestore)
+        : name_(name),
+          database_id_(database_id),
+          firestore_(std::move(firestore)) {}
 
     const std::string& name() const { return name_; }
     Firestore* firestore() const { return firestore_.get(); }
+    const std::string& database_id() const { return database_id_; }
+
     void ReleaseFirestore() { firestore_.release(); }
 
    private:
     std::string name_;
+    std::string database_id_;
     std::unique_ptr<Firestore> firestore_;
   };