Fixed some unit tests.

Author: Edward Smith

Branch-SDK-Tests/BNCDeviceInfo.Test.m

@@ -134,7 +134,7 @@ - (void) testV2Dictionary {
     BNCPreferenceHelper *preferences = [BNCPreferenceHelper preferenceHelper];
 
     NSMutableDictionary *truth = [self mutableDictionaryFromBundleJSONWithKey:@"BNCDeviceDictionaryV2"];
-    truth[@"app_version"] = nil;//@"1.1";
+    truth[@"app_version"] = @"1.1";
     truth[@"os_version"] = [UIDevice currentDevice].systemVersion;
     truth[@"sdk_version"] = BNC_SDK_VERSION;
     truth[@"developer_identity"] = preferences.userIdentity;

Branch-SDK-Tests/BNCKeyChain.Test.m

@@ -62,6 +62,11 @@ - (void)testKeyChain {
     value = [BNCKeyChain retrieveValueForService:kServiceName key:@"key2" error:&error];
     XCTAssertTrue(error == nil && [value isEqualToString:@"2xyz123"]);
 
+    error = [BNCKeyChain storeValue:@"3xyz123" forService:@"Service2" key:@"skey2" cloudAccessGroup:nil];
+    XCTAssertTrue(error == nil);
+    value = [BNCKeyChain retrieveValueForService:@"Service2" key:@"skey2" error:&error];
+    XCTAssertTrue(error == nil && [value isEqualToString:@"3xyz123"]);
+
     // Remove by service:
 
     error = [BNCKeyChain removeValuesForService:kServiceName key:nil];

Branch-SDK-Tests/BNCTestCase.m

@@ -10,6 +10,11 @@
 
 #import "BNCTestCase.h"
 #import "BNCLog.h"
+#import "Branch.h"
+
+@interface Branch (BNCTest)
++ (void) clearAll;
+@end
 
 NSString* kTestStringResourceName = @"BNCTestCase"; // File is 'BNCTestCase.strings'. Omit the '.string'.
 
@@ -99,17 +104,25 @@ + (BOOL) breakpointsAreEnabledInTests {
     return _breakpointsAreEnabledInTests;
 }
 
+static NSString* savedIdentityID = nil;
+
 + (void) initialize {
     if (self != [BNCTestCase self]) return;
     BNCLogSetDisplayLevel(BNCLogLevelAll);
 
     // Load test options from environment variables:
-
     NSDictionary<NSString*, NSString*> *environment = [NSProcessInfo processInfo].environment;
     NSString *BNCTestBreakpoints = environment[@"BNCTestBreakpointsEnabled"];
     if ([BNCTestBreakpoints boolValue]) {
         _breakpointsAreEnabledInTests = YES;
     }
+
+    savedIdentityID = [BNCPreferenceHelper preferenceHelper].identityID;
+    [Branch clearAll];
+}
+
++ (void)tearDown {
+    [BNCPreferenceHelper preferenceHelper].identityID = savedIdentityID;
 }
 
 @end

Branch-SDK-Tests/BNCURLBlackList.Test.m

@@ -131,6 +131,7 @@ - (void) testDownloadGoodURLs {
 }
 
 - (void) testStandardBlackList {
+    BNCLogSetDisplayLevel(BNCLogLevelAll);
     Branch *branch = [Branch getInstance:@"key_live_foo"];
     id serverInterfaceMock = OCMPartialMock(branch.serverInterface);
     XCTestExpectation *expectation = [self expectationWithDescription:@"OpenRequest Expectation"];
@@ -146,9 +147,10 @@ - (void) testStandardBlackList {
 
         NSLog(@"d: %@", dictionary);
         NSString* link = dictionary[@"external_intent_uri"];
-        NSString *pattern = @"^(?i)((http|https):\\/\\/).*[\\/|?|#].*\\b(password|o?auth|o?auth.?token|access|access.?token)\\b";
-        NSLog(@"\n   Link: '%@'\nPattern: '%@'\n.", link, pattern);
-        XCTAssertEqualObjects(link, pattern);
+        NSString *pattern1 = @"^(?i)((http|https):\\/\\/).*[\\/|?|#].*\\b(password|o?auth|o?auth.?token|access|access.?token)\\b";
+        NSString *pattern2 = @"^(?i).+:.*[?].*\\b(password|o?auth|o?auth.?token|access|access.?token)\\b";
+        NSLog(@"\n   Link: '%@'\nPattern1: '%@'\nPattern2: '%@'.", link, pattern1, pattern2);
+        XCTAssertTrue([link isEqualToString:pattern1] || [link isEqualToString:pattern2]);
         [expectation fulfill];
     });
 

Branch-SDK-Tests/BranchCloseRequestTests.m

@@ -20,6 +20,7 @@ @implementation BranchCloseRequestTests
 
 - (void)testRequestBody {
     BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
+    preferenceHelper.identityID = @"foo_identity";
     NSDictionary * const expectedParams = @{
         BRANCH_REQUEST_KEY_BRANCH_IDENTITY: preferenceHelper.identityID,
         BRANCH_REQUEST_KEY_DEVICE_FINGERPRINT_ID: preferenceHelper.deviceFingerprintID,

Branch-SDK-Tests/BranchEvent.Test.m

@@ -21,6 +21,11 @@ @interface BranchEventTest : BNCTestCase
 
 @implementation BranchEventTest
 
+- (void) setUp {
+    [BNCPreferenceHelper preferenceHelper].identityID = @"575759106028389737";
+    [[BNCPreferenceHelper preferenceHelper] clearInstrumentationDictionary];
+}
+
 - (void) testDescription {
     BranchEvent *event    = [BranchEvent standardEvent:BranchStandardEventPurchase];
     event.transactionID   = @"1234";
@@ -112,6 +117,7 @@ - (void) testEvent {
 
     NSMutableDictionary *expectedRequest =
         [self mutableDictionaryFromBundleJSONWithKey:@"V2EventJSON"];
+    expectedRequest[@"branch_key"] = Branch.branchKey;
     expectedRequest[@"user_data"] = [[BNCDeviceInfo getInstance] v2dictionary];
 
     Branch *branch = [Branch getInstance:@"key_live_foo"];
@@ -131,8 +137,9 @@ - (void) testEvent {
         NSError *error = nil;
         NSString *url = request.URL.absoluteString;
         NSData *bodyData = request.HTTPBody;
-        NSDictionary *parameters =
-            [NSJSONSerialization JSONObjectWithData:bodyData options:0 error:&error];
+        NSMutableDictionary *parameters =
+            [NSJSONSerialization JSONObjectWithData:bodyData
+                options:NSJSONReadingMutableContainers error:&error];
         XCTAssertNil(error);
 
         NSLog(@"testEvent 1");
@@ -157,6 +164,7 @@ - (void) testUserCompletedAction {
 
     NSMutableDictionary *expectedRequest =
         [self mutableDictionaryFromBundleJSONWithKey:@"V2EventJSON"];
+    expectedRequest[@"branch_key"] = Branch.branchKey;
     expectedRequest[@"user_data"] = [[BNCDeviceInfo getInstance] v2dictionary];
     expectedRequest[@"event_data"] = nil;
     expectedRequest[@"custom_data"] = nil;

Branch-SDK-Tests/BranchInstallRequestTests.m

@@ -83,6 +83,7 @@ - (void)testRequestBody {
         @"facebook_app_link_checked":   @0,
         @"latest_install_time":         BNCWireFormatFromDate(appDate),
         @"ios_bundle_id":               @"foo-bundle-id",
+        @"ios_team_id":                 @"R63EM248DP",
         @"lastest_update_time":         BNCWireFormatFromDate(appDate),
         @"link_identifier":             @"foo-link-id",
         @"first_install_time":          BNCWireFormatFromDate(appDate),

Branch-SDK-Tests/BranchOpenRequestTests.m

@@ -81,10 +81,11 @@ - (void)testRequestBodyWithNoFingerprintID {
             @"mv": @"-1",
             @"pn": BUNDLE_ID
         },
-        @"debug":                       @1,
+        @"debug":                       IS_DEBUG,
         @"facebook_app_link_checked":   @0,
         @"identity_id":                 IDENTITY_ID,
         @"ios_bundle_id":               BUNDLE_ID,
+        @"ios_team_id":                 @"R63EM248DP",
         @"link_identifier":             LINK_IDENTIFIER,
         @"uri_scheme":                  URI_SCHEME,
 
@@ -156,11 +157,12 @@ - (void)testRequestBodyWithFingerprintID {
             @"mv": @"-1",
             @"pn": BUNDLE_ID
         },
-        @"debug":                       @1,
+        @"debug":                       IS_DEBUG,
         @"device_fingerprint_id":       FINGERPRINT_ID,
         @"facebook_app_link_checked":   @0,
         @"identity_id":                 IDENTITY_ID,
         @"ios_bundle_id":               BUNDLE_ID,
+        @"ios_team_id":                 @"R63EM248DP",
         @"link_identifier":             LINK_IDENTIFIER,
         @"uri_scheme":                  URI_SCHEME,
 

Branch-SDK-Tests/BranchShortUrlRequestTests.m

@@ -73,10 +73,13 @@ - (void)testRequestBody {
             callback:NULL];
 
     id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-    [[serverInterfaceMock expect] postRequest:expectedParams url:[self stringMatchingPattern:BRANCH_REQUEST_ENDPOINT_GET_SHORT_URL] key:[OCMArg any] callback:[OCMArg any]];
+    [[serverInterfaceMock expect]
+        postRequest:expectedParams
+        url:[self stringMatchingPattern:BRANCH_REQUEST_ENDPOINT_GET_SHORT_URL]
+        key:[OCMArg any]
+        callback:[OCMArg any]];
 
     [request makeRequest:serverInterfaceMock key:nil callback:NULL];
-    
     [serverInterfaceMock verify];
 }
 
@@ -112,7 +115,11 @@ - (void)testRequestBodyWhenOptionalValuesArentProvided {
             callback:NULL];
 
     id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-    [[serverInterfaceMock expect] postRequest:expectedParams url:[OCMArg any] key:[OCMArg any] callback:[OCMArg any]];
+    [[serverInterfaceMock expect]
+        postRequest:expectedParams
+        url:[OCMArg any]
+        key:[OCMArg any]
+        callback:[OCMArg any]];
 
     [request makeRequest:serverInterfaceMock key:nil callback:NULL];
 

Branch-SDK/Branch-SDK/BNCKeyChain.m

@@ -124,7 +124,7 @@ + (id) retrieveValueForService:(NSString*)service key:(NSString*)key error:(NSEr
     };
     CFDataRef valueData = NULL;
     OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)dictionary, (CFTypeRef *)&valueData);
-    if (status) {
+    if (status != errSecSuccess) {
         NSError *localError = [self errorWithKey:key OSStatus:status];
         BNCLogDebugSDK(@"Can't retrieve key: %@.", localError);
         if (error) *error = localError;