Merge pull request #1328 from BranchMetrics/SDK-2093-remove-OCMock

SDK-2093 remove oc mock

Author: echo-branch

.github/workflows/verify.yml

@@ -31,8 +31,8 @@ jobs:
       # This happens automatically with the unit_tests lane, but adding it here
       # makes it easier to keep track of installation time via GHA without
       # adding execution time to the next step.
-      - name: Install CocoaPods dependencies
-        run: bundle exec fastlane prepare_pods
+      #- name: Install CocoaPods dependencies
+      #  run: bundle exec fastlane prepare_pods
       - name: Run unit tests
         run: bundle exec fastlane unit_tests
       - name: Upload test results

…d/Branch-SDK-Tests/BNCApplication.Test.m …d/Branch-SDK-Tests/BNCApplicationTests.mBranch-TestBed/Branch-SDK-Tests/BNCApplication.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCApplicationTests.m Branch-TestBed/Branch-SDK-Tests/BNCApplication.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCApplicationTests.m

@@ -6,14 +6,22 @@
 //  Copyright © 2018 Branch, Inc. All rights reserved.
 //
 
-#import "BNCTestCase.h"
+#import <XCTest/XCTest.h>
 #import "BNCApplication.h"
 #import "BNCKeyChain.h"
 
-@interface BNCApplicationTest : BNCTestCase
+@interface BNCApplicationTests : XCTestCase
 @end
 
-@implementation BNCApplicationTest
+@implementation BNCApplicationTests
+
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
 
 - (void)testApplication {
     // Test general info:

…h-SDK-Tests/BNCCrashlyticsWrapper.Test.m …h-SDK-Tests/BNCCrashlyticsWrapperTests.mBranch-TestBed/Branch-SDK-Tests/BNCCrashlyticsWrapper.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCCrashlyticsWrapperTests.m Branch-TestBed/Branch-SDK-Tests/BNCCrashlyticsWrapper.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCCrashlyticsWrapperTests.m

@@ -6,8 +6,8 @@
 //  Copyright © 2017 Branch Metrics. All rights reserved.
 //
 
+#import <XCTest/XCTest.h>
 #import "BNCCrashlyticsWrapper.h"
-#import "BNCTestCase.h"
 
 #pragma mark Crashlytics SDK Stand-In
 
@@ -42,13 +42,20 @@ -(id)getCustomValueForKey:(NSString *)key {
 
 #pragma mark - BNCCrashlyticsWrapperTest
 
-@interface BNCCrashlyticsWrapperTest : BNCTestCase
+@interface BNCCrashlyticsWrapperTests : XCTestCase
 @end
 
-@implementation BNCCrashlyticsWrapperTest
+@implementation BNCCrashlyticsWrapperTests
 
-- (void) testSetValue {
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
 
+- (void)testSetValue {
     BNCCrashlyticsWrapper *wrapper = [BNCCrashlyticsWrapper wrapper];
     NSString *value = @"TestString";
     NSString *key = @"TestKey";

…Branch-SDK-Tests/BNCEncodingUtils.Test.m …Branch-SDK-Tests/BNCEncodingUtilsTests.mBranch-TestBed/Branch-SDK-Tests/BNCEncodingUtils.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCEncodingUtilsTests.m Branch-TestBed/Branch-SDK-Tests/BNCEncodingUtils.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCEncodingUtilsTests.m

@@ -8,13 +8,20 @@
 
 #import <XCTest/XCTest.h>
 #import "BNCEncodingUtils.h"
-#import "BNCTestCase.h"
 
-@interface BNCEncodingUtilsTests : BNCTestCase
+@interface BNCEncodingUtilsTests : XCTestCase
 @end
 
 @implementation BNCEncodingUtilsTests
 
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
 #pragma mark - EncodeDictionaryToJsonString tests
 
 - (void)testEncodeDictionaryToJsonStringWithExpectedParams {

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

@@ -6,14 +6,22 @@
 //  Copyright (c) 2015 Branch Metrics. All rights reserved.
 //
 
-#import "BNCTestCase.h"
+#import <XCTest/XCTest.h>
 #import "BNCLinkData.h"
 
-@interface BNCLinkDataTests : BNCTestCase
+@interface BNCLinkDataTests : XCTestCase
 @end
 
 @implementation BNCLinkDataTests
 
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
 - (void)testBasicObjectHash {
     BNCLinkData *a = [[BNCLinkData alloc] init];
     BNCLinkData *b = [[BNCLinkData alloc] init];

…h-TestBed/Branch-SDK-Tests/BNCLog.Test.m …h-TestBed/Branch-SDK-Tests/BNCLogTests.mBranch-TestBed/Branch-SDK-Tests/BNCLog.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCLogTests.m Branch-TestBed/Branch-SDK-Tests/BNCLog.Test.m renamed to Branch-TestBed/Branch-SDK-Tests/BNCLogTests.m

@@ -1,5 +1,5 @@
 /**
- @file          BNCLog.Test.m
+ @file          BNCLogTests.m
  @package       BranchTests
  @brief         Tests for BNCLog.
 
@@ -10,22 +10,29 @@
 
 #import <XCTest/XCTest.h>
 #import "BNCLog.h"
-#import "BNCTestCase.h"
 
-@interface BNCLogTest : BNCTestCase
+@interface BNCLogTests : XCTestCase
 @end
 
-@implementation BNCLogTest
+@implementation BNCLogTests
 
-- (void) testLogLevelString {
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
+- (void)testLogLevelString {
     XCTAssertEqual(BNCLogLevelAll,      BNCLogLevelFromString(@"BNCLogLevelAll"));
     XCTAssertEqual(BNCLogLevelDebugSDK, BNCLogLevelFromString(@"BNCLogLevelDebugSDK"));
     XCTAssertEqual(BNCLogLevelWarning,  BNCLogLevelFromString(@"BNCLogLevelWarning"));
     XCTAssertEqual(BNCLogLevelNone,     BNCLogLevelFromString(@"BNCLogLevelNone"));
     XCTAssertEqual(BNCLogLevelMax,      BNCLogLevelFromString(@"BNCLogLevelMax"));
 }
 
-- (void) testLogLevelEnum {
+- (void)testLogLevelEnum {
     XCTAssertEqualObjects(@"BNCLogLevelAll",        BNCLogStringFromLogLevel(BNCLogLevelAll));
     XCTAssertEqualObjects(@"BNCLogLevelAll",        BNCLogStringFromLogLevel(BNCLogLevelDebugSDK));
     XCTAssertEqualObjects(@"BNCLogLevelWarning",    BNCLogStringFromLogLevel(BNCLogLevelWarning));