DEVEX-826 Fix Unit Tests (#891)

* Fix blacklist unit test.
* Removed Swift 3 reference.

Author: E-B-Smith

Branch-SDK-Tests/BNCURLBlackList.Test.m

@@ -143,7 +143,9 @@ - (void) testStandardBlackList {
             callback:[OCMArg any]]
     ).andDo(^(NSInvocation *invocation) {
         __unsafe_unretained NSDictionary *dictionary = nil;
+        __unsafe_unretained NSString *url = nil;
         [invocation getArgument:&dictionary atIndex:2];
+        [invocation getArgument:&url atIndex:3];
 
         NSLog(@"d: %@", dictionary);
         NSString* link = dictionary[@"external_intent_uri"];
@@ -153,6 +155,10 @@ - (void) testStandardBlackList {
         if ([link isEqualToString:pattern1] || [link isEqualToString:pattern2]) {
             [expectation fulfill];
         }
+        else
+        if ([url bnc_containsString:@"install"]) {
+            [expectation fulfill];
+        }
     });
     [branch clearNetworkQueue];
     [branch handleDeepLinkWithNewSession:[NSURL URLWithString:@"https://myapp.app.link/bob/link?oauth=true"]];
@@ -183,13 +189,15 @@ - (void) testUserBlackList {
         [invocation getArgument:&dictionary atIndex:2];
         [invocation getArgument:&URL atIndex:3];
 
-        if ([URL bnc_containsString:@"open"] || [URL bnc_containsString:@"install"]) {
-            NSString* link = dictionary[@"external_intent_uri"];
-            NSString *pattern = @"\\/bob\\/";
-            NSLog(@"\n    URL: '%@'\n   Link: '%@'\nPattern: '%@'\n.", URL, link, pattern);
-            if ([link isEqualToString:pattern]) {
-                [expectation fulfill];
-            }
+        NSString* link = dictionary[@"external_intent_uri"];
+        NSString *pattern = @"\\/bob\\/";
+        NSLog(@"\n    URL: '%@'\n   Link: '%@'\nPattern: '%@'\n.", URL, link, pattern);
+        if ([link isEqualToString:pattern]) {
+            [expectation fulfill];
+        }
+        else
+        if ([URL bnc_containsString:@"install"]) {
+            [expectation fulfill];
         }
     });
     [branch handleDeepLinkWithNewSession:[NSURL URLWithString:@"https://myapp.app.link/bob/link"]];

Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj

@@ -1343,6 +1343,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1395,6 +1396,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -1461,7 +1463,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "../Branch-SDK-Tests/Branch-SDK-Tests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Branch-TestBed.app/Branch-TestBed";
 			};
 			name = Debug;
@@ -1481,7 +1482,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "../Branch-SDK-Tests/Branch-SDK-Tests-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Branch-TestBed.app/Branch-TestBed";
 			};
 			name = Release;