rename(init): rename init function to start (#72)

* rename(init): rename init function to setup * fix(tests): Fixing tests and include headers * chore(BVTs): change to 13.5 for simulator * Rename setup to start
Azure · Jun 10, 2020 · 79e8ccc · 79e8ccc
1 parent 67d2b04
commit 79e8ccc
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 10 deletions.
diff --git a/Samples/Objective-C/nhubsample-refresh/nhubsample-refresh/AppDelegate.m b/Samples/Objective-C/nhubsample-refresh/nhubsample-refresh/AppDelegate.m
@@ -17,12 +17,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     NSDictionary *configValues = [NSDictionary dictionaryWithContentsOfFile:path];
 
     NSString *connectionString = [configValues objectForKey:@"connectionString"];
-    NSString *hubName = [configValues objectForKey:@"hubName"];
+    NSString *hubName = [configValues objectForKey:@"hubName"]  ;
 
     [MSNotificationHub setEnrichmentDelegate: self];
     [MSNotificationHub setManagementDelegate: self];
     [MSNotificationHub setLifecycleDelegate: self];
-    [MSNotificationHub initWithConnectionString:connectionString hubName:hubName];
+    [MSNotificationHub startWithConnectionString:connectionString hubName:hubName];
     [MSNotificationHub addTag:@"userAgent:com.example.nhubsample-refresh:1.0"];
 
     return YES;

diff --git a/Samples/Swift/nhubsample-refresh/nhubsample-refresh/AppDelegate.swift b/Samples/Swift/nhubsample-refresh/nhubsample-refresh/AppDelegate.swift
@@ -23,7 +23,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MSInstallationEnrichmentD
         MSNotificationHub.setEnrichmentDelegate(self)
         MSNotificationHub.setManagementDelegate(self)
         MSNotificationHub.setLifecycleDelegate(self)
-        MSNotificationHub.initWithConnectionString(connectionString!, hubName: hubName!)
+        MSNotificationHub.start(connectionString: connectionString!, hubName: hubName!)
         MSNotificationHub.addTag("userAgent:com.example.nhubsample-refresh:1.0")
 
         return true

diff --git a/src/WindowsAzureMessaging/WindowsAzureMessaging/Helpers/MSInstallationManager.m b/src/WindowsAzureMessaging/WindowsAzureMessaging/Helpers/MSInstallationManager.m
@@ -12,7 +12,6 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-// TODO: Move to loading from constants file
 NSString *const kUserAgentFormat = @"NOTIFICATIONHUBS/%@(api-origin=IosSdkV%@; os=%@; os_version=%@;)";
 NSString *const kAPIVersion = @"2017-04";
 

diff --git a/src/WindowsAzureMessaging/WindowsAzureMessaging/MSNotificationHub.h b/src/WindowsAzureMessaging/WindowsAzureMessaging/MSNotificationHub.h
@@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Policy, and Hub Name.
  * @param connectionString The connection string
  */
-+ (void)initWithConnectionString:(NSString *)connectionString hubName:(NSString *)notificationHubName;
++ (void)startWithConnectionString:(NSString *)connectionString hubName:(NSString *)notificationHubName NS_SWIFT_NAME(start(connectionString:hubName:));
 
 #pragma mark Push Initialization
 

diff --git a/src/WindowsAzureMessaging/WindowsAzureMessaging/MSNotificationHub.m b/src/WindowsAzureMessaging/WindowsAzureMessaging/MSNotificationHub.m
@@ -43,7 +43,7 @@ + (void)resetSharedInstance {
     sharedInstance = nil;
 }
 
-+ (void)initWithConnectionString:(NSString *)connectionString hubName:(NSString *)notificationHubName {
++ (void)startWithConnectionString:(NSString *)connectionString hubName:(NSString *)notificationHubName {
     MSInstallationManager *installationManager = [[MSInstallationManager alloc] initWithConnectionString:connectionString
                                                                                                  hubName:notificationHubName];
 

diff --git a/...owsAzureMessaging/WindowsAzureMessaging/include/WindowsAzureMessaging/MSNotificationHub.h b/...owsAzureMessaging/WindowsAzureMessaging/include/WindowsAzureMessaging/MSNotificationHub.h
@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Policy, and Hub Name.
  * @param connectionString The connection string
  */
-+ (void)initWithConnectionString:(NSString *)connectionString hubName:(NSString *)notificationHubName;
++ (void)setupWithConnectionString:(NSString *)connectionString hubName:(NSString *)notificationHubName NS_SWIFT_NAME(setup(connectionString:hubName:));
 
 #pragma mark Push Initialization
 

diff --git a/src/WindowsAzureMessaging/WindowsAzureMessagingTests/MSNotificationHubTagsTests.m b/src/WindowsAzureMessaging/WindowsAzureMessagingTests/MSNotificationHubTagsTests.m
@@ -24,7 +24,7 @@ - (void)setUp {
     id notificationCenterMock = OCMClassMock([UNUserNotificationCenter class]);
     OCMStub(ClassMethod([notificationCenterMock currentNotificationCenter])).andReturn(nil);
 
-    [MSNotificationHub initWithConnectionString:connectionString hubName:hubName];
+    [MSNotificationHub startWithConnectionString:connectionString hubName:hubName];
 }
 
 - (void)testAddTag {

diff --git a/src/WindowsAzureMessaging/WindowsAzureMessagingTests/MSNotificationHubTemplatesTests.m b/src/WindowsAzureMessaging/WindowsAzureMessagingTests/MSNotificationHubTemplatesTests.m
@@ -26,7 +26,7 @@ - (void)setUp {
     id notificationCenterMock = OCMClassMock([UNUserNotificationCenter class]);
     OCMStub(ClassMethod([notificationCenterMock currentNotificationCenter])).andReturn(nil);
 
-    [MSNotificationHub initWithConnectionString:connectionString hubName:hubName];
+    [MSNotificationHub startWithConnectionString:connectionString hubName:hubName];
 
     key = @"template1";
     NSString *tag1 = @"tag1";

diff --git a/src/runBVT.command b/src/runBVT.command
@@ -16,7 +16,7 @@ rm -rf "WindowsAzureMessaging.framework"
 cp -R -L "$ABSPATH/WindowsAzureMessaging/Build/Release-iphonesimulator/WindowsAzureMessaging.framework" "WindowsAzureMessaging.framework" 2>&1 | tee -a "$testLogPath"
 
 echo "******* Build and run BVT *******" 2>&1 | tee -a "$testLogPath"
-GHUNIT_CLI=1 xcodebuild -scheme IosSdkTests -destination 'platform=iOS Simulator,name=iPhone 8' -configuration Debug -sdk iphonesimulator13.4 clean build 2>&1 | tee -a "$testLogPath"
+GHUNIT_CLI=1 xcodebuild -scheme IosSdkTests -destination 'platform=iOS Simulator,name=iPhone 8' -configuration Debug -sdk iphonesimulator13.5 clean build 2>&1 | tee -a "$testLogPath"
 
 grep "BUILD SUCCEEDED" "$testLogPath" &> /dev/null
 if [ "$?" != "0" ]; then