Merge branch 'master' into firestore-api-changes

Author: schmidt-sebastian

CMakeLists.txt

@@ -27,4 +27,5 @@ set(FIREBASE_DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/.downloads")
 enable_testing()
 
 include(external/googletest)
+include(external/abseil-cpp)
 include(external/firestore)

Example/Auth/Tests/FIRAuthAPNSTokenManagerTests.m

@@ -31,7 +31,7 @@
     @brief The test expectation timeout.
     @remarks This must be considerably greater than @c kVerificationTimeout .
  */
-static const NSTimeInterval kExpectationTimeout = 1;
+static const NSTimeInterval kExpectationTimeout = 2;
 
 /** @class FIRAuthLegacyUIApplication
     @brief A fake legacy (< iOS 7) UIApplication class.

Example/Auth/Tests/FIRAuthDispatcherTests.m

@@ -32,7 +32,7 @@
 /** @var kExpectationTimeout
     @brief The maximum time waiting for expectations to fulfill.
  */
-static const NSTimeInterval kExpectationTimeout = 1;
+static const NSTimeInterval kExpectationTimeout = 2;
 
 id<OS_dispatch_queue> testWorkQueue;
 

Example/Auth/Tests/FIRAuthTests.m

@@ -170,7 +170,7 @@
 /** @var kExpectationTimeout
     @brief The maximum time waiting for expectations to fulfill.
  */
-static const NSTimeInterval kExpectationTimeout = 1;
+static const NSTimeInterval kExpectationTimeout = 2;
 
 /** @var kWaitInterval
     @brief The time waiting for background tasks to finish before continue when necessary.

Example/Auth/Tests/FIRAuthURLPresenterTests.m

@@ -26,7 +26,7 @@
 /** @var kExpectationTimeout
     @brief The maximum time waiting for expectations to fulfill.
  */
-static NSTimeInterval kExpectationTimeout = 1;
+static NSTimeInterval kExpectationTimeout = 2;
 
 @interface FIRAuthDefaultUIDelegate : NSObject <FIRAuthUIDelegate>
 /** @fn defaultUIDelegate

Example/Auth/Tests/FIRPhoneAuthProviderTests.m

@@ -180,7 +180,7 @@
 /** @var kExpectationTimeout
     @brief The maximum time waiting for expectations to fulfill.
  */
-static const NSTimeInterval kExpectationTimeout = 1;
+static const NSTimeInterval kExpectationTimeout = 2;
 
 /** @class FIRPhoneAuthProviderTests
     @brief Tests for @c FIRPhoneAuthProvider

Example/Auth/Tests/FIRUserTests.m

@@ -231,7 +231,7 @@
 /** @var kExpectationTimeout
     @brief The maximum time waiting for expectations to fulfill.
  */
-static const NSTimeInterval kExpectationTimeout = 1;
+static const NSTimeInterval kExpectationTimeout = 2;
 
 /** @class FIRUserTests
     @brief Tests for @c FIRUser .

Example/Core/Tests/FIRAppTest.m

@@ -95,7 +95,7 @@ - (void)testConfigure {
 }
 
 - (void)testConfigureWithOptions {
-  // nil options
+// nil options
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnonnull"
   XCTAssertThrows([FIRApp configureWithOptions:nil]);
@@ -119,7 +119,7 @@ - (void)testConfigureWithOptions {
 }
 
 - (void)testConfigureWithCustomizedOptions {
-  // valid customized options
+// valid customized options
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnonnull"
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -194,7 +194,7 @@ - (void)testConfigureWithNameAndCustomizedOptions {
   XCTAssertTrue([FIRApp allApps].count == 1);
   self.app = [FIRApp appNamed:kFIRTestAppName1];
 
-  // Configure a different app with valid customized options
+// Configure a different app with valid customized options
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnonnull"
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"

Example/Core/Tests/FIRLoggerTest.m

@@ -148,7 +148,7 @@ - (void)testMessageCodeFormat {
   // Lowercase should fail.
   XCTAssertThrows(FIRLogError(kFIRLoggerCore, @"I-app000001", @"Message."));
 
-  // nil or empty message code should fail.
+// nil or empty message code should fail.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnonnull"
   XCTAssertThrows(FIRLogError(kFIRLoggerCore, nil, @"Message."));

Example/Core/Tests/FIROptionsTest.m

@@ -111,7 +111,7 @@ - (void)testInitCustomizedOptions {
   XCTAssertEqualObjects(options2.deepLinkURLScheme, kDeepLinkURLScheme);
   XCTAssertFalse(options.usingOptionsFromDefaultPlist);
 
-  // nil GoogleAppID should throw an exception
+// nil GoogleAppID should throw an exception
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnonnull"
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"