Automated g4 rollback of changelist 326267389.

*** Reason for rollback ***

Roll forward cl/325229850: Improve the tests for ClearPersistence() to use the default Firebase app instead of a custom one.

I've added a workaround for the broken test, a call to Terminate() in Android, and created b/168628900 to track the underlying bug.

*** Original change description ***

Automated g4 rollback of changelist 325229850.

*** Reason for rollback ***

firestore_test_android appears to have been broken by this change (b/163526671).

*** Original change description ***

Improve the tests for ClearPersistence() to use the default Firebase app instead of a custom one.

This fixes a concern raised by @pengzk in cl/309775646 that the Firestore* pointers were leaking. By using the default Firestore object retrieved via firestore() instead of a custom Firestore object return...

***

PiperOrigin-RevId: 331991549

Author: Googler

firestore/src/tests/firestore_test.cc

@@ -1311,59 +1311,85 @@ TEST_F(FirestoreIntegrationTest,
   EXPECT_EQ(await_pending_writes.status(), FutureStatus::kFutureStatusComplete);
 }
 
-TEST_F(FirestoreIntegrationTest, CanClearPersistenceAfterRestarting) {
-  Firestore* db = CreateFirestore();
-  App* app = db->app();
-  std::string app_name = app->name();
+TEST_F(FirestoreIntegrationTest, CanClearPersistenceTestHarnessVerification) {
+  // Verify that firestore() and DeleteFirestore() behave how we expect;
+  // otherwise, the tests for ClearPersistence() could yield false positives.
+  Firestore* db = firestore();
+  const std::string app_name = db->app()->name();
+  DocumentReference document = db->Collection("a").Document();
+  const std::string path = document.path();
+  WriteDocument(document, MapFieldValue{{"foo", FieldValue::Integer(42)}});
+  DeleteFirestore();
 
+  Firestore* db_2 = CachedFirestore(app_name);
+  DocumentReference document_2 = db_2->Document(path);
+  Future<DocumentSnapshot> get_future = document_2.Get(Source::kCache);
+  DocumentSnapshot snapshot_2 = *Await(get_future);
+  EXPECT_THAT(
+      snapshot_2.GetData(),
+      testing::ContainerEq(MapFieldValue{{"foo", FieldValue::Integer(42)}}));
+}
+
+TEST_F(FirestoreIntegrationTest, CanClearPersistenceAfterRestarting) {
+  Firestore* db = firestore();
+  const std::string app_name = db->app()->name();
   DocumentReference document = db->Collection("a").Document("b");
-  std::string path = document.path();
+  const std::string path = document.path();
   WriteDocument(document, MapFieldValue{{"foo", FieldValue::Integer(42)}});
 
-  // ClearPersistence() requires Firestore to be terminated. Delete the app and
-  // the Firestore instance to emulate the way an end user would do this.
+  // Call ClearPersistence(), but call Terminate() first because
+  // ClearPersistence() requires Firestore to be terminated.
   EXPECT_THAT(db->Terminate(), FutureSucceeds());
   EXPECT_THAT(db->ClearPersistence(), FutureSucceeds());
-  Release(db);
+  // Call DeleteFirestore() to ensure that both the App and Firestore instances
+  // are deleted, which emulates the way an end user would experience their
+  // application being killed and later re-launched by the user.
+  DeleteFirestore();
 
   // We restart the app with the same name and options to check that the
   // previous instance's persistent storage is actually cleared after the
-  // restart. Calling firestore() here would create a new instance of firestore,
-  // which defeats the purpose of this test.
-  Firestore* db_2 = CreateFirestore(app_name);
+  // restart. Although calling firestore() here would do the same thing, we
+  // use CachedFirestore() to be explicit about getting a new Firestore instance
+  // for the same Firebase app.
+  Firestore* db_2 = CachedFirestore(app_name);
   DocumentReference document_2 = db_2->Document(path);
   Future<DocumentSnapshot> await_get = document_2.Get(Source::kCache);
   Await(await_get);
   EXPECT_EQ(await_get.status(), FutureStatus::kFutureStatusComplete);
   EXPECT_EQ(await_get.error(), Error::kErrorUnavailable);
-  Release(db_2);
 }
 
 TEST_F(FirestoreIntegrationTest, CanClearPersistenceOnANewFirestoreInstance) {
-  Firestore* db = CreateFirestore();
-  App* app = db->app();
-  std::string app_name = app->name();
-
+  Firestore* db = firestore();
+  const std::string app_name = db->app()->name();
   DocumentReference document = db->Collection("a").Document("b");
-  std::string path = document.path();
+  const std::string path = document.path();
   WriteDocument(document, MapFieldValue{{"foo", FieldValue::Integer(42)}});
 
+  #if defined(__ANDROID__)
+  // TODO(b/168628900) Remove this call to Terminate() once deleting the
+  // Firestore* instance removes the underlying Java object from the instance
+  // cache in Android.
   EXPECT_THAT(db->Terminate(), FutureSucceeds());
-  delete db;
-  delete app;
+  #endif
+
+  // Call DeleteFirestore() to ensure that both the App and Firestore instances
+  // are deleted, which emulates the way an end user would experience their
+  // application being killed and later re-launched by the user.
+  DeleteFirestore();
 
   // We restart the app with the same name and options to check that the
   // previous instance's persistent storage is actually cleared after the
-  // restart. Calling firestore() here would create a new instance of firestore,
-  // which defeats the purpose of this test.
-  Firestore* db_2 = CreateFirestore(app_name);
+  // restart. Although calling firestore() here would do the same thing, we
+  // use CachedFirestore() to be explicit about getting a new Firestore instance
+  // for the same Firebase app.
+  Firestore* db_2 = CachedFirestore(app_name);
   EXPECT_THAT(db_2->ClearPersistence(), FutureSucceeds());
   DocumentReference document_2 = db_2->Document(path);
   Future<DocumentSnapshot> await_get = document_2.Get(Source::kCache);
   Await(await_get);
   EXPECT_EQ(await_get.status(), FutureStatus::kFutureStatusComplete);
   EXPECT_EQ(await_get.error(), Error::kErrorUnavailable);
-  Release(db_2);
 }
 
 TEST_F(FirestoreIntegrationTest, ClearPersistenceWhileRunningFails) {