Merge from Apple-Shared-Source.

Author: Edward Smith

.gitignore

@@ -9,6 +9,9 @@
 # *.xcscmblueprint # We should probably check this in.
 *.o
 
+# merge-repo commit/discard file
+merge-repo-commit
+
 # Pods
 Pods/
 Podfile.lock

Branch-SDK-Tests/Branch-SDK-Tests/BNCDebug.Test.m

@@ -13,7 +13,6 @@
 //--------------------------------------------------------------------------------------------------
 
 
-#import <XCTest/XCTest.h>
 #import "BNCDebug.h"
 #import "BNCTestCase.h"
 
@@ -190,7 +189,7 @@ - (void) testClassList {
 
 - (void) testBreakpoint {
     // if (BNCDebuggerIsAttached()) {
-    if (self.class.testBreakpoints) {
+    if (self.class.breakpointsAreEnabledInTests) {
         BNCDebugBreakpoint();
     }
 }

Branch-SDK-Tests/Branch-SDK-Tests/BNCLog.Test.m

@@ -95,7 +95,7 @@ - (void) testLog {
 
     //  Test breakpoints --
 
-    if (self.class.testBreakpoints) {  // Test break points too:
+    if (self.class.breakpointsAreEnabledInTests) {  // Test break points too:
         BNCLogSetBreakPointsEnabled(YES);
         BNCLogBreakPoint();
         XCTAssert([globalTestLogString bnc_isEqualToMaskedString:
@@ -298,7 +298,10 @@ - (void) testTripleLengthLogMessages {
 - (void) testLogObject {
     BNCLogSetOutputFunction(TestLogProcedure);
     NSData *data = [@"Test string." dataUsingEncoding:NSUTF8StringEncoding];
-    BNCLog(data);
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wformat-security"
+    BNCLog((id)data);
+    #pragma clang diagnostic pop
     BNCLogFlushMessages();
     XCTAssert([globalTestLogString bnc_isEqualToMaskedString:
         @"[branch.io] BNCLog.Test.m(***) Log: "

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

@@ -2,31 +2,14 @@
 //  BNCTestCase.h
 //  Branch-TestBed
 //
-//  Created by Graham Mueller on 4/27/15.
-//  Copyright (c) 2015 Branch Metrics. All rights reserved.
+//  Created by Edward Smith on 4/27/17.
+//  Copyright (c) 2017 Branch Metrics. All rights reserved.
 //
 
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
-#import "Branch.h"
 #import "NSString+Branch.h"
-
-static inline dispatch_time_t BNCDispatchTimeFromSeconds(NSTimeInterval seconds) {
-	return dispatch_time(DISPATCH_TIME_NOW, seconds * NSEC_PER_SEC);
-}
-
-static inline void BNCAfterSecondsPerformBlock(NSTimeInterval seconds, dispatch_block_t block) {
-	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);
-}
+#import "BNCUtilities.h"
 
 #define BNCTAssertEqualMaskedString(string, mask) { \
     if ((id)string != nil && (id)mask != nil && [string bnc_isEqualToMaskedString:mask]) { \
@@ -52,11 +35,6 @@ extern BOOL BNCTestStringMatchesRegex(NSString *string, NSString *regex);
 - (NSString*)stringFromBundleWithKey:(NSString*)key;
 - (NSMutableDictionary*) mutableDictionaryFromBundleJSONWithKey:(NSString*)key;
 
-+ (BOOL) testBreakpoints;
-
-+ (void) setAppOriginalInstallDate:(NSDate*)originalInstallDate
-        firstInstallDate:(NSDate*)firstInstallDate
-        lastUpdateDate:(NSDate*)lastUpdateDate
-        previousUpdateDate:(NSDate*)previousUpdateDate;
++ (BOOL) breakpointsAreEnabledInTests;
 
 @end

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

@@ -2,26 +2,21 @@
 //  BNCTestCase.m
 //  Branch-TestBed
 //
-//  Created by Graham Mueller on 4/27/15.
-//  Copyright (c) 2015 Branch Metrics. All rights reserved.
+//  Created by Edward Smith on 4/27/17.
+//  Copyright (c) 2017 Branch Metrics. All rights reserved.
 //
 
 #import "BNCTestCase.h"
-#import "BNCApplication.h"
 #import "BNCLog.h"
-#import "BNCPreferenceHelper.h"
 
-@interface BNCApplication (BNCTestCase)
-- (void) setAppOriginalInstallDate:(NSDate*)originalInstallDate
-        firstInstallDate:(NSDate*)firstInstallDate
-        lastUpdateDate:(NSDate*)lastUpdateDate;
-@end
+NSString* kTestStringResourceName = @"BNCTestCase"; // File is 'BNCTestCase.strings'. Omit the '.string'.
 
 #pragma mark - BNCTestStringMatchesRegex
 
 BOOL BNCTestStringMatchesRegex(NSString *string, NSString *regex) {
     NSError *error = nil;
-    NSRegularExpression* nsregex = [NSRegularExpression regularExpressionWithPattern:regex options:0 error:&error];
+    NSRegularExpression* nsregex =
+        [NSRegularExpression regularExpressionWithPattern:regex options:0 error:&error];
     if (error) {
         NSLog(@"Error in regex pattern: %@.", error);
         return NO;
@@ -39,34 +34,11 @@ @interface BNCTestCase ()
 
 @implementation BNCTestCase
 
-+ (void)setUp {
-    [super setUp];
-
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
-    if (!preferenceHelper.deviceFingerprintID) {
-        preferenceHelper.deviceFingerprintID = @"foo_fingerprint";
-    }
-    if (!preferenceHelper.identityID) {
-        preferenceHelper.identityID = @"foo_identity";
-    }
-    if (!preferenceHelper.sessionID) {
-        preferenceHelper.sessionID = @"foo_sesion";
-    }
-    preferenceHelper.isDebug = NO;
-}
-
 - (void)setUp {
     [super setUp];
     [self resetExpectations];
 }
 
-- (void) testFailure {
-    // 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);
-}
-
 - (void)resetExpectations {
     self.hasExceededExpectations = NO;
 }
@@ -99,13 +71,13 @@ - (id)stringMatchingPattern:(NSString *)pattern {
 - (NSString*) stringFromBundleWithKey:(NSString*)key {
     NSString *const kItemNotFound = @"<Item-Not-Found>";
     NSString *resource =
-        [[NSBundle bundleForClass:self.class] localizedStringForKey:key value:kItemNotFound table:@"Branch-SDK-Tests"];
+        [[NSBundle bundleForClass:self.class]
+            localizedStringForKey:key value:kItemNotFound table:kTestStringResourceName];
     if ([resource isEqualToString:kItemNotFound]) resource = nil;
     return resource;
 }
 
 - (NSMutableDictionary*) mutableDictionaryFromBundleJSONWithKey:(NSString*)key {
-
     NSString *jsonString = [self stringFromBundleWithKey:key];
     XCTAssertTrue(jsonString, @"Can't load '%@' resource from bundle JSON!", key);
 
@@ -119,10 +91,10 @@ - (NSMutableDictionary*) mutableDictionaryFromBundleJSONWithKey:(NSString*)key {
     return mutableDictionary;
 }
 
-static BOOL _testBreakpoints = NO;
+static BOOL _breakpointsAreEnabledInTests = NO;
 
-+ (BOOL) testBreakpoints {
-    return _testBreakpoints;
++ (BOOL) breakpointsAreEnabledInTests {
+    return _breakpointsAreEnabledInTests;
 }
 
 + (void) initialize {
@@ -132,24 +104,10 @@ + (void) initialize {
     // Load test options from environment variables:
 
     NSDictionary<NSString*, NSString*> *environment = [NSProcessInfo processInfo].environment;
-    NSString *BNCTestBreakpoints = environment[@"BNCTestBreakpoints"];
+    NSString *BNCTestBreakpoints = environment[@"BNCTestBreakpointsEnabled"];
     if ([BNCTestBreakpoints boolValue]) {
-        _testBreakpoints = YES;
+        _breakpointsAreEnabledInTests = YES;
     }
 }
 
-+ (void) setAppOriginalInstallDate:(NSDate*)originalInstallDate
-        firstInstallDate:(NSDate*)firstInstallDate
-        lastUpdateDate:(NSDate*)lastUpdateDate
-        previousUpdateDate:(NSDate*)previousUpdateDate {
-
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
-    BNCApplication *application = [BNCApplication currentApplication];
-    [application setAppOriginalInstallDate:originalInstallDate
-        firstInstallDate:firstInstallDate
-        lastUpdateDate:lastUpdateDate];
-    preferenceHelper.previousAppBuildDate = previousUpdateDate; // previous_update_time
-    [preferenceHelper synchronize];
-}
-
 @end

Branch-SDK-Tests/Branch-SDK-Tests/NSString+Branch.Test.m

@@ -13,7 +13,6 @@
 //--------------------------------------------------------------------------------------------------
 
 
-#import <XCTest/XCTest.h>
 #import "NSString+Branch.h"
 #import "BNCTestCase.h"
 

Branch-SDK/Branch-SDK/BNCLog.h

@@ -132,9 +132,9 @@ extern void BNCLogWriteMessageFormat(
     BNCLogLevel logLevel,
     const char *_Nullable sourceFileName,
     int32_t sourceLineNumber,
-    id _Nullable messageFormat,
+    NSString* _Nullable messageFormat,
     ...
-);
+) NS_FORMAT_FUNCTION(4,5);
 
 /// Swift-friendly wrapper for BNCLogWriteMessageFormat
 extern void BNCLogWriteMessage(