From b8fdf488334da608d701117330692e60376e6fbd Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Thu, 4 Jan 2018 14:21:01 -0500 Subject: Remove old FIROptions constructor. (#615) --- Example/Core/Tests/FIRAppTest.m | 40 ++++++---------------- Example/Core/Tests/FIROptionsTest.m | 68 ++++++++----------------------------- 2 files changed, 25 insertions(+), 83 deletions(-) (limited to 'Example') diff --git a/Example/Core/Tests/FIRAppTest.m b/Example/Core/Tests/FIRAppTest.m index 3784a6e..6825e6a 100644 --- a/Example/Core/Tests/FIRAppTest.m +++ b/Example/Core/Tests/FIRAppTest.m @@ -119,21 +119,11 @@ NSString *const kFIRTestAppName2 = @"test-app-name-2"; } - (void)testConfigureWithCustomizedOptions { -// valid customized options -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnonnull" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID - bundleID:kBundleID - GCMSenderID:kGCMSenderID - APIKey:kCustomizedAPIKey - clientID:nil - trackingID:nil - androidClientID:nil - databaseURL:nil - storageBucket:nil - deepLinkURLScheme:nil]; -#pragma clang diagnostic pop + // valid customized options + FIROptions *options = + [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID]; + options.bundleID = kBundleID; + options.APIKey = kCustomizedAPIKey; NSDictionary *expectedUserInfo = [self expectedUserInfoWithAppName:kFIRDefaultAppName isDefaultApp:YES]; OCMExpect([self.notificationCenterMock postNotificationName:kFIRAppReadyToConfigureSDKNotification @@ -194,21 +184,11 @@ NSString *const kFIRTestAppName2 = @"test-app-name-2"; XCTAssertTrue([FIRApp allApps].count == 1); self.app = [FIRApp appNamed:kFIRTestAppName1]; -// Configure a different app with valid customized options -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnonnull" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - FIROptions *customizedOptions = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID - bundleID:kBundleID - GCMSenderID:kGCMSenderID - APIKey:kCustomizedAPIKey - clientID:nil - trackingID:nil - androidClientID:nil - databaseURL:nil - storageBucket:nil - deepLinkURLScheme:nil]; -#pragma clang diagnostic pop + // Configure a different app with valid customized options + FIROptions *customizedOptions = + [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID]; + customizedOptions.bundleID = kBundleID; + customizedOptions.APIKey = kCustomizedAPIKey; NSDictionary *expectedUserInfo2 = [self expectedUserInfoWithAppName:kFIRTestAppName2 isDefaultApp:NO]; diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m index 5d66ca9..e4813f1 100644 --- a/Example/Core/Tests/FIROptionsTest.m +++ b/Example/Core/Tests/FIROptionsTest.m @@ -81,51 +81,20 @@ extern NSString *const kFIRLibraryVersionID; } - (void)testInitCustomizedOptions { -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID - bundleID:kBundleID - GCMSenderID:kGCMSenderID - APIKey:kAPIKey - clientID:kClientID - trackingID:kTrackingID - androidClientID:(id _Nonnull)nil - databaseURL:kDatabaseURL - storageBucket:kStorageBucket - deepLinkURLScheme:kDeepLinkURLScheme]; -#pragma clang pop - [self assertOptionsMatchDefaults:options andProjectID:NO]; - XCTAssertEqualObjects(options.deepLinkURLScheme, kDeepLinkURLScheme); - XCTAssertFalse(options.usingOptionsFromDefaultPlist); - - FIROptions *options2 = + FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID]; - options2.APIKey = kAPIKey; - options2.bundleID = kBundleID; - options2.clientID = kClientID; - options2.databaseURL = kDatabaseURL; - options2.deepLinkURLScheme = kDeepLinkURLScheme; - options2.projectID = kProjectID; - options2.storageBucket = kStorageBucket; - options2.trackingID = kTrackingID; - [self assertOptionsMatchDefaults:options2 andProjectID:YES]; - XCTAssertEqualObjects(options2.deepLinkURLScheme, kDeepLinkURLScheme); + options.androidClientID = kAndroidClientID; + options.APIKey = kAPIKey; + options.bundleID = kBundleID; + options.clientID = kClientID; + options.databaseURL = kDatabaseURL; + options.deepLinkURLScheme = kDeepLinkURLScheme; + options.projectID = kProjectID; + options.storageBucket = kStorageBucket; + options.trackingID = kTrackingID; + [self assertOptionsMatchDefaults:options andProjectID:YES]; + XCTAssertEqualObjects(options.deepLinkURLScheme, kDeepLinkURLScheme); XCTAssertFalse(options.usingOptionsFromDefaultPlist); - -// nil GoogleAppID should throw an exception -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnonnull" -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - XCTAssertThrows([[FIROptions alloc] initWithGoogleAppID:nil - bundleID:kBundleID - GCMSenderID:kGCMSenderID - APIKey:kCustomizedAPIKey - clientID:nil - trackingID:nil - androidClientID:nil - databaseURL:nil - storageBucket:nil - deepLinkURLScheme:nil]); -#pragma clang diagnostic pop } - (void)testInitWithContentsOfFile { @@ -239,16 +208,9 @@ extern NSString *const kFIRLibraryVersionID; XCTAssertEqualObjects(newOptions.deepLinkURLScheme, kDeepLinkURLScheme); // customized options - FIROptions *customizedOptions = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID - bundleID:kBundleID - GCMSenderID:kGCMSenderID - APIKey:kAPIKey - clientID:kClientID - trackingID:kTrackingID - androidClientID:(id _Nonnull)nil - databaseURL:kDatabaseURL - storageBucket:kStorageBucket - deepLinkURLScheme:kDeepLinkURLScheme]; + FIROptions *customizedOptions = + [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID]; + customizedOptions.deepLinkURLScheme = kDeepLinkURLScheme; FIROptions *copyCustomizedOptions = [customizedOptions copy]; [copyCustomizedOptions setDeepLinkURLScheme:kNewDeepLinkURLScheme]; XCTAssertEqualObjects(customizedOptions.deepLinkURLScheme, kDeepLinkURLScheme); -- cgit v1.2.3 From 5bf3a6abdb86e4fd500ac0643e560dd8d8903183 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Wed, 14 Feb 2018 11:56:13 -0500 Subject: Fixed Core test's missing constant. (#795) --- Example/Core/Tests/FIRTestCase.m | 1 + 1 file changed, 1 insertion(+) (limited to 'Example') diff --git a/Example/Core/Tests/FIRTestCase.m b/Example/Core/Tests/FIRTestCase.m index b52886b..631075f 100644 --- a/Example/Core/Tests/FIRTestCase.m +++ b/Example/Core/Tests/FIRTestCase.m @@ -14,6 +14,7 @@ #import "FIRTestCase.h" +NSString *const kAndroidClientID = @"correct_android_client_id"; NSString *const kAPIKey = @"correct_api_key"; NSString *const kCustomizedAPIKey = @"customized_api_key"; NSString *const kClientID = @"correct_client_id"; -- cgit v1.2.3 From 7f8a5ef1e5c7948be716413a9a3aa37ffb263dae Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Wed, 14 Feb 2018 12:12:22 -0500 Subject: Actually fixed the tests this time. (#796) --- Example/Core/Tests/FIROptionsTest.m | 1 - 1 file changed, 1 deletion(-) (limited to 'Example') diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m index e4813f1..20aec94 100644 --- a/Example/Core/Tests/FIROptionsTest.m +++ b/Example/Core/Tests/FIROptionsTest.m @@ -83,7 +83,6 @@ extern NSString *const kFIRLibraryVersionID; - (void)testInitCustomizedOptions { FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID]; - options.androidClientID = kAndroidClientID; options.APIKey = kAPIKey; options.bundleID = kBundleID; options.clientID = kClientID; -- cgit v1.2.3