Fix unit tests for Xcode 8.3.2.

Author: Edward Smith

Branch-TestBed-Swift/TestBed-Swift/AppDelegate.swift

@@ -89,7 +89,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let branchHandled = Branch.getInstance().application(application,
             open: url,
             sourceApplication: sourceApplication,
-            annotation: annotation)
+            annotation: annotation
+        )
         if (!branchHandled) {
             // If not handled by Branch, do other deep link routing for the Facebook SDK, Pinterest SDK, etc
         }

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

@@ -146,55 +146,58 @@ - (void)testPersistWhenArchiveFails {
 }
 
 - (void)testCloseRequestsArentPersisted {
-    XCTestExpectation *expectation = [self expectationWithDescription:@"PersistExpectation"];
-
-    id archiverMock = OCMClassMock([NSKeyedArchiver class]);
-    [[archiverMock reject] archiveRootObject:[OCMArg any] toFile:[OCMArg any]];
-    [[[archiverMock expect]
-        andReturn:[NSData data]]
-            archivedDataWithRootObject:[OCMArg checkWithBlock:^BOOL(NSArray *reqs) {
-                if ([reqs isKindOfClass:[NSArray class]]) {
-                    XCTAssert(reqs.count == 0);
-                    BNCAfterSecondsPerformBlock(0.01, ^{ [self safelyFulfillExpectation:expectation]; });
-                    return YES;
-                }
-                return NO;
-            }]];
-
-    BNCServerRequestQueue *requestQueue = [[BNCServerRequestQueue alloc] init];
-    BranchCloseRequest *closeRequest = [[BranchCloseRequest alloc] init];
-    [requestQueue enqueue:closeRequest];
-    [requestQueue persistImmediately];
-    
-    // Wait for operation to occur    
-    [self awaitExpectations];
-    [archiverMock verify];
-    //[archiverMock stopMocking];
+    @autoreleasepool {
+        XCTestExpectation *expectation = [self expectationWithDescription:@"PersistExpectation"];
+
+        id archiverMock = OCMClassMock([NSKeyedArchiver class]);
+        [[archiverMock reject] archiveRootObject:[OCMArg any] toFile:[OCMArg any]];
+        [[[archiverMock expect]
+            andReturn:[NSData data]]
+                archivedDataWithRootObject:[OCMArg checkWithBlock:^BOOL(NSArray *reqs) {
+                    if ([reqs isKindOfClass:[NSArray class]]) {
+                        XCTAssert(reqs.count == 0);
+                        BNCAfterSecondsPerformBlock(0.01, ^{ [self safelyFulfillExpectation:expectation]; });
+                        return YES;
+                    }
+                    return NO;
+                }]];
+
+        BNCServerRequestQueue *requestQueue = [[BNCServerRequestQueue alloc] init];
+        BranchCloseRequest *closeRequest = [[BranchCloseRequest alloc] init];
+        [requestQueue enqueue:closeRequest];
+        [requestQueue persistImmediately];
+        
+        // Wait for operation to occur    
+        [self awaitExpectations];
+        [archiverMock verify];
+        BNCSleepForTimeInterval(0.001); // Allow for mock class to be un-mocked.
+    }
 }
 
 - (void)testDebugRequestsArentPersisted {
-
-    XCTestExpectation *expectation = [self expectationWithDescription:@"PersistExpectation"];
-    id archiverMock = OCMClassMock([NSKeyedArchiver class]);
-    [[archiverMock reject] archiveRootObject:[OCMArg any] toFile:[OCMArg any]];
-    [[[archiverMock expect]
-        andReturn:[NSData data]]
-            archivedDataWithRootObject:[OCMArg checkWithBlock:^BOOL(NSArray *reqs) {
-                if ([reqs isKindOfClass:[NSArray class]]) {
-                    XCTAssert(reqs.count == 0);
-                    BNCAfterSecondsPerformBlock(0.01, ^{ [self safelyFulfillExpectation:expectation]; });
-                    return YES;
-                }
-                return NO;
-            }]];
-            
-    BNCServerRequestQueue *requestQueue = [[BNCServerRequestQueue alloc] init];
-    [requestQueue persistImmediately];
-
-    // Wait for operation to occur    
-    [self awaitExpectations];
-    [archiverMock verify];
-    //[archiverMock stopMocking];
+    @autoreleasepool {
+        XCTestExpectation *expectation = [self expectationWithDescription:@"PersistExpectation"];
+        id archiverMock = OCMClassMock([NSKeyedArchiver class]);
+        [[archiverMock reject] archiveRootObject:[OCMArg any] toFile:[OCMArg any]];
+        [[[archiverMock expect]
+            andReturn:[NSData data]]
+                archivedDataWithRootObject:[OCMArg checkWithBlock:^BOOL(NSArray *reqs) {
+                    if ([reqs isKindOfClass:[NSArray class]]) {
+                        XCTAssert(reqs.count == 0);
+                        BNCAfterSecondsPerformBlock(0.01, ^{ [self safelyFulfillExpectation:expectation]; });
+                        return YES;
+                    }
+                    return NO;
+                }]];
+                
+        BNCServerRequestQueue *requestQueue = [[BNCServerRequestQueue alloc] init];
+        [requestQueue persistImmediately];
+
+        // Wait for operation to occur    
+        [self awaitExpectations];
+        [archiverMock verify];
+        BNCSleepForTimeInterval(0.001); // Allow for mock class to be un-mocked.
+    }
 }
 
 #pragma mark - Retrieve Tests

Branch-TestBed/Branch-SDK-Tests/BNCTestCase.h

@@ -18,6 +18,15 @@ static inline void BNCAfterSecondsPerformBlock(NSTimeInterval seconds, dispatch_
 	dispatch_after(BNCDispatchTimeFromSeconds(seconds), dispatch_get_main_queue(), block);
 }
 
+static inline void BNCSleepForTimeInterval(NSTimeInterval seconds) {
+    double secPart = trunc(seconds);
+    double nanoPart = trunc((seconds - secPart) * ((double)NSEC_PER_SEC));
+    struct timespec sleepTime;
+    sleepTime.tv_sec = (typeof(sleepTime.tv_sec)) secPart;
+    sleepTime.tv_nsec = (typeof(sleepTime.tv_nsec)) nanoPart;
+    nanosleep(&sleepTime, NULL);
+}
+
 
 @interface BNCTestCase : XCTestCase
 

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

@@ -22,15 +22,12 @@ + (void)setUp {
     if (!preferenceHelper.deviceFingerprintID) {
         preferenceHelper.deviceFingerprintID = @"foo_fingerprint";
     }
-
     if (!preferenceHelper.identityID) {
         preferenceHelper.identityID = @"foo_identity";
     }
-
     if (!preferenceHelper.sessionID) {
         preferenceHelper.sessionID = @"foo_sesion";
     }
-    
     preferenceHelper.isDebug = NO;
 }
 
@@ -40,7 +37,7 @@ - (void)setUp {
 }
 
 - (void) testFailure {
-    // Un-comment to test a failure case:
+    // Un-comment the next line to test a failure case:
     // XCTAssert(NO, @"Testing a test failure!");
     NSString * bundleID = [NSBundle mainBundle].bundleIdentifier;
     NSLog(@"The test bundleID is '%@'.", bundleID);