From c9627af54b2223267facdbf4c33c12c9f948aacb Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 18 Mar 2021 11:08:13 -0400 Subject: [PATCH] Port cl/361880889: Uncomment RestartFirestoreLeadsToNewInstance for Android now that auth is a soft dependency --- firestore/src/tests/firestore_test.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/firestore/src/tests/firestore_test.cc b/firestore/src/tests/firestore_test.cc index 0a8e396399..a7e9fc78c4 100644 --- a/firestore/src/tests/firestore_test.cc +++ b/firestore/src/tests/firestore_test.cc @@ -1263,8 +1263,6 @@ TEST_F(FirestoreIntegrationTest, MaintainsPersistenceAfterRestarting) { EXPECT_TRUE(snap->exists()); } -// TODO(b/173730469) Enable this test on Android once the Auth issue is fixed. -#if !defined(__ANDROID__) TEST_F(FirestoreIntegrationTest, RestartFirestoreLeadsToNewInstance) { // Get App and Settings objects to use in the test. Firestore* db_template = TestFirestore("restart_firestore_new_instance_test"); @@ -1272,15 +1270,9 @@ TEST_F(FirestoreIntegrationTest, RestartFirestoreLeadsToNewInstance) { Settings settings = db_template->settings(); DeleteFirestore(db_template); - // Get the Auth object so that it can be explicitly deleted to avoid a leak. - // This memory leak avoidance hack can be removed once Auth becomes a soft - // dependency (b/147772264). - InitResult init_result; - Auth* auth = Auth::GetAuth(app, &init_result); - ASSERT_EQ(kInitResultSuccess, init_result); - // Verify that GetInstance() returns the same instance when specified the same // App. + InitResult init_result; Firestore* db1 = Firestore::GetInstance(app, &init_result); ASSERT_EQ(kInitResultSuccess, init_result); Firestore* db1_copy = Firestore::GetInstance(app, &init_result); @@ -1312,9 +1304,7 @@ TEST_F(FirestoreIntegrationTest, RestartFirestoreLeadsToNewInstance) { delete db2; delete db1; - delete auth; } -#endif // if !defined(__ANDROID__) TEST_F(FirestoreIntegrationTest, CanStopListeningAfterTerminate) { auto instance = TestFirestore();