From 73869c741fd9619dfc03937de5b97ce599db87c8 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Thu, 7 Dec 2017 14:30:46 -0800
Subject: Fix warnings in FirebaseCore Unit Tests (#544)

---
 Example/Core/Tests/FIRAppTest.m     | 13 ++++++++++++-
 Example/Core/Tests/FIRLoggerTest.m  |  4 ++++
 Example/Core/Tests/FIROptionsTest.m |  6 ++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'Example/Core')

diff --git a/Example/Core/Tests/FIRAppTest.m b/Example/Core/Tests/FIRAppTest.m
index 9b3554d..432c593 100644
--- a/Example/Core/Tests/FIRAppTest.m
+++ b/Example/Core/Tests/FIRAppTest.m
@@ -96,7 +96,10 @@ NSString *const kFIRTestAppName2 = @"test-app-name-2";
 
 - (void)testConfigureWithOptions {
   // nil options
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
   XCTAssertThrows([FIRApp configureWithOptions:nil]);
+#pragma clang diagnostic pop
   XCTAssertTrue([FIRApp allApps].count == 0);
 
   NSDictionary *expectedUserInfo =
@@ -117,6 +120,8 @@ NSString *const kFIRTestAppName2 = @"test-app-name-2";
 
 - (void)testConfigureWithCustomizedOptions {
   // valid customized options
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
   FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
                                                        bundleID:kBundleID
                                                     GCMSenderID:kGCMSenderID
@@ -127,7 +132,7 @@ NSString *const kFIRTestAppName2 = @"test-app-name-2";
                                                     databaseURL:nil
                                                   storageBucket:nil
                                               deepLinkURLScheme:nil];
-
+#pragma clang diagnostic pop
   NSDictionary *expectedUserInfo =
       [self expectedUserInfoWithAppName:kFIRDefaultAppName isDefaultApp:YES];
   OCMExpect([self.notificationCenterMock postNotificationName:kFIRAppReadyToConfigureSDKNotification
@@ -146,8 +151,11 @@ NSString *const kFIRTestAppName2 = @"test-app-name-2";
 }
 
 - (void)testConfigureWithNameAndOptions {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
   XCTAssertThrows([FIRApp configureWithName:nil options:[FIROptions defaultOptions]]);
   XCTAssertThrows([FIRApp configureWithName:kFIRTestAppName1 options:nil]);
+#pragma clang diagnostic pop
   XCTAssertThrows([FIRApp configureWithName:@"" options:[FIROptions defaultOptions]]);
   XCTAssertThrows(
       [FIRApp configureWithName:kFIRDefaultAppName options:[FIROptions defaultOptions]]);
@@ -186,6 +194,8 @@ NSString *const kFIRTestAppName2 = @"test-app-name-2";
   self.app = [FIRApp appNamed:kFIRTestAppName1];
 
   // Configure a different app with valid customized options
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
   FIROptions *customizedOptions = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
                                                                  bundleID:kBundleID
                                                               GCMSenderID:kGCMSenderID
@@ -196,6 +206,7 @@ NSString *const kFIRTestAppName2 = @"test-app-name-2";
                                                               databaseURL:nil
                                                             storageBucket:nil
                                                         deepLinkURLScheme:nil];
+#pragma clang diagnostic pop
 
   NSDictionary *expectedUserInfo2 =
       [self expectedUserInfoWithAppName:kFIRTestAppName2 isDefaultApp:NO];
diff --git a/Example/Core/Tests/FIRLoggerTest.m b/Example/Core/Tests/FIRLoggerTest.m
index 7740527..eab2e1e 100644
--- a/Example/Core/Tests/FIRLoggerTest.m
+++ b/Example/Core/Tests/FIRLoggerTest.m
@@ -149,7 +149,11 @@ static NSString *const kMessageCode = @"I-COR000001";
   XCTAssertThrows(FIRLogError(kFIRLoggerCore, @"I-app000001", @"Message."));
 
   // nil or empty message code should fail.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
   XCTAssertThrows(FIRLogError(kFIRLoggerCore, nil, @"Message."));
+#pragma clang diagnostic pop
+
   XCTAssertThrows(FIRLogError(kFIRLoggerCore, @"", @"Message."));
 
   // Android message code should fail.
diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m
index d01eec5..1423d0a 100644
--- a/Example/Core/Tests/FIROptionsTest.m
+++ b/Example/Core/Tests/FIROptionsTest.m
@@ -110,6 +110,8 @@ extern NSString *const kFIRLibraryVersionID;
   XCTAssertFalse(options.usingOptionsFromDefaultPlist);
 
   // nil GoogleAppID should throw an exception
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
   XCTAssertThrows([[FIROptions alloc] initWithGoogleAppID:nil
                                                  bundleID:kBundleID
                                               GCMSenderID:kGCMSenderID
@@ -120,6 +122,7 @@ extern NSString *const kFIRLibraryVersionID;
                                               databaseURL:nil
                                             storageBucket:nil
                                         deepLinkURLScheme:nil]);
+#pragma clang diagnostic pop
 }
 
 - (void)testinitWithContentsOfFile {
@@ -130,7 +133,10 @@ extern NSString *const kFIRLibraryVersionID;
   XCTAssertNil(options.deepLinkURLScheme);
   XCTAssertFalse(options.usingOptionsFromDefaultPlist);
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
   FIROptions *emptyOptions = [[FIROptions alloc] initWithContentsOfFile:nil];
+#pragma clang diagnostic pop
   XCTAssertNil(emptyOptions);
 
   FIROptions *invalidOptions = [[FIROptions alloc] initWithContentsOfFile:@"invalid.plist"];
-- 
cgit v1.2.3