Skip to content

Commit a032da2

Browse files
author
Edward Smith
committed
Merge from Apple-Shared-Source.
1 parent 3d45bc8 commit a032da2

File tree

13 files changed

+124
-134
lines changed

13 files changed

+124
-134
lines changed

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1+
/**
2+
@file BNCDebug.Test.m
3+
@package Branch-SDK
4+
@brief Tests for BNCDebug.
15
2-
3-
//--------------------------------------------------------------------------------------------------
4-
//
5-
// BNCDebug.Test.m
6-
// Branch.framework
7-
//
8-
// Debugging Support
9-
// Edward Smith, October 2016
10-
//
11-
// -©- Copyright © 2016 Branch, all rights reserved. -©-
12-
//
13-
//--------------------------------------------------------------------------------------------------
14-
6+
@author Edward Smith
7+
@date October 2016
8+
@copyright Copyright © 2016 Branch. All rights reserved.
9+
*/
1510

1611
#import "BNCDebug.h"
1712
#import "BNCTestCase.h"
1813

19-
2014
#pragma mark Test DumpClass
2115

2216
@interface DumpClass : NSObject {

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

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,27 @@
1-
2-
3-
//--------------------------------------------------------------------------------------------------
4-
//
5-
// BNCLog.Test.m
6-
// BranchTests
7-
//
8-
// Simple logging functions
9-
// Edward Smith, October 2016
10-
//
11-
// -©- Copyright © 2016 Branch, all rights reserved. -©-
12-
//
13-
//--------------------------------------------------------------------------------------------------
14-
1+
/**
2+
@file BNCLog.Test.m
3+
@package BranchTests
4+
@brief Tests for BNCLog.
5+
6+
@author Edward Smith
7+
@date October 2016
8+
@copyright Copyright © 2016 Branch. All rights reserved.
9+
*/
1510

1611
#import <XCTest/XCTest.h>
1712
#import "BNCLog.h"
1813
#import "NSString+Branch.h"
1914
#import "BNCTestCase.h"
2015

21-
2216
static NSString* globalTestLogString = nil;
2317

24-
2518
void TestLogProcedure(NSDate*timestamp, BNCLogLevel level, NSString* message) {
2619
globalTestLogString = [message copy];
2720
}
2821

29-
3022
@interface BNCLogTest : BNCTestCase
3123
@end
3224

33-
3425
@implementation BNCLogTest
3526

3627
- (void) dealloc {
@@ -63,7 +54,7 @@ - (void) testLogLineNumbers {
6354
BNCLog(@"Debug message with no parameters.");
6455
BNCLogFlushMessages();
6556
XCTAssertEqualObjects(globalTestLogString,
66-
@"[branch.io] BNCLog.Test.m(63) Log: Debug message with no parameters.");
57+
@"[branch.io] BNCLog.Test.m(54) Log: Debug message with no parameters.");
6758
}
6859

6960
- (void) testLog {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
@file BNCTestCase.Test.m
33
@package Branch-SDK
4-
@brief Test cases for the underlying Branch test case class.
4+
@brief Test cases for the underlying Branch test class.
55
66
@author Edward Smith
77
@date April 2018

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
//
2-
// BNCTestCase.h
3-
// Branch-TestBed
4-
//
5-
// Created by Edward Smith on 4/27/17.
6-
// Copyright (c) 2017 Branch Metrics. All rights reserved.
7-
//
1+
/**
2+
@file BNCTestCase.h
3+
@package Branch-SDK-Tests
4+
@brief The Branch testing framework super class.
5+
6+
@author Edward Smith
7+
@date April 2017
8+
@copyright Copyright © 2017 Branch. All rights reserved.
9+
*/
810

911
#import <XCTest/XCTest.h>
1012
#import <OCMock/OCMock.h>

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
//
2-
// BNCTestCase.m
3-
// Branch-TestBed
4-
//
5-
// Created by Edward Smith on 4/27/17.
6-
// Copyright (c) 2017 Branch Metrics. All rights reserved.
7-
//
1+
/**
2+
@file BNCTestCase.m
3+
@package Branch-SDK-Tests
4+
@brief The Branch testing framework super class.
5+
6+
@author Edward Smith
7+
@date April 2017
8+
@copyright Copyright © 2017 Branch. All rights reserved.
9+
*/
810

911
#import "BNCTestCase.h"
1012
#import "BNCLog.h"

‎Branch-SDK-Tests/Branch-SDK-Tests/BNCTestCase.strings‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
/*
2-
Branch-SDK_Tests.strings
3-
Branch
1+
/**
2+
@file BNCTestCase.strings
3+
@package Branch-SDK-Tests
4+
@brief String resources for Branch-SDK-Tests.
45

5-
Created by EB Smith on 10/12/16.
6-
Copyright © 2016 Branch. All rights reserved.
6+
@author Edward Smith
7+
@date October 2016
8+
@copyright Copyright © 2016 Branch. All rights reserved.
79
*/
810

911
"BNCTestCaseString" = "Test success!";

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
1+
/**
2+
@file NSString+Branch.Test.m
3+
@package Branch-SDK
4+
@brief Tests for NSString+Branch.
15
2-
3-
//--------------------------------------------------------------------------------------------------
4-
//
5-
// NSString+Branch.h
6-
// Branch.framework
7-
//
8-
// NSString Additions
9-
// Edward Smith, February 2017
10-
//
11-
// -©- Copyright © 2017 Branch, all rights reserved. -©-
12-
//
13-
//--------------------------------------------------------------------------------------------------
14-
6+
@author Edward Smith
7+
@date February 2017
8+
@copyright Copyright © 2017 Branch. All rights reserved.
9+
*/
1510

1611
#import "NSString+Branch.h"
1712
#import "BNCTestCase.h"
1813

19-
2014
#define _countof(array) (sizeof(array)/sizeof(array[0]))
2115

22-
2316
@interface NSStringBranchTest : BNCTestCase
2417
@end
2518

26-
2719
@implementation NSStringBranchTest
2820

2921
- (void) testMaskEqual {

‎Branch-SDK/Branch-SDK/BNCThreads.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
@brief Utilities for working with threads, queues, and blocks.
55
66
@author Edward Smith
7-
@date May 2017
8-
@copyright Copyright © 2017 Branch. All rights reserved.
7+
@date May 2018
8+
@copyright Copyright © 2018 Branch. All rights reserved.
99
*/
1010

1111
#if __has_feature(modules)

‎Branch-SDK/Branch-SDK/BNCThreads.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
@brief Utilities for working with threads, queues, and blocks.
55
66
@author Edward Smith
7-
@date May 2017
8-
@copyright Copyright © 2017 Branch. All rights reserved.
7+
@date May 2018
8+
@copyright Copyright © 2018 Branch. All rights reserved.
99
*/
1010

1111
#import "BNCThreads.h"

‎Branch-SDK/Branch-SDK/NSString+Branch.h‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
2-
3-
//--------------------------------------------------------------------------------------------------
4-
//
5-
// NSString+Branch.h
6-
// Branch.framework
7-
//
8-
// NSString Additions
9-
// Edward Smith, February 2017
10-
//
11-
// -©- Copyright © 2017 Branch, all rights reserved. -©-
12-
//
13-
//--------------------------------------------------------------------------------------------------
1+
/**
2+
@file NSString+Branch.h
3+
@package Branch-SDK
4+
@brief NSString Additions
5+
6+
@author Edward Smith
7+
@date February 2017
8+
@copyright Copyright © 2017 Branch. All rights reserved.
9+
*/
1410

1511
#if __has_feature(modules)
1612
@import Foundation;

0 commit comments

Comments
 (0)