Merge branch 'dev' into bugfix/integration-tests-mac-openssl-error

vimanyu · web-flow · commit 31e40b2215f1 · 2021-01-27T22:28:58.000Z
diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile
@@ -1,10 +1,10 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase AdMob test application.
 
 target 'integration_test' do
-  pod 'Firebase/AdMob', '6.24.0'
+  pod 'Firebase/AdMob', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile
@@ -1,10 +1,10 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Analytics test application.
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '6.24.0'
+  pod 'Firebase/Analytics', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile
@@ -1,10 +1,10 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase App test application.
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '6.24.0'
+  pod 'Firebase/Analytics', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile
@@ -1,10 +1,10 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Auth test application.
 
 target 'integration_test' do
-  pod 'Firebase/Auth', '6.24.0'
+  pod 'Firebase/Auth', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile
@@ -1,11 +1,11 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Realtime Database test application.
 
 target 'integration_test' do
-  pod 'Firebase/Database', '6.24.0'
-  pod 'Firebase/Auth', '6.24.0'
+  pod 'Firebase/Database', '7.0.0'
+  pod 'Firebase/Auth', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/database/integration_test/src/integration_test.cc b/database/integration_test/src/integration_test.cc
@@ -137,6 +137,8 @@ class FirebaseDatabaseTest : public FirebaseTest {
   // Sign in an anonymous user.
   static void SignIn();
   // Sign out the current user, if applicable.
+  // If this is an anonymous user, deletes the user instead,
+  // to avoid polluting the user list.
   static void SignOut();
 
   // Initialize Firebase Database.
@@ -341,12 +343,19 @@ void FirebaseDatabaseTest::SignOut() {
     // Already signed out.
     return;
   }
-
-  shared_auth_->SignOut();
-
-  // Wait for the sign-out to finish.
-  while (shared_auth_->current_user() != nullptr) {
-    if (ProcessEvents(100)) break;
+  if (shared_auth_->current_user()->is_anonymous()) {
+    // If signed in anonymously, delete the anonymous user.
+    WaitForCompletion(shared_auth_->current_user()->Delete(), "DeleteAnonymousUser");
+  }
+  else {
+    // If not signed in anonymously (e.g. if the tests were modified to sign in
+    // as an actual user), just sign out normally.
+    shared_auth_->SignOut();
+
+    // Wait for the sign-out to finish.
+    while (shared_auth_->current_user() != nullptr) {
+      if (ProcessEvents(100)) break;
+    }
   }
   EXPECT_EQ(shared_auth_->current_user(), nullptr);
 }
@@ -1180,16 +1189,22 @@ TEST_F(FirebaseDatabaseTest, TestInfoConnected) {
   }
   LogDebug("Disconnecting...");
   database_->GoOffline();
+  // Pause a moment to give the SDK time to realize we are disconnected.
+  ProcessEvents(1000);
   {
     auto disconnected = info.GetValue();
     WaitForCompletion(disconnected, "GetValue 3");
     EXPECT_EQ(disconnected.result()->value(), false);
   }
   LogDebug("Reconnecting...");
   database_->GoOnline();
+  // Pause a moment to give the SDK time to realize we are reconnected.
   ProcessEvents(1000);
   // Force getting a value so that we reconnect to the database.
   WaitForCompletion(ref.GetValue(), "GetValue 4 [ignored]");
+  // Pause another moment to REALLY give the SDK time to realize we are
+  // reconnected.
+  ProcessEvents(1000);
   {
     auto reconnected = info.GetValue();
     WaitForCompletion(reconnected, "GetValue 5");
diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile
@@ -1,10 +1,10 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Dynamic Links test application.
 
 target 'integration_test' do
-  pod 'Firebase/DynamicLinks', '6.24.0'
+  pod 'Firebase/DynamicLinks', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile
@@ -1,11 +1,11 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Realtime Firestore test application.
 
 target 'integration_test' do
-  pod 'Firebase/Firestore', '6.32.2'
-  pod 'Firebase/Auth', '6.32.2'
+  pod 'Firebase/Firestore', '7.0.0'
+  pod 'Firebase/Auth', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/firestore/integration_test/src/integration_test.cc b/firestore/integration_test/src/integration_test.cc
@@ -76,6 +76,8 @@ class FirebaseFirestoreBasicTest : public FirebaseTest {
   // Sign in an anonymous user.
   static void SignIn();
   // Sign out the current user, if applicable.
+  // If this is an anonymous user, deletes the user instead,
+  // to avoid polluting the user list.
   static void SignOut();
 
   // Initialize Firestore.
@@ -282,11 +284,19 @@ void FirebaseFirestoreBasicTest::SignOut() {
     return;
   }
 
-  shared_auth_->SignOut();
-
-  // Wait for the sign-out to finish.
-  while (shared_auth_->current_user() != nullptr) {
-    if (ProcessEvents(100)) break;
+  if (shared_auth_->current_user()->is_anonymous()) {
+    // If signed in anonymously, delete the anonymous user.
+    WaitForCompletion(shared_auth_->current_user()->Delete(), "DeleteAnonymousUser");
+  }
+  else {
+    // If not signed in anonymously (e.g. if the tests were modified to sign in
+    // as an actual user), just sign out normally.
+    shared_auth_->SignOut();
+
+    // Wait for the sign-out to finish.
+    while (shared_auth_->current_user() != nullptr) {
+      if (ProcessEvents(100)) break;
+    }
   }
   EXPECT_EQ(shared_auth_->current_user(), nullptr);
 }
diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile
@@ -1,11 +1,11 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Cloud Functions for Firebase test application.
 
 target 'integration_test' do
-  pod 'Firebase/Functions', '6.24.0'
-  pod 'Firebase/Auth', '6.24.0'
+  pod 'Firebase/Functions', '7.0.0'
+  pod 'Firebase/Auth', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile
@@ -1,6 +1,6 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Installations test application.
 
 target 'integration_test' do
diff --git a/instance_id/integration_test/Podfile b/instance_id/integration_test/Podfile
@@ -1,11 +1,11 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Instance ID test application.
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '6.24.0'
-  pod 'FirebaseInstanceID', '4.3.4'
+  pod 'Firebase/Analytics', '7.0.0'
+  pod 'FirebaseInstanceID', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile
@@ -1,10 +1,10 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Cloud Messaging test application.
 
 target 'integration_test' do
-  pod 'Firebase/Messaging', '6.24.0'
+  pod 'Firebase/Messaging', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile
@@ -1,10 +1,10 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Firebase Remote Config test application.
 
 target 'integration_test' do
-  pod 'Firebase/RemoteConfig', '6.24.0'
+  pod 'Firebase/RemoteConfig', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile
@@ -1,11 +1,11 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 # Cloud Storage for Firebase test application.
 
 target 'integration_test' do
-  pod 'Firebase/Storage', '6.24.0'
-  pod 'Firebase/Auth', '6.24.0'
+  pod 'Firebase/Storage', '7.0.0'
+  pod 'Firebase/Auth', '7.0.0'
 end
 
 post_install do |installer|
diff --git a/storage/integration_test/src/integration_test.cc b/storage/integration_test/src/integration_test.cc
@@ -87,6 +87,8 @@ class FirebaseStorageTest : public FirebaseTest {
   // Sign in an anonymous user.
   static void SignIn();
   // Sign out the current user, if applicable.
+  // If this is an anonymous user, deletes the user instead,
+  // to avoid polluting the user list.
   static void SignOut();
 
   // Initialize Firebase Storage.
@@ -279,10 +281,19 @@ void FirebaseStorageTest::SignOut() {
     // Already signed out.
     return;
   }
-  shared_auth_->SignOut();
-  // Wait for the sign-out to finish.
-  while (shared_auth_->current_user() != nullptr) {
-    if (ProcessEvents(100)) break;
+  if (shared_auth_->current_user()->is_anonymous()) {
+    // If signed in anonymously, delete the anonymous user.
+    WaitForCompletion(shared_auth_->current_user()->Delete(), "DeleteAnonymousUser");
+  }
+  else {
+    // If not signed in anonymously (e.g. if the tests were modified to sign in
+    // as an actual user), just sign out normally.
+    shared_auth_->SignOut();
+
+    // Wait for the sign-out to finish.
+    while (shared_auth_->current_user() != nullptr) {
+      if (ProcessEvents(100)) break;
+    }
   }
   EXPECT_EQ(shared_auth_->current_user(), nullptr);
 }
diff --git a/testing/sample_framework/src/desktop/desktop_app_framework.cc b/testing/sample_framework/src/desktop/desktop_app_framework.cc
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <cstring>
 #include <iostream>
+#include <mutex>
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -95,7 +96,7 @@ std::string PathForResource() {
   return std::string();
 }
 void LogMessageV(bool suppress, const char* format, va_list list) {
-  // Save the log to the g_full_logs list regardless of whether it should be
+  // Save the log to the Full Logs list regardless of whether it should be
   // suppressed.
   static const int kLineBufferSize = 1024;
   char buffer[kLineBufferSize + 2];
@@ -122,20 +123,27 @@ void LogMessage(const char* format, ...) {
 
 static bool g_save_full_log = false;
 static std::vector<std::string> g_full_logs;  // NOLINT
+static std::mutex g_full_log_mutex;
 
-void AddToFullLog(const char* str) { g_full_logs.push_back(std::string(str)); }
+void AddToFullLog(const char* str) {
+  std::lock_guard<std::mutex> guard(g_full_log_mutex);
+  g_full_logs.push_back(std::string(str)); }
 
 bool GetPreserveFullLog() { return g_save_full_log; }
 void SetPreserveFullLog(bool b) { g_save_full_log = b; }
 
-void ClearFullLog() { g_full_logs.clear(); }
+void ClearFullLog() {
+  std::lock_guard<std::mutex> guard(g_full_log_mutex);
+  g_full_logs.clear();
+}
 
 void OutputFullLog() {
+  std::lock_guard<std::mutex> guard(g_full_log_mutex);
   for (int i = 0; i < g_full_logs.size(); ++i) {
     fputs(g_full_logs[i].c_str(), stdout);
   }
   fflush(stdout);
-  ClearFullLog();
+  g_full_logs.clear();
 }
 
 WindowContext GetWindowContext() { return nullptr; }
