Merge pull request #833 from BranchMetrics/share-source-DEVEX-332

Clean Up Source for Sharing Between Projects DEVEX-332

Author: E-B-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/BNCApplication+BNCTest.h

@@ -0,0 +1,20 @@
+/**
+ @file          BNCApplication+BNCTest.h
+ @package       Branch-SDK-Tests
+ @brief         Expose BNCApplication interfaces for testing.
+
+ @author        Edward Smith
+ @date          May 4, 2018
+ @copyright     Copyright © 2018 Branch. All rights reserved.
+*/
+
+#import <Foundation/Foundation.h>
+#import "BNCApplication.h"
+
+@interface BNCApplication (BNCTest)
+
+- (void) setAppOriginalInstallDate:(NSDate*)originalInstallDate
+        firstInstallDate:(NSDate*)firstInstallDate
+        lastUpdateDate:(NSDate*)lastUpdateDate;
+
+@end

Branch-SDK-Tests/Branch-SDK-Tests/BNCApplication+BNCTest.m

@@ -0,0 +1,11 @@
+/**
+ @file          BNCApplication+BNCTest.m
+ @package       Branch-SDK-Tests
+ @brief         Expose BNCApplication interfaces for testing.
+
+ @author        Edward Smith
+ @date          May 4, 2018
+ @copyright     Copyright © 2018 Branch. All rights reserved.
+*/
+
+#import "BNCApplication+BNCTest.h"

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

@@ -1,23 +1,16 @@
+/**
+ @file          BNCDebug.Test.m
+ @package       Branch-SDK
+ @brief         Tests for BNCDebug.
 
+ @author        Edward Smith
+ @date          October 2016
+ @copyright     Copyright © 2016 Branch. All rights reserved.
+*/
 
-//--------------------------------------------------------------------------------------------------
-//
-//                                                                                   BNCDebug.Test.m
-//                                                                                  Branch.framework
-//
-//                                                                                 Debugging Support
-//                                                                        Edward Smith, October 2016
-//
-//                                             -©- Copyright © 2016 Branch, all rights reserved. -©-
-//
-//--------------------------------------------------------------------------------------------------
-
-
-#import <XCTest/XCTest.h>
 #import "BNCDebug.h"
 #import "BNCTestCase.h"
 
-
 #pragma mark Test DumpClass
 
 @interface DumpClass : NSObject {
@@ -190,7 +183,7 @@ - (void) testClassList {
 
 - (void) testBreakpoint {
     // if (BNCDebuggerIsAttached()) {
-    if (self.class.testBreakpoints) {
+    if (self.class.breakpointsAreEnabledInTests) {
         BNCDebugBreakpoint();
     }
 }

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

@@ -1,27 +1,20 @@
+/**
+ @file          BNCError.Test.m
+ @package       Branch-SDK
+ @brief         Branch error tests.
 
-
-//--------------------------------------------------------------------------------------------------
-//
-//                                                                                   BNCError.Test.m
-//                                                                                       BranchTests
-//
-//                                                                                       Error Tests
-//                                                                         Edward Smith, August 2017
-//
-//                                             -©- Copyright © 2017 Branch, all rights reserved. -©-
-//
-//--------------------------------------------------------------------------------------------------
-
+ @author        Edward Smith
+ @date          August 2017
+ @copyright     Copyright © 2017 Branch. All rights reserved.
+*/
 
 #import "BNCTestCase.h"
 #import "BNCError.h"
 #import "BNCLocalization.h"
 
-
 @interface BNCErrorTest : BNCTestCase
 @end
 
-
 @implementation BNCErrorTest
 
 - (void) testErrorBasic {

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

@@ -10,7 +10,7 @@
 
 #import "BNCTestCase.h"
 #import "BNCKeyChain.h"
-#import "BNCApplication.h"
+//#import "BNCApplication.h"
 
 @interface BNCKeyChainTest : BNCTestCase
 @end
@@ -46,6 +46,7 @@ - (void)testKeyChain {
     value = [BNCKeyChain retrieveValueForService:kServiceName key:@"key3" error:&error];
     XCTAssertTrue(value == nil && error.code == errSecItemNotFound);
 
+    // TODO: Fix this.
     if ([UIApplication sharedApplication] == nil) {
         NSLog(@"No host application for keychain testing!");
         return;

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

@@ -1,26 +1,19 @@
+/**
+ @file          BNCLocalization.Test.m
+ @package       Branch-SDK
+ @brief         Branch string localization tests.
 
-
-//--------------------------------------------------------------------------------------------------
-//
-//                                                                            BNCLocalization.Test.m
-//                                                                                       BranchTests
-//
-//                                                                                Localization Tests
-//                                                                           Edward Smith, July 2017
-//
-//                                             -©- Copyright © 2017 Branch, all rights reserved. -©-
-//
-//--------------------------------------------------------------------------------------------------
-
+ @author        Edward Smith
+ @date          July 2017
+ @copyright     Copyright © 2017 Branch. All rights reserved.
+*/
 
 #import "BNCTestCase.h"
 #import "BNCLocalization.h"
 
-
 @interface BNCLocalizationTest : BNCTestCase
 @end
 
-
 @implementation BNCLocalizationTest
 
 - (void) testLocalizationBasic {
@@ -37,10 +30,13 @@ - (void) testLocalizationBasic {
     string = BNCLocalizedString(truth);
     XCTAssertEqualObjects(string, truth);
 
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wall"
     // Nil input should return empty string output.
     truth = @"";
     string = BNCLocalizedString(nil);
     XCTAssertEqualObjects(string, truth);
+    #pragma clang diagnostic pop
 
     // Test formatted language strings.
     truth = @"Test formatted language strings.";
@@ -52,9 +48,12 @@ - (void) testLocalizationBasic {
     string = BNCLocalizedFormattedString(@"Test formatted %@ strings float %1.2f.", @"language", 1.0);
     XCTAssertEqualObjects(string, truth);
 
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wall"
     truth = @"";
     string = BNCLocalizedFormattedString(nil, 1.0);
     XCTAssertEqualObjects(string, truth);
+    #pragma clang diagnostic pop
 }
 
 - (void) testLocalizationRussian {

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

@@ -1,36 +1,27 @@
-
-
-//--------------------------------------------------------------------------------------------------
-//
-//                                                                                     BNCLog.Test.m
-//                                                                                       BranchTests
-//
-//                                                                          Simple logging functions
-//                                                                        Edward Smith, October 2016
-//
-//                                             -©- Copyright © 2016 Branch, all rights reserved. -©-
-//
-//--------------------------------------------------------------------------------------------------
-
+/**
+ @file          BNCLog.Test.m
+ @package       BranchTests
+ @brief         Tests for BNCLog.
+
+ @author        Edward Smith
+ @date          October 2016
+ @copyright     Copyright © 2016 Branch. All rights reserved.
+*/
 
 #import <XCTest/XCTest.h>
 #import "BNCLog.h"
 #import "NSString+Branch.h"
 #import "BNCTestCase.h"
 
-
 static NSString* globalTestLogString = nil;
 
-
 void TestLogProcedure(NSDate*timestamp, BNCLogLevel level, NSString* message) {
     globalTestLogString = [message copy];
 }
 
-
 @interface BNCLogTest : BNCTestCase
 @end
 
-
 @implementation BNCLogTest
 
 - (void) dealloc {
@@ -63,7 +54,7 @@ - (void) testLogLineNumbers {
     BNCLog(@"Debug message with no parameters.");
     BNCLogFlushMessages();
     XCTAssertEqualObjects(globalTestLogString,
-        @"[branch.io] BNCLog.Test.m(63) Log: Debug message with no parameters.");
+        @"[branch.io] BNCLog.Test.m(54) Log: Debug message with no parameters.");
 }
 
 - (void) testLog {
@@ -95,7 +86,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 +289,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/BNCServerInterface.Test.m

@@ -49,7 +49,7 @@ - (void)testParamAddForBranchKey {
         if (callCount == 1) {
             BOOL foundIt = ([request.URL.query rangeOfString:@"branch_key=key_"].location != NSNotFound);
             XCTAssertTrue(foundIt, @"Branch Key not added");
-            BNCAfterSecondsPerformBlock(0.01, ^{ [expectation fulfill]; });
+            BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{ [expectation fulfill]; });
             return YES;
         }
         return NO;
@@ -108,7 +108,10 @@ - (void)testGetRequestAsyncRetriesWhenAppropriate {
           // Return actual data afterwards
           ++successfulConnections;
           XCTAssertEqual(connectionAttempts, failedConnections + successfulConnections);
-          BNCAfterSecondsPerformBlock(0.01, ^{ NSLog(@"==> Fullfill."); [successExpectation fulfill]; });
+          BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{
+            NSLog(@"==> Fullfill.");
+            [successExpectation fulfill];
+          });
 
           NSDictionary* dummyJSONResponse = @{@"key": @"value"};
           return [OHHTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:200 headers:nil];
@@ -153,7 +156,7 @@ - (void)testGetRequestAsyncRetriesWhenInappropriateResponse {
         NSDictionary* dummyJSONResponse = @{@"key": @"value"};
         connectionAttempts++;
         XCTAssertEqual(connectionAttempts, 1);
-        BNCAfterSecondsPerformBlock(0.01, ^ {
+        BNCAfterSecondsPerformBlockOnMainThread(0.01, ^ {
             [successExpectation fulfill];
         });
         return [OHHTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:200 headers:nil];
@@ -191,7 +194,7 @@ - (void)testGetRequestAsyncRetriesWhenInappropriateRetryCount {
         NSDictionary* dummyJSONResponse = @{@"key": @"value"};
         connectionAttempts++;
         XCTAssertEqual(connectionAttempts, 1);
-        BNCAfterSecondsPerformBlock(0.01, ^{
+        BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{
             [successExpectation fulfill];
         });
         return [OHHTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:200 headers:nil];
@@ -243,7 +246,10 @@ - (void)testPostRequestAsyncRetriesWhenAppropriate {
       ++successfulConnections;
       NSDictionary* dummyJSONResponse = @{@"key": @"value"};
       XCTAssertEqual(connectionAttempts, failedConnections + successfulConnections);
-      BNCAfterSecondsPerformBlock(0.01, ^ { NSLog(@"==>> Fullfill <<=="); [successExpectation fulfill]; });
+      BNCAfterSecondsPerformBlockOnMainThread(0.01, ^ {
+        NSLog(@"==>> Fullfill <<==");
+        [successExpectation fulfill];
+      });
       return [OHHTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:200 headers:nil];
 
     } else {
@@ -284,8 +290,7 @@ - (void)testPostRequestAsyncRetriesWhenInappropriateResponse {
     NSDictionary* dummyJSONResponse = @{@"key": @"value"};
     connectionAttempts++;
     XCTAssertEqual(connectionAttempts, 1);
-    BNCAfterSecondsPerformBlock(0.01, ^{ [successExpectation fulfill]; });
-    
+    BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{ [successExpectation fulfill]; });
     return [OHHTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:200 headers:nil];
 
   }];
@@ -321,10 +326,8 @@ - (void)testPostRequestAsyncRetriesWhenInappropriateRetryCount {
     NSDictionary* dummyJSONResponse = @{@"key": @"value"};
     connectionAttempts++;
     XCTAssertEqual(connectionAttempts, 1);
-    BNCAfterSecondsPerformBlock(0.01, ^{ [successExpectation fulfill]; });
-    
+    BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{ [successExpectation fulfill]; });
     return [OHHTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:200 headers:nil];
-    
   }];
 
   [serverInterface getRequest:nil url:@"http://foo" key:@"key_live_foo" callback:NULL];

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

@@ -154,7 +154,9 @@ - (void)testCloseRequestsArentPersisted {
                 archivedDataWithRootObject:[OCMArg checkWithBlock:^BOOL(NSArray *reqs) {
                     if ([reqs isKindOfClass:[NSArray class]]) {
                         XCTAssert(reqs.count == 0);
-                        BNCAfterSecondsPerformBlock(0.01, ^{ [self safelyFulfillExpectation:expectation]; });
+                        BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{
+                            [self safelyFulfillExpectation:expectation];
+                        });
                         return YES;
                     }
                     return NO;
@@ -182,7 +184,9 @@ - (void)testDebugRequestsArentPersisted {
                 archivedDataWithRootObject:[OCMArg checkWithBlock:^BOOL(NSArray *reqs) {
                     if ([reqs isKindOfClass:[NSArray class]]) {
                         XCTAssert(reqs.count == 0);
-                        BNCAfterSecondsPerformBlock(0.01, ^{ [self safelyFulfillExpectation:expectation]; });
+                        BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{
+                            [self safelyFulfillExpectation:expectation];
+                        });
                         return YES;
                     }
                     return NO;