Merge branch 'fix-more-flakes' of https://github.com/firebase/firebas…

…e-cpp-sdk into fix-more-flakes
firebase · Jan 22, 2024 · 56dc5e2 · 56dc5e2
2 parents aeb22f4 + af589ca
commit 56dc5e2
Show file tree

Hide file tree

Showing 18 changed files with 158 additions and 105 deletions.
diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -159,7 +159,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.7.0')
+      implementation platform('com.google.firebase:firebase-bom:32.7.1')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.7.0')
+  implementation platform('com.google.firebase:firebase-bom:32.7.1')
   implementation 'com.google.firebase:firebase-analytics'
 }
 

diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.7.0')
+  implementation platform('com.google.firebase:firebase-bom:32.7.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.3.0'
   implementation project(':app:app_resources')

diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.7.0')
+  implementation platform('com.google.firebase:firebase-bom:32.7.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-dynamic-links'
   implementation project(':app:app_resources')

diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.7.0')
+  implementation platform('com.google.firebase:firebase-bom:32.7.1')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 

diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.7.0')
+  implementation platform('com.google.firebase:firebase-bom:32.7.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')

diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json
@@ -1,5 +1,5 @@
 {
-  "released": "11.7.0",
-  "stable": "11.7.0",
-  "head": "11.7.0"
+  "released": "11.8.0",
+  "stable": "11.8.0",
+  "head": "11.8.0"
 }
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.7.0')
+  implementation platform('com.google.firebase:firebase-bom:32.7.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-database'
   //implementation project(':app:app_resources')

diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.7.0')
+  implementation platform('com.google.firebase:firebase-bom:32.7.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-firestore'
 }

diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.7.0')
+  implementation platform('com.google.firebase:firebase-bom:32.7.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-ads:22.6.0'
   implementation 'com.google.android.ump:user-messaging-platform:2.1.0'

diff --git a/gma/integration_test/src/integration_test.cc b/gma/integration_test/src/integration_test.cc
@@ -2599,6 +2599,8 @@ TEST_F(FirebaseGmaUmpTest, TestUmpRequestConsentInfoUpdate) {
   using firebase::gma::ump::ConsentRequestParameters;
   using firebase::gma::ump::ConsentStatus;
 
+  FLAKY_TEST_SECTION_BEGIN();
+
   ConsentRequestParameters params;
   params.tag_for_under_age_of_consent = false;
 
@@ -2607,7 +2609,13 @@ TEST_F(FirebaseGmaUmpTest, TestUmpRequestConsentInfoUpdate) {
 
   EXPECT_TRUE(future == consent_info_->RequestConsentInfoUpdateLastResult());
 
-  WaitForCompletion(future, "RequestConsentInfoUpdate");
+  WaitForCompletion(future, "RequestConsentInfoUpdate",
+                    {firebase::gma::ump::kConsentRequestSuccess,
+                     firebase::gma::ump::kConsentRequestErrorNetwork});
+  // Retry only network errors.
+  EXPECT_NE(future.error(), firebase::gma::ump::kConsentRequestErrorNetwork);
+
+  FLAKY_TEST_SECTION_END();
 
   EXPECT_NE(consent_info_->GetConsentStatus(),
             firebase::gma::ump::kConsentStatusUnknown);
@@ -2622,6 +2630,8 @@ TEST_F(FirebaseGmaUmpTest, TestUmpRequestConsentInfoUpdateDebugEEA) {
   using firebase::gma::ump::ConsentRequestParameters;
   using firebase::gma::ump::ConsentStatus;
 
+  FLAKY_TEST_SECTION_BEGIN();
+
   ConsentRequestParameters params;
   params.tag_for_under_age_of_consent = false;
   params.debug_settings.debug_geography =
@@ -2632,7 +2642,13 @@ TEST_F(FirebaseGmaUmpTest, TestUmpRequestConsentInfoUpdateDebugEEA) {
   firebase::Future<void> future =
       consent_info_->RequestConsentInfoUpdate(params);
 
-  WaitForCompletion(future, "RequestConsentInfoUpdate");
+  WaitForCompletion(future, "RequestConsentInfoUpdate",
+                    {firebase::gma::ump::kConsentRequestSuccess,
+                     firebase::gma::ump::kConsentRequestErrorNetwork});
+  // Retry only network errors.
+  EXPECT_NE(future.error(), firebase::gma::ump::kConsentRequestErrorNetwork);
+
+  FLAKY_TEST_SECTION_END();
 
   EXPECT_EQ(consent_info_->GetConsentStatus(),
             firebase::gma::ump::kConsentStatusRequired);
@@ -2643,6 +2659,8 @@ TEST_F(FirebaseGmaUmpTest, TestUmpRequestConsentInfoUpdateDebugNonEEA) {
   using firebase::gma::ump::ConsentRequestParameters;
   using firebase::gma::ump::ConsentStatus;
 
+  FLAKY_TEST_SECTION_BEGIN();
+
   ConsentRequestParameters params;
   params.tag_for_under_age_of_consent = false;
   params.debug_settings.debug_geography =
@@ -2653,7 +2671,13 @@ TEST_F(FirebaseGmaUmpTest, TestUmpRequestConsentInfoUpdateDebugNonEEA) {
   firebase::Future<void> future =
       consent_info_->RequestConsentInfoUpdate(params);
 
-  WaitForCompletion(future, "RequestConsentInfoUpdate");
+  WaitForCompletion(future, "RequestConsentInfoUpdate",
+                    {firebase::gma::ump::kConsentRequestSuccess,
+                     firebase::gma::ump::kConsentRequestErrorNetwork});
+  // Retry only network errors.
+  EXPECT_NE(future.error(), firebase::gma::ump::kConsentRequestErrorNetwork);
+
+  FLAKY_TEST_SECTION_END();
 
   EXPECT_THAT(consent_info_->GetConsentStatus(),
               AnyOf(Eq(firebase::gma::ump::kConsentStatusNotRequired),
@@ -2747,15 +2771,25 @@ TEST_F(FirebaseGmaUmpTest, TestUmpLoadFormUnderAgeOfConsent) {
   using firebase::gma::ump::ConsentRequestParameters;
   using firebase::gma::ump::ConsentStatus;
 
+  FLAKY_TEST_SECTION_BEGIN();
+
   ConsentRequestParameters params;
   params.tag_for_under_age_of_consent = true;
   params.debug_settings.debug_geography =
       firebase::gma::ump::kConsentDebugGeographyEEA;
   params.debug_settings.debug_device_ids = kTestDeviceIDs;
   params.debug_settings.debug_device_ids.push_back(GetDebugDeviceId());
 
-  WaitForCompletion(consent_info_->RequestConsentInfoUpdate(params),
-                    "RequestConsentInfoUpdate");
+  firebase::Future<void> future =
+      consent_info_->RequestConsentInfoUpdate(params);
+
+  WaitForCompletion(future, "RequestConsentInfoUpdate",
+                    {firebase::gma::ump::kConsentRequestSuccess,
+                     firebase::gma::ump::kConsentRequestErrorNetwork});
+  // Retry only network errors.
+  EXPECT_NE(future.error(), firebase::gma::ump::kConsentRequestErrorNetwork);
+
+  FLAKY_TEST_SECTION_END();
 
   firebase::Future<void> load_future = consent_info_->LoadConsentForm();
   WaitForCompletion(load_future, "LoadConsentForm",
@@ -2770,15 +2804,25 @@ TEST_F(FirebaseGmaUmpTest, TestUmpLoadFormUnavailableDebugNonEEA) {
   using firebase::gma::ump::ConsentRequestParameters;
   using firebase::gma::ump::ConsentStatus;
 
+  FLAKY_TEST_SECTION_BEGIN();
+
   ConsentRequestParameters params;
   params.tag_for_under_age_of_consent = false;
   params.debug_settings.debug_geography =
       firebase::gma::ump::kConsentDebugGeographyNonEEA;
   params.debug_settings.debug_device_ids = kTestDeviceIDs;
   params.debug_settings.debug_device_ids.push_back(GetDebugDeviceId());
 
-  WaitForCompletion(consent_info_->RequestConsentInfoUpdate(params),
-                    "RequestConsentInfoUpdate");
+  firebase::Future<void> future =
+      consent_info_->RequestConsentInfoUpdate(params);
+
+  WaitForCompletion(future, "RequestConsentInfoUpdate",
+                    {firebase::gma::ump::kConsentRequestSuccess,
+                     firebase::gma::ump::kConsentRequestErrorNetwork});
+  // Retry only network errors.
+  EXPECT_NE(future.error(), firebase::gma::ump::kConsentRequestErrorNetwork);
+
+  FLAKY_TEST_SECTION_END();
 
   if (consent_info_->GetConsentStatus() !=
       firebase::gma::ump::kConsentStatusRequired) {
@@ -2792,15 +2836,25 @@ TEST_F(FirebaseGmaUmpTest, TestUmpLoadAndShowIfRequiredDebugNonEEA) {
   using firebase::gma::ump::ConsentRequestParameters;
   using firebase::gma::ump::ConsentStatus;
 
+  FLAKY_TEST_SECTION_BEGIN();
+
   ConsentRequestParameters params;
   params.tag_for_under_age_of_consent = false;
   params.debug_settings.debug_geography =
       firebase::gma::ump::kConsentDebugGeographyNonEEA;
   params.debug_settings.debug_device_ids = kTestDeviceIDs;
   params.debug_settings.debug_device_ids.push_back(GetDebugDeviceId());
 
-  WaitForCompletion(consent_info_->RequestConsentInfoUpdate(params),
-                    "RequestConsentInfoUpdate");
+  firebase::Future<void> future =
+      consent_info_->RequestConsentInfoUpdate(params);
+
+  WaitForCompletion(future, "RequestConsentInfoUpdate",
+                    {firebase::gma::ump::kConsentRequestSuccess,
+                     firebase::gma::ump::kConsentRequestErrorNetwork});
+  // Retry only network errors.
+  EXPECT_NE(future.error(), firebase::gma::ump::kConsentRequestErrorNetwork);
+
+  FLAKY_TEST_SECTION_END();
 
   EXPECT_THAT(consent_info_->GetConsentStatus(),
               AnyOf(Eq(firebase::gma::ump::kConsentStatusNotRequired),
@@ -3024,7 +3078,7 @@ TEST_F(FirebaseGmaUmpTest, TestUmpCleanupRaceCondition) {
   ProcessEvents(5000);
 }
 
-TEST_F(FirebaseGmaUmpTest, TestUmpCallbacksOnWrongInstance_DISABLED) {
+TEST_F(FirebaseGmaUmpTest, TestUmpCallbacksOnWrongInstance) {
   // Ensure that if ConsentInfo is deleted and then recreated, stale
   // callbacks don't call into the new instance and cause crashes.
   using firebase::gma::ump::ConsentFormStatus;
@@ -3038,23 +3092,46 @@ TEST_F(FirebaseGmaUmpTest, TestUmpCallbacksOnWrongInstance_DISABLED) {
   params.debug_settings.debug_device_ids = kTestDeviceIDs;
   params.debug_settings.debug_device_ids.push_back(GetDebugDeviceId());
 
-  consent_info_->RequestConsentInfoUpdate(params);
-  consent_info_->LoadConsentForm();
+  LogDebug("RequestConsentInfoUpdate");
+  consent_info_->RequestConsentInfoUpdate(params).OnCompletion(
+      [](const firebase::Future<void>&) {
+        LogDebug("RequestConsentInfoUpdate done");
+      });
+  LogDebug("LoadConsentForm");
+  consent_info_->LoadConsentForm().OnCompletion(
+      [](const firebase::Future<void>&) { LogDebug("LoadConsentForm done"); });
   // In automated tests, only check RequestConsentInfoUpdate and LoadConsentForm
   // as the rest may show UI.
   if (ShouldRunUITests()) {
-    consent_info_->ShowConsentForm(app_framework::GetWindowController());
-    consent_info_->LoadAndShowConsentFormIfRequired(
-        app_framework::GetWindowController());
-    consent_info_->ShowPrivacyOptionsForm(app_framework::GetWindowController());
+    LogDebug("ShowConsentForm");
+    consent_info_->ShowConsentForm(app_framework::GetWindowController())
+        .OnCompletion([](const firebase::Future<void>&) {
+          LogDebug("ShowConsentForm done");
+        });
+    LogDebug("LoadAndShowConsentFormIfRequired");
+    consent_info_
+        ->LoadAndShowConsentFormIfRequired(app_framework::GetWindowController())
+        .OnCompletion([](const firebase::Future<void>&) {
+          LogDebug("LoadAndShowConsentFormIfRequired done");
+        });
+    LogDebug("ShowPrivacyOptionsForm");
+    consent_info_->ShowPrivacyOptionsForm(app_framework::GetWindowController())
+        .OnCompletion([](const firebase::Future<void>&) {
+          LogDebug("ShowPrivacyOptionsForm done");
+        });
   }
 
+  LogDebug("Terminate");
   TerminateUmp(kNoReset);
 
+  LogDebug("Initialize");
   InitializeUmp(kNoReset);
 
   // Give the operations time to complete.
+  LogDebug("Wait");
   ProcessEvents(5000);
+
+  LogDebug("Done");
 }
 
 TEST_F(FirebaseGmaUmpTest, TestUmpMethodsReturnOperationInProgress) {
@@ -3086,7 +3163,9 @@ TEST_F(FirebaseGmaUmpTest, TestUmpMethodsReturnOperationInProgress) {
   WaitForCompletion(
       future_request_2, "RequestConsentInfoUpdate second",
       firebase::gma::ump::kConsentRequestErrorOperationInProgress);
-  WaitForCompletion(future_request_1, "RequestConsentInfoUpdate first");
+  WaitForCompletion(future_request_1, "RequestConsentInfoUpdate first",
+                    {firebase::gma::ump::kConsentRequestSuccess,
+                     firebase::gma::ump::kConsentRequestErrorNetwork});
 
   consent_info_->Reset();