diff options
author | Ryan Wilson <wilsonryan@google.com> | 2018-04-10 13:34:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-10 13:34:13 -0400 |
commit | 23742e81597fc6c17c7ec3636617bac27db15315 (patch) | |
tree | 7b255ab21c016acaa4bd79070e18cfd2e6fea733 /Example | |
parent | 7550b6efe4f3d034a7b38de5f10480ed7fd649b7 (diff) | |
parent | 8a06fcb5f99d0a3bd0c7fdc6424e18edbdd367d3 (diff) |
Merge pull request #1050 from firebase/core-breaking-changes
Core Breaking API Changes
Diffstat (limited to 'Example')
-rw-r--r-- | Example/Core/Tests/FIRAppTest.m | 40 | ||||
-rw-r--r-- | Example/Core/Tests/FIROptionsTest.m | 67 | ||||
-rw-r--r-- | Example/Core/Tests/FIRTestCase.m | 1 |
3 files changed, 25 insertions, 83 deletions
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..20aec94 100644 --- a/Example/Core/Tests/FIROptionsTest.m +++ b/Example/Core/Tests/FIROptionsTest.m @@ -81,51 +81,19 @@ 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.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 +207,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); 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"; |