Merge pull request #25 from BranchMetrics/SDK-2240-prep-iOS-3.2.0-sync

sync with non-spm iOS repo

Author: echo-branch

Branch-TestBed/Branch-SDK-Tests/BNCAPIServerTest.m

@@ -11,6 +11,7 @@
 #import "BNCSystemObserver.h"
 #import "BNCConfig.h"
 #import "BranchConstants.h"
+#import "Branch.h"
 
 @interface BNCAPIServerTest : XCTestCase
 
@@ -370,4 +371,42 @@ - (void)testValidationServiceURL_EUTracking {
     XCTAssertTrue([url hasPrefix:expectedUrlPrefix]);
 }
 
+- (void)testDefaultAPIURL {
+    BNCServerAPI *serverAPI = [BNCServerAPI new];
+    XCTAssertNil(serverAPI.customAPIURL);
+    
+    NSString *storedUrl = [[BNCServerAPI sharedInstance] installServiceURL];
+    NSString *expectedUrl = [BNC_API_URL stringByAppendingString: @"/v1/install"];
+    XCTAssertEqualObjects(storedUrl, expectedUrl);
+}
+
+- (void)testSetAPIURL_Example {
+    NSString *url = @"https://www.example.com";
+    [Branch setAPIUrl:url];
+    
+    NSString *storedUrl = [[BNCServerAPI sharedInstance] installServiceURL];
+    NSString *expectedUrl = [url stringByAppendingString: @"/v1/install"];
+    XCTAssertEqualObjects(storedUrl, expectedUrl);
+    
+    [Branch setAPIUrl:BNC_API_URL];
+}
+
+- (void)testSetAPIURL_InvalidHttp {
+    NSString *url = @"Invalid://www.example.com";
+    [Branch setAPIUrl:url];
+
+    NSString *storedUrl = [[BNCServerAPI sharedInstance] installServiceURL];
+    NSString *expectedUrl = [BNC_API_URL stringByAppendingString: @"/v1/install"];
+    XCTAssertEqualObjects(storedUrl, expectedUrl);
+}
+
+- (void)testSetAPIURL_InvalidEmpty {
+    NSString *url = @"";
+    [Branch setAPIUrl:url];
+    
+    NSString *storedUrl = [[BNCServerAPI sharedInstance] installServiceURL];
+    NSString *expectedUrl = [BNC_API_URL stringByAppendingString: @"/v1/install"];
+    XCTAssertEqualObjects(storedUrl, expectedUrl);
+}
+
 @end

…d/Branch-SDK-Tests/BNCApplication.Test.m …d/Branch-SDK-Tests/BNCApplicationTests.mBranch-TestBed/Branch-SDK-Tests/BNCApplication.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCApplicationTests.m Branch-TestBed/Branch-SDK-Tests/BNCApplication.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCApplicationTests.m

@@ -6,14 +6,22 @@
 //  Copyright © 2018 Branch, Inc. All rights reserved.
 //
 
-#import "BNCTestCase.h"
+#import <XCTest/XCTest.h>
 #import "BNCApplication.h"
 #import "BNCKeyChain.h"
 
-@interface BNCApplicationTest : BNCTestCase
+@interface BNCApplicationTests : XCTestCase
 @end
 
-@implementation BNCApplicationTest
+@implementation BNCApplicationTests
+
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
 
 - (void)testApplication {
     // Test general info:

…h-SDK-Tests/BNCCrashlyticsWrapper.Test.m …h-SDK-Tests/BNCCrashlyticsWrapperTests.mBranch-TestBed/Branch-SDK-Tests/BNCCrashlyticsWrapper.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCCrashlyticsWrapperTests.m Branch-TestBed/Branch-SDK-Tests/BNCCrashlyticsWrapper.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCCrashlyticsWrapperTests.m

@@ -6,8 +6,8 @@
 //  Copyright © 2017 Branch Metrics. All rights reserved.
 //
 
+#import <XCTest/XCTest.h>
 #import "BNCCrashlyticsWrapper.h"
-#import "BNCTestCase.h"
 
 #pragma mark Crashlytics SDK Stand-In
 
@@ -42,13 +42,20 @@ -(id)getCustomValueForKey:(NSString *)key {
 
 #pragma mark - BNCCrashlyticsWrapperTest
 
-@interface BNCCrashlyticsWrapperTest : BNCTestCase
+@interface BNCCrashlyticsWrapperTests : XCTestCase
 @end
 
-@implementation BNCCrashlyticsWrapperTest
+@implementation BNCCrashlyticsWrapperTests
 
-- (void) testSetValue {
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
 
+- (void)testSetValue {
     BNCCrashlyticsWrapper *wrapper = [BNCCrashlyticsWrapper wrapper];
     NSString *value = @"TestString";
     NSString *key = @"TestKey";

…Branch-SDK-Tests/BNCEncodingUtils.Test.m …Branch-SDK-Tests/BNCEncodingUtilsTests.mBranch-TestBed/Branch-SDK-Tests/BNCEncodingUtils.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCEncodingUtilsTests.m Branch-TestBed/Branch-SDK-Tests/BNCEncodingUtils.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCEncodingUtilsTests.m

@@ -8,13 +8,20 @@
 
 #import <XCTest/XCTest.h>
 #import "BNCEncodingUtils.h"
-#import "BNCTestCase.h"
 
-@interface BNCEncodingUtilsTests : BNCTestCase
+@interface BNCEncodingUtilsTests : XCTestCase
 @end
 
 @implementation BNCEncodingUtilsTests
 
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
 #pragma mark - EncodeDictionaryToJsonString tests
 
 - (void)testEncodeDictionaryToJsonStringWithExpectedParams {

Branch-TestBed/Branch-SDK-Tests/BNCLinkDataTests.m

@@ -6,14 +6,22 @@
 //  Copyright (c) 2015 Branch Metrics. All rights reserved.
 //
 
-#import "BNCTestCase.h"
+#import <XCTest/XCTest.h>
 #import "BNCLinkData.h"
 
-@interface BNCLinkDataTests : BNCTestCase
+@interface BNCLinkDataTests : XCTestCase
 @end
 
 @implementation BNCLinkDataTests
 
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
 - (void)testBasicObjectHash {
     BNCLinkData *a = [[BNCLinkData alloc] init];
     BNCLinkData *b = [[BNCLinkData alloc] init];