Fixed a logging test and updated some file names.

Author: E-B-Smith

Branch-SDK/Branch-SDK/BNCLog.m

@@ -217,6 +217,7 @@ BOOL BNCLogRecordWrapOpenURL_Internal(NSURL *url, long maxRecords, long recordSi
 
     off_t oldestOffset = 0;
     NSDate * oldestDate = [NSDate distantFuture];
+    NSDate * lastDate = [NSDate distantFuture];
 
     off_t offset = 0;
     char buffer[bnc_LogRecordSize];
@@ -225,11 +226,13 @@ BOOL BNCLogRecordWrapOpenURL_Internal(NSURL *url, long maxRecords, long recordSi
         NSString *dateString =
             [[NSString alloc] initWithBytes:buffer length:27 encoding:NSUTF8StringEncoding];
         NSDate *date = [bnc_LogDateFormatter dateFromString:dateString];
-        if (date && [date compare:oldestDate] < 0) {
+        if ([date compare:oldestDate] < 0 ||
+              [date compare:lastDate] < 0) {
             oldestOffset = offset;
             oldestDate = date;
         }
         offset++;
+        if (date) lastDate = date;
         bytesRead = read(bnc_LogDescriptor, &buffer, sizeof(buffer));
     }
     if (offset < bnc_LogOffsetMax)
@@ -638,7 +641,7 @@ void BNCLogFlushMessages() {
 __attribute__((constructor)) void BNCLogInitialize(void) {
     static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^ {
-        bnc_LogQueue = dispatch_queue_create("io.branch.log", DISPATCH_QUEUE_SERIAL);
+        bnc_LogQueue = dispatch_queue_create("io.branch.sdk.log", DISPATCH_QUEUE_SERIAL);
 
         bnc_LogDateFormatter = [[NSDateFormatter alloc] init];
         bnc_LogDateFormatter.locale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];

Branch-SDK/Branch-SDK/Networking/BNCNetworkService.m

@@ -144,7 +144,7 @@ - (NSURLSession*) session {
         configuration.URLCache = nil;
 
         self.sessionQueue = [NSOperationQueue new];
-        self.sessionQueue.name = @"io.branch.network.queue";
+        self.sessionQueue.name = @"io.branch.sdk.network.queue";
         self.sessionQueue.maxConcurrentOperationCount = self.maximumConcurrentOperations;
         if ([self.sessionQueue respondsToSelector:@selector(setQualityOfService:)]) {
             // qualityOfService is iOS 8 and above.
@@ -155,7 +155,7 @@ - (NSURLSession*) session {
             [NSURLSession sessionWithConfiguration:configuration
                 delegate:self
                 delegateQueue:self.sessionQueue];
-        _session.sessionDescription = @"io.branch.network.session";
+        _session.sessionDescription = @"io.branch.sdk.network.session";
 
         return _session;
     }

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

@@ -436,10 +436,14 @@ - (void) testLogFunctionOutputToURLRecordWrap {
          "****-**-**T**:**:**.******Z 6 [branch.io] BNCLog.Test.m(***) Log: Log 20.      \n"
          "****-**-**T**:**:**.******Z 6 [branch.io] BNCLog.Test.m(***) Log: Log 21.      \n"
          "****-**-**T**:**:**.******Z 6 [branch.io] BNCLog.Test.m(***) Log: Log 22.      \n";
-    NSLog(@"testLogFunctionOutputToURLRecordWrap truth/string:\n%@\n%@.", truth, string); // TODO: Remove log.
     XCTAssert([string bnc_isEqualToMaskedString:truth]);
 }
 
+- (void) testStressRecordWrap {
+    for (int i = 0; i < 1000; i++)
+        [self testLogFunctionOutputToURLRecordWrap];
+}
+
 - (void) testLogRecordWrapPerformanceTesting {
 
     NSError *error = nil;
@@ -706,6 +710,11 @@ - (void) testLogFunctionOutputToURLByteWrap {
     XCTAssert([string bnc_isEqualToMaskedString:truth]);
 }
 
+- (void) testStressByteWrap {
+    for (int i = 0; i < 1000; i++)
+        [self testLogFunctionOutputToURLByteWrap];
+}
+
 - (void) testLogByteWrapPerformanceTesting {
 
     NSError *error = nil;
@@ -801,7 +810,6 @@ - (void) testLogByteWrapPerformanceTesting {
     NSLog(@"%@: Synchronized time: %1.5f.",
         BNCSStringForCurrentMethod(), - startTime.timeIntervalSinceNow);
 
-
 /*  //  Non-sychronized --
     //  EBS: Non-sychronized is no longer a thing. It was slower and less safe.
     

…TestBed/Branch-TestBedUITests/Info.plist …estBed/Branch-TestBed-UITests/Info.plistBranch-TestBed/Branch-TestBedUITests/Info.plist renamed to Branch-TestBed/Branch-TestBed-UITests/Info.plist Branch-TestBed/Branch-TestBedUITests/Info.plist renamed to Branch-TestBed/Branch-TestBed-UITests/Info.plist

@@ -5,35 +5,39 @@
 //  Created by Parth Kalavadia on 8/2/17.
 //  Copyright © 2017 Branch Metrics. All rights reserved.
 //
+
 #import <XCTest/XCTest.h>
 
 static NSTimeInterval const kDeepLinkSleepTimeInterval = 10.0;
 static NSTimeInterval const kLoadWikiPageTimeInterval  = 3.0;
-static NSString* const kWikiPageURL      = @"https://github.com/BranchMetrics/ios-branch-deep-linking/wiki/UITest-for-Testbed-App-for-Universal-links";
+static NSString* const kWikiPageURL =
+    @"https://github.com/BranchMetrics/ios-branch-deep-linking/wiki/"
+     "UITest-for-Testbed-App-for-Universal-links";
 static NSString* const kUniversalLinkTag = @"Universal Link TestBed Obj-c";
-@interface Branch_TestBedUITests : XCTestCase
 
 
+@interface TestBedUITests : XCTestCase
 @end
 
 @interface XCUIApplication (Private)
 - (id)initPrivateWithPath:(NSString *)path bundleID:(NSString *)bundleID;
 - (void)resolve;
 @end
 
-@implementation Branch_TestBedUITests
+@implementation TestBedUITests
 
 - (void)setUp {
     [super setUp];
-    
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-    
+
     // In UI tests it is usually best to stop immediately when a failure occurs.
     self.continueAfterFailure = NO;
-    // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
+
+    // UI tests must launch the application that they test.
+    // Doing this in setup will make sure it happens for each test method.
     [[[XCUIApplication alloc] init] launch];
 
-    // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
+    // In UI tests it’s important to set the initial state - such as interface orientation -
+    // required for your tests before they run. The setUp method is a good place to do this.
 }
 
 - (void)tearDown {
@@ -54,16 +58,15 @@ -(void)testDeepLinking {
 }
 
 -(XCUIApplication *) openSafariWithUrl: (NSString*) url {
-    XCUIApplication *app = [[XCUIApplication alloc] initPrivateWithPath:nil bundleID:@"com.apple.mobilesafari"];
+    XCUIApplication *app =
+        [[XCUIApplication alloc] initPrivateWithPath:nil bundleID:@"com.apple.mobilesafari"];
     [app launch];
-    
     [app.otherElements[@"URL"] tap];
     [app.textFields[@"Search or enter website name"] tap];
     [app typeText:url];
     [app.buttons[@"Go"] tap];
     sleep(kLoadWikiPageTimeInterval);
     return app;
-    
 }
 
 @end

…h-TestBedUITests/Branch_TestBedUITests.m …/Branch-TestBed-UITests/TestBedUITests.mBranch-TestBed/Branch-TestBedUITests/Branch_TestBedUITests.m renamed to Branch-TestBed/Branch-TestBed-UITests/TestBedUITests.m Branch-TestBed/Branch-TestBedUITests/Branch_TestBedUITests.m renamed to Branch-TestBed/Branch-TestBed-UITests/TestBedUITests.m

@@ -115,7 +115,7 @@
 		E2B9474A1D15D75000F2270D /* BNCCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = E2B947491D15D73900F2270D /* BNCCallbacks.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F1D359201ED4DCC500A93FD5 /* BNCDeepLinkViewControllerInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = F1D3591E1ED4DCC500A93FD5 /* BNCDeepLinkViewControllerInstance.h */; };
 		F1D359211ED4DCC500A93FD5 /* BNCDeepLinkViewControllerInstance.m in Sources */ = {isa = PBXBuildFile; fileRef = F1D3591F1ED4DCC500A93FD5 /* BNCDeepLinkViewControllerInstance.m */; };
-		F1D4F9AF1F323F01002D13FF /* Branch_TestBedUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F1D4F9AE1F323F01002D13FF /* Branch_TestBedUITests.m */; };
+		F1D4F9AF1F323F01002D13FF /* TestBedUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F1D4F9AE1F323F01002D13FF /* TestBedUITests.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -318,7 +318,7 @@
 		F1D3591E1ED4DCC500A93FD5 /* BNCDeepLinkViewControllerInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCDeepLinkViewControllerInstance.h; sourceTree = "<group>"; };
 		F1D3591F1ED4DCC500A93FD5 /* BNCDeepLinkViewControllerInstance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCDeepLinkViewControllerInstance.m; sourceTree = "<group>"; };
 		F1D4F9AC1F323F01002D13FF /* Branch-TestBed-UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Branch-TestBed-UITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		F1D4F9AE1F323F01002D13FF /* Branch_TestBedUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Branch_TestBedUITests.m; sourceTree = "<group>"; };
+		F1D4F9AE1F323F01002D13FF /* TestBedUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestBedUITests.m; sourceTree = "<group>"; };
 		F1D4F9B01F323F01002D13FF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -445,7 +445,7 @@
 				670016BB1946309100A9E103 /* Branch-SDK */,
 				7E6B3B521AA42D0E005F45BF /* Branch-SDK-Tests */,
 				670016691940F51400A9E103 /* Branch-TestBed */,
-				F1D4F9AD1F323F01002D13FF /* Branch-TestBedUITests */,
+				F1D4F9AD1F323F01002D13FF /* Branch-TestBed-UITests */,
 				E220F4281C7D39D500F5B126 /* Fabric */,
 				670016621940F51400A9E103 /* Frameworks */,
 				670016611940F51400A9E103 /* Products */,
@@ -655,13 +655,13 @@
 			name = Fabric;
 			sourceTree = "<group>";
 		};
-		F1D4F9AD1F323F01002D13FF /* Branch-TestBedUITests */ = {
+		F1D4F9AD1F323F01002D13FF /* Branch-TestBed-UITests */ = {
 			isa = PBXGroup;
 			children = (
-				F1D4F9AE1F323F01002D13FF /* Branch_TestBedUITests.m */,
+				F1D4F9AE1F323F01002D13FF /* TestBedUITests.m */,
 				F1D4F9B01F323F01002D13FF /* Info.plist */,
 			);
-			path = "Branch-TestBedUITests";
+			path = "Branch-TestBed-UITests";
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -804,8 +804,8 @@
 			projectRoot = "";
 			targets = (
 				466B58371B17773000A69EDE /* Branch */,
-				6700165F1940F51400A9E103 /* Branch-TestBed */,
 				7E6B3B501AA42D0E005F45BF /* Branch-SDK-Tests */,
+				6700165F1940F51400A9E103 /* Branch-TestBed */,
 				F1D4F9AB1F323F01002D13FF /* Branch-TestBed-UITests */,
 			);
 		};
@@ -1002,7 +1002,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F1D4F9AF1F323F01002D13FF /* Branch_TestBedUITests.m in Sources */,
+				F1D4F9AF1F323F01002D13FF /* TestBedUITests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1265,7 +1265,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = R63EM248DP;
-				INFOPLIST_FILE = "Branch-TestBedUITests/Info.plist";
+				INFOPLIST_FILE = "Branch-TestBed-UITests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1284,7 +1284,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = R63EM248DP;
-				INFOPLIST_FILE = "Branch-TestBedUITests/Info.plist";
+				INFOPLIST_FILE = "Branch-TestBed-UITests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";