Skip to content

Commit 228e997

Browse files
author
Edward Smith
committed
Updated tests for Xcode 7.
1 parent 4ea52c7 commit 228e997

File tree

5 files changed

+79
-74
lines changed

5 files changed

+79
-74
lines changed

‎Branch-TestBed-Xcode-7/Branch-TestBed.xcodeproj/project.pbxproj‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
2BD7C45E1F27D7AB003696AF /* BNCCrashlyticsWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BD7C45A1F27D7AB003696AF /* BNCCrashlyticsWrapper.m */; };
1212
2BD7C45F1F27D7AB003696AF /* BNCDeepLinkViewControllerInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BD7C45B1F27D7AB003696AF /* BNCDeepLinkViewControllerInstance.h */; };
1313
2BD7C4601F27D7AB003696AF /* BNCDeepLinkViewControllerInstance.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BD7C45C1F27D7AB003696AF /* BNCDeepLinkViewControllerInstance.m */; };
14-
461019461AE551A500379A15 /* BranchNetworkScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 461019451AE551A500379A15 /* BranchNetworkScenarioTests.m */; };
1514
462B50461B449DF000967B81 /* BranchDeepLinkingController.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DBB42F1B335A9B00642FC8 /* BranchDeepLinkingController.h */; settings = {ATTRIBUTES = (Public, ); }; };
1615
4665AF231B28965E00184037 /* BranchSDKLoadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4665AF1D1B28923900184037 /* BranchSDKLoadTests.m */; };
1716
4665AF241B28B7E000184037 /* BranchSetIdentityRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4665AF201B2892F700184037 /* BranchSetIdentityRequestTests.m */; };
@@ -41,7 +40,6 @@
4140
466B58811B1778DB00A69EDE /* libBranch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 466B58381B17773000A69EDE /* libBranch.a */; };
4241
466D5A111B5991E3009DB845 /* BNCContentDiscoveryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 466D5A0F1B5991E3009DB845 /* BNCContentDiscoveryManager.h */; };
4342
466D5A121B5991E3009DB845 /* BNCContentDiscoveryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 466D5A101B5991E3009DB845 /* BNCContentDiscoveryManager.m */; };
44-
4677EB511B3B384C00A13964 /* BranchInstallRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4677EB501B3B384C00A13964 /* BranchInstallRequestTests.m */; };
4543
4683F0751B20A73F00A432E7 /* CreditHistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EAA790119E89F67008D4A83 /* CreditHistoryViewController.m */; };
4644
4683F0761B20A73F00A432E7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 670016731940F51400A9E103 /* AppDelegate.m */; };
4745
4683F07A1B20AC5E00A432E7 /* libBranch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 466B58381B17773000A69EDE /* libBranch.a */; };
@@ -58,7 +56,6 @@
5856
46DC40781B2B549F00D2D203 /* BranchGetCreditHistoryRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46DC40771B2B549F00D2D203 /* BranchGetCreditHistoryRequestTests.m */; };
5957
46DC40801B2B84CD00D2D203 /* BranchShortUrlRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46DC407F1B2B84CD00D2D203 /* BranchShortUrlRequestTests.m */; };
6058
46FD92BA1AE7E8F80012E78F /* BNCSystemObserverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */; };
61-
46FFCF171ACC321A00039CE0 /* BNCEncodingUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46FFCF161ACC321A00039CE0 /* BNCEncodingUtilsTests.m */; };
6259
4D35141B1E3201D80085EBA1 /* NSMutableDictionary+Branch.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D3514191E3201D80085EBA1 /* NSMutableDictionary+Branch.h */; };
6360
4D35141C1E3201D80085EBA1 /* NSMutableDictionary+Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D35141A1E3201D80085EBA1 /* NSMutableDictionary+Branch.m */; };
6461
4D3FA94B1DFF31EB00E2B6A9 /* BNCConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3FA94A1DFF31EB00E2B6A9 /* BNCConfig.m */; };
@@ -120,7 +117,14 @@
120117
4D9921351EE208B400A4AB92 /* BranchUserCompletedActionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9921101EE208B400A4AB92 /* BranchUserCompletedActionRequest.h */; };
121118
4D9921361EE208B400A4AB92 /* BranchUserCompletedActionRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D9921111EE208B400A4AB92 /* BranchUserCompletedActionRequest.m */; };
122119
4D9921381EE208D900A4AB92 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9921371EE208D900A4AB92 /* Security.framework */; };
120+
4DC81E641F38E24600C451C8 /* BNCDeviceInfo.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB595471F38E0E40037968A /* BNCDeviceInfo.Test.m */; };
121+
4DC81E651F38E24A00C451C8 /* BNCEncodingUtils.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB595481F38E0E40037968A /* BNCEncodingUtils.Test.m */; };
122+
4DC81E661F38E24E00C451C8 /* BNCError.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB595491F38E0E40037968A /* BNCError.Test.m */; };
123+
4DC81E671F38E25400C451C8 /* BNCLocalization.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB5954A1F38E0E40037968A /* BNCLocalization.Test.m */; };
124+
4DC81E681F38E26700C451C8 /* BranchNetworkScenario.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB5954B1F38E0E40037968A /* BranchNetworkScenario.Test.m */; };
123125
4DDC52621DCC08E700CFB737 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDC52611DCC08E700CFB737 /* iAd.framework */; };
126+
4DF0D75F1F38E62C00D90025 /* BNCCrashlyticsWrapper.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB595461F38E0E40037968A /* BNCCrashlyticsWrapper.Test.m */; };
127+
4DF0D7601F38E65300D90025 /* BranchInstallRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4677EB501B3B384C00A13964 /* BranchInstallRequestTests.m */; };
124128
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */; };
125129
54391A161BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 54391A141BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m */; };
126130
54FF1F8D1BD1D4AE0004CE2E /* BranchUniversalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 54FF1F8B1BD1D4AE0004CE2E /* BranchUniversalObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -188,7 +192,6 @@
188192
2BD7C45B1F27D7AB003696AF /* BNCDeepLinkViewControllerInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCDeepLinkViewControllerInstance.h; sourceTree = "<group>"; };
189193
2BD7C45C1F27D7AB003696AF /* BNCDeepLinkViewControllerInstance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCDeepLinkViewControllerInstance.m; sourceTree = "<group>"; };
190194
423ACD2DEBB9A2E4FAF64B08 /* libPods-Branch-SDK-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Branch-SDK-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
191-
461019451AE551A500379A15 /* BranchNetworkScenarioTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchNetworkScenarioTests.m; sourceTree = "<group>"; };
192195
464EA3991ACB38EC000E4094 /* BNCEncodingUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCEncodingUtils.h; sourceTree = "<group>"; };
193196
464EA39A1ACB38EC000E4094 /* BNCEncodingUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCEncodingUtils.m; sourceTree = "<group>"; };
194197
4665AF1D1B28923900184037 /* BranchSDKLoadTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchSDKLoadTests.m; sourceTree = "<group>"; };
@@ -214,7 +217,6 @@
214217
46DC40771B2B549F00D2D203 /* BranchGetCreditHistoryRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchGetCreditHistoryRequestTests.m; sourceTree = "<group>"; };
215218
46DC407F1B2B84CD00D2D203 /* BranchShortUrlRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchShortUrlRequestTests.m; sourceTree = "<group>"; };
216219
46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCSystemObserverTests.m; sourceTree = "<group>"; };
217-
46FFCF161ACC321A00039CE0 /* BNCEncodingUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCEncodingUtilsTests.m; sourceTree = "<group>"; };
218220
4D3514191E3201D80085EBA1 /* NSMutableDictionary+Branch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+Branch.h"; sourceTree = "<group>"; };
219221
4D35141A1E3201D80085EBA1 /* NSMutableDictionary+Branch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+Branch.m"; sourceTree = "<group>"; };
220222
4D3FA94A1DFF31EB00E2B6A9 /* BNCConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCConfig.m; sourceTree = "<group>"; };
@@ -277,6 +279,12 @@
277279
4D9921101EE208B400A4AB92 /* BranchUserCompletedActionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchUserCompletedActionRequest.h; sourceTree = "<group>"; };
278280
4D9921111EE208B400A4AB92 /* BranchUserCompletedActionRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchUserCompletedActionRequest.m; sourceTree = "<group>"; };
279281
4D9921371EE208D900A4AB92 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
282+
4DB595461F38E0E40037968A /* BNCCrashlyticsWrapper.Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCCrashlyticsWrapper.Test.m; sourceTree = "<group>"; };
283+
4DB595471F38E0E40037968A /* BNCDeviceInfo.Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCDeviceInfo.Test.m; sourceTree = "<group>"; };
284+
4DB595481F38E0E40037968A /* BNCEncodingUtils.Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCEncodingUtils.Test.m; sourceTree = "<group>"; };
285+
4DB595491F38E0E40037968A /* BNCError.Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCError.Test.m; sourceTree = "<group>"; };
286+
4DB5954A1F38E0E40037968A /* BNCLocalization.Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCLocalization.Test.m; sourceTree = "<group>"; };
287+
4DB5954B1F38E0E40037968A /* BranchNetworkScenario.Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchNetworkScenario.Test.m; sourceTree = "<group>"; };
280288
4DDC52611DCC08E700CFB737 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
281289
54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchCSSearchableItemAttributeSet.h; sourceTree = "<group>"; };
282290
54391A141BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchCSSearchableItemAttributeSet.m; sourceTree = "<group>"; };
@@ -624,17 +632,21 @@
624632
7E6B3B521AA42D0E005F45BF /* Branch-SDK-Tests */ = {
625633
isa = PBXGroup;
626634
children = (
635+
4DB595461F38E0E40037968A /* BNCCrashlyticsWrapper.Test.m */,
627636
4D44E7BC1E68F31B00793D79 /* BNCDebug.Test.m */,
628-
46FFCF161ACC321A00039CE0 /* BNCEncodingUtilsTests.m */,
637+
4DB595471F38E0E40037968A /* BNCDeviceInfo.Test.m */,
638+
4DB595481F38E0E40037968A /* BNCEncodingUtils.Test.m */,
639+
4DB595491F38E0E40037968A /* BNCError.Test.m */,
629640
46DBB42B1B330CF300642FC8 /* BNCLinkDataTests.m */,
641+
4DB5954A1F38E0E40037968A /* BNCLocalization.Test.m */,
630642
4D44E7BD1E68F31B00793D79 /* BNCLog.Test.m */,
631643
46D0B6F91ACD8EF000CDDE82 /* BNCPreferenceHelperTests.m */,
632644
4D5775481EE89F1700FA33A4 /* BNCServerInterface.Test.m */,
633645
46DBB42C1B330CF300642FC8 /* BNCServerRequestQueueTests.m */,
634646
46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */,
635647
4D8DFD931EC6394300D47413 /* BNCTestCase.h */,
636648
4D8DFD941EC6394300D47413 /* BNCTestCase.m */,
637-
461019451AE551A500379A15 /* BranchNetworkScenarioTests.m */,
649+
4DB5954B1F38E0E40037968A /* BranchNetworkScenario.Test.m */,
638650
4665AF1F1B2892CF00184037 /* BranchRequestsTests */,
639651
7E6B3B551AA42D0E005F45BF /* BranchSDKFunctionalityTests.m */,
640652
4665AF1D1B28923900184037 /* BranchSDKLoadTests.m */,
@@ -820,7 +832,6 @@
820832
7E6B3B501AA42D0E005F45BF = {
821833
CreatedOnToolsVersion = 6.1.1;
822834
DevelopmentTeam = R63EM248DP;
823-
TestTargetID = 6700165F1940F51400A9E103;
824835
};
825836
};
826837
};
@@ -838,8 +849,8 @@
838849
projectRoot = "";
839850
targets = (
840851
466B58371B17773000A69EDE /* Branch */,
841-
6700165F1940F51400A9E103 /* Branch-TestBed */,
842852
7E6B3B501AA42D0E005F45BF /* Branch-SDK-Tests */,
853+
6700165F1940F51400A9E103 /* Branch-TestBed */,
843854
);
844855
};
845856
/* End PBXProject section */
@@ -996,11 +1007,13 @@
9961007
4665AF231B28965E00184037 /* BranchSDKLoadTests.m in Sources */,
9971008
46DC40761B2B386B00D2D203 /* BranchRedeemRewardsRequestTests.m in Sources */,
9981009
46DBB4371B34AF8C00642FC8 /* BranchShortUrlSyncRequestTests.m in Sources */,
1010+
4DC81E641F38E24600C451C8 /* BNCDeviceInfo.Test.m in Sources */,
9991011
7E6B3B561AA42D0E005F45BF /* BranchSDKFunctionalityTests.m in Sources */,
1000-
4677EB511B3B384C00A13964 /* BranchInstallRequestTests.m in Sources */,
1012+
4DC81E661F38E24E00C451C8 /* BNCError.Test.m in Sources */,
10011013
4D57754A1EE89F6900FA33A4 /* BNCServerInterface.Test.m in Sources */,
1002-
461019461AE551A500379A15 /* BranchNetworkScenarioTests.m in Sources */,
1014+
4DF0D7601F38E65300D90025 /* BranchInstallRequestTests.m in Sources */,
10031015
46FD92BA1AE7E8F80012E78F /* BNCSystemObserverTests.m in Sources */,
1016+
4DC81E651F38E24A00C451C8 /* BNCEncodingUtils.Test.m in Sources */,
10041017
4D8DFD971EC6399F00D47413 /* BNCTestCase.m in Sources */,
10051018
4665AF281B28C1DE00184037 /* BranchLogoutRequestTests.m in Sources */,
10061019
46DC40781B2B549F00D2D203 /* BranchGetCreditHistoryRequestTests.m in Sources */,
@@ -1011,12 +1024,14 @@
10111024
46DC40701B2A34EE00D2D203 /* BranchUserCompletedActionTests.m in Sources */,
10121025
46D0B6FA1ACD8EF000CDDE82 /* BNCPreferenceHelperTests.m in Sources */,
10131026
4D44E7D11E68F39700793D79 /* NSString+Branch.Test.m in Sources */,
1027+
4DC81E681F38E26700C451C8 /* BranchNetworkScenario.Test.m in Sources */,
10141028
46DBB43D1B34B7A300642FC8 /* BranchOpenRequestTests.m in Sources */,
10151029
4D44E7CF1E68F38C00793D79 /* BNCDebug.Test.m in Sources */,
10161030
46DBB42E1B330CF300642FC8 /* BNCServerRequestQueueTests.m in Sources */,
1031+
4DC81E671F38E25400C451C8 /* BNCLocalization.Test.m in Sources */,
10171032
46DC40801B2B84CD00D2D203 /* BranchShortUrlRequestTests.m in Sources */,
10181033
46DBB4391B34B22F00642FC8 /* BranchCloseRequestTests.m in Sources */,
1019-
46FFCF171ACC321A00039CE0 /* BNCEncodingUtilsTests.m in Sources */,
1034+
4DF0D75F1F38E62C00D90025 /* BNCCrashlyticsWrapper.Test.m in Sources */,
10201035
);
10211036
runOnlyForDeploymentPostprocessing = 0;
10221037
};
@@ -1200,7 +1215,7 @@
12001215
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
12011216
PRODUCT_NAME = "$(TARGET_NAME)";
12021217
PROVISIONING_PROFILE = "";
1203-
USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR";
1218+
USER_HEADER_SEARCH_PATHS = $PROJECT_DIR;
12041219
WRAPPER_EXTENSION = app;
12051220
};
12061221
name = Debug;
@@ -1221,7 +1236,7 @@
12211236
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
12221237
PRODUCT_NAME = "$(TARGET_NAME)";
12231238
PROVISIONING_PROFILE = "";
1224-
USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR";
1239+
USER_HEADER_SEARCH_PATHS = $PROJECT_DIR;
12251240
WRAPPER_EXTENSION = app;
12261241
};
12271242
name = Release;
@@ -1230,7 +1245,6 @@
12301245
isa = XCBuildConfiguration;
12311246
baseConfigurationReference = BD1915E2CE30909947ECEB14 /* Pods-Branch-SDK-Tests.debug.xcconfig */;
12321247
buildSettings = {
1233-
BUNDLE_LOADER = "$(TEST_HOST)";
12341248
CLANG_WARN_UNREACHABLE_CODE = YES;
12351249
DEVELOPMENT_TEAM = R63EM248DP;
12361250
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1242,23 +1256,20 @@
12421256
MTL_ENABLE_DEBUG_INFO = YES;
12431257
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
12441258
PRODUCT_NAME = "$(TARGET_NAME)";
1245-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Branch-TestBed.app/Branch-TestBed";
12461259
};
12471260
name = Debug;
12481261
};
12491262
7E6B3B591AA42D0E005F45BF /* Release */ = {
12501263
isa = XCBuildConfiguration;
12511264
baseConfigurationReference = 69347EDA2E4ED874ED5DA0B3 /* Pods-Branch-SDK-Tests.release.xcconfig */;
12521265
buildSettings = {
1253-
BUNDLE_LOADER = "$(TEST_HOST)";
12541266
CLANG_WARN_UNREACHABLE_CODE = YES;
12551267
DEVELOPMENT_TEAM = R63EM248DP;
12561268
ENABLE_STRICT_OBJC_MSGSEND = YES;
12571269
INFOPLIST_FILE = "../Branch-TestBed/Branch-SDK-Tests/Info.plist";
12581270
MTL_ENABLE_DEBUG_INFO = NO;
12591271
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
12601272
PRODUCT_NAME = "$(TARGET_NAME)";
1261-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Branch-TestBed.app/Branch-TestBed";
12621273
};
12631274
name = Release;
12641275
};

‎Branch-TestBed-Xcode-7/Branch-TestBed.xcodeproj/xcshareddata/xcschemes/Branch-SDK-Tests.xcscheme‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,11 @@
5050
</BuildableReference>
5151
</MacroExpansion>
5252
<AdditionalOptions>
53-
<AdditionalOption
54-
key = "DYLD_INSERT_LIBRARIES"
55-
value = "/usr/lib/libgmalloc.dylib"
56-
isEnabled = "YES">
57-
</AdditionalOption>
5853
<AdditionalOption
5954
key = "NSZombieEnabled"
6055
value = "YES"
6156
isEnabled = "YES">
6257
</AdditionalOption>
63-
<AdditionalOption
64-
key = "MallocGuardEdges"
65-
value = ""
66-
isEnabled = "YES">
67-
</AdditionalOption>
68-
<AdditionalOption
69-
key = "MallocScribble"
70-
value = ""
71-
isEnabled = "YES">
72-
</AdditionalOption>
7358
</AdditionalOptions>
7459
</TestAction>
7560
<LaunchAction

‎Branch-TestBed-Xcode-7/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

3-
platform :ios, '6.0'
3+
platform :ios, '7.0'
44

55
target 'Branch-SDK-Tests' do
66
project 'Branch-TestBed'
7-
pod 'OCMock', '2.2.4'
7+
pod 'OCMock' # , '2.2.4' # I dropped iOS 6 support.
88
pod 'OHHTTPStubs'
99
end

‎Branch-TestBed/Branch-SDK-Tests/BNCDeviceInfo.Test.m‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ - (void)testGetDeviceInfo {
4848
}
4949

5050
maskedStringAssert(hardwareId, @"********-****-****-*****************");
51-
maskedStringAssert(hardwareIdType, @"vendor_id");
51+
XCTAssertTrue(
52+
[device.hardwareIdType isEqualToString:@"idfa"] ||
53+
[device.hardwareIdType isEqualToString:@"vendor_id"]
54+
);
5255
XCTAssertTrue(device.isRealHardwareId);
5356
maskedStringAssert(vendorId, @"********-****-****-*****************");
5457
maskedStringAssert(brandName, @"Apple");
@@ -67,7 +70,7 @@ - (void)testClassMethods {
6770

6871
NSString *string = [BNCDeviceInfo userAgentString];
6972
NSString *pattern =
70-
@"Mozilla\\/..0 \\(iPhone; CPU iPhone OS .+ like Mac OS X\\) AppleWebKit\\/.+ \\(KHTML, like Gecko\\) Mobile\\/.+";
73+
@"Mozilla\\/..0 \\(iP.+; CPU.+OS.+like Mac OS X\\) AppleWebKit\\/.+ \\(KHTML, like Gecko\\) Mobile\\/.+";
7174
NSError *error = NULL;
7275
NSRegularExpression *regex = [NSRegularExpression
7376
regularExpressionWithPattern:pattern

0 commit comments

Comments
 (0)