Skip to content

Commit 5337298

Browse files
author
Edward Smith
committed
Fixed some tests for QA and Xcode 7.
1 parent 2f6e220 commit 5337298

File tree

5 files changed

+126
-13
lines changed

5 files changed

+126
-13
lines changed

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
46DC40761B2B386B00D2D203 /* BranchRedeemRewardsRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46DC40751B2B386B00D2D203 /* BranchRedeemRewardsRequestTests.m */; };
5555
46DC40781B2B549F00D2D203 /* BranchGetCreditHistoryRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46DC40771B2B549F00D2D203 /* BranchGetCreditHistoryRequestTests.m */; };
5656
46DC40801B2B84CD00D2D203 /* BranchShortUrlRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46DC407F1B2B84CD00D2D203 /* BranchShortUrlRequestTests.m */; };
57-
46FD92BA1AE7E8F80012E78F /* BNCSystemObserverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */; };
57+
4D2AC7CE1FDB3D8300A09651 /* BNCSystemObserver.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D2AC7C61FDB3D3000A09651 /* BNCSystemObserver.Test.m */; };
58+
4D2AC7CF1FDB3DA000A09651 /* BranchDelegate.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D2AC7C81FDB3D3000A09651 /* BranchDelegate.Test.m */; };
5859
4D32F4B81F9FDD3300BDD508 /* BNCFieldDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D32F4B71F9FDD3300BDD508 /* BNCFieldDefines.h */; };
5960
4D35141B1E3201D80085EBA1 /* NSMutableDictionary+Branch.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D3514191E3201D80085EBA1 /* NSMutableDictionary+Branch.h */; };
6061
4D35141C1E3201D80085EBA1 /* NSMutableDictionary+Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D35141A1E3201D80085EBA1 /* NSMutableDictionary+Branch.m */; };
@@ -225,7 +226,10 @@
225226
46DC40751B2B386B00D2D203 /* BranchRedeemRewardsRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchRedeemRewardsRequestTests.m; sourceTree = "<group>"; };
226227
46DC40771B2B549F00D2D203 /* BranchGetCreditHistoryRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchGetCreditHistoryRequestTests.m; sourceTree = "<group>"; };
227228
46DC407F1B2B84CD00D2D203 /* BranchShortUrlRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchShortUrlRequestTests.m; sourceTree = "<group>"; };
228-
46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCSystemObserverTests.m; sourceTree = "<group>"; };
229+
4D2AC7C61FDB3D3000A09651 /* BNCSystemObserver.Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCSystemObserver.Test.m; sourceTree = "<group>"; };
230+
4D2AC7C71FDB3D3000A09651 /* Branch-SDK-Tests-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Branch-SDK-Tests-Bridging-Header.h"; sourceTree = "<group>"; };
231+
4D2AC7C81FDB3D3000A09651 /* BranchDelegate.Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchDelegate.Test.m; sourceTree = "<group>"; };
232+
4D2AC7C91FDB3D3000A09651 /* BranchEvent.Test.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BranchEvent.Test.swift; sourceTree = "<group>"; };
229233
4D32F4B71F9FDD3300BDD508 /* BNCFieldDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCFieldDefines.h; sourceTree = "<group>"; };
230234
4D3514191E3201D80085EBA1 /* NSMutableDictionary+Branch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+Branch.h"; sourceTree = "<group>"; };
231235
4D35141A1E3201D80085EBA1 /* NSMutableDictionary+Branch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+Branch.m"; sourceTree = "<group>"; };
@@ -670,10 +674,13 @@
670674
46D0B6F91ACD8EF000CDDE82 /* BNCPreferenceHelperTests.m */,
671675
4D5775481EE89F1700FA33A4 /* BNCServerInterface.Test.m */,
672676
46DBB42C1B330CF300642FC8 /* BNCServerRequestQueueTests.m */,
673-
46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */,
677+
4D2AC7C61FDB3D3000A09651 /* BNCSystemObserver.Test.m */,
674678
4D8DFD931EC6394300D47413 /* BNCTestCase.h */,
675679
4D8DFD941EC6394300D47413 /* BNCTestCase.m */,
680+
4D2AC7C71FDB3D3000A09651 /* Branch-SDK-Tests-Bridging-Header.h */,
681+
4D2AC7C81FDB3D3000A09651 /* BranchDelegate.Test.m */,
676682
4DEC91811F4CD8D500199A05 /* BranchEvent.Test.m */,
683+
4D2AC7C91FDB3D3000A09651 /* BranchEvent.Test.swift */,
677684
4DB5954B1F38E0E40037968A /* BranchNetworkScenario.Test.m */,
678685
4665AF1F1B2892CF00184037 /* BranchRequestsTests */,
679686
7E6B3B551AA42D0E005F45BF /* BranchSDKFunctionalityTests.m */,
@@ -1051,7 +1058,6 @@
10511058
4DEC91851F4CD9F200199A05 /* BranchEvent.Test.m in Sources */,
10521059
4D57754A1EE89F6900FA33A4 /* BNCServerInterface.Test.m in Sources */,
10531060
4DF0D7601F38E65300D90025 /* BranchInstallRequestTests.m in Sources */,
1054-
46FD92BA1AE7E8F80012E78F /* BNCSystemObserverTests.m in Sources */,
10551061
4DC81E651F38E24A00C451C8 /* BNCEncodingUtils.Test.m in Sources */,
10561062
4D8DFD971EC6399F00D47413 /* BNCTestCase.m in Sources */,
10571063
4665AF281B28C1DE00184037 /* BranchLogoutRequestTests.m in Sources */,
@@ -1060,6 +1066,7 @@
10601066
4665AF241B28B7E000184037 /* BranchSetIdentityRequestTests.m in Sources */,
10611067
46DBB42D1B330CF300642FC8 /* BNCLinkDataTests.m in Sources */,
10621068
46DC40741B2B31A300D2D203 /* BranchLoadRewardsRequestTests.m in Sources */,
1069+
4D2AC7CF1FDB3DA000A09651 /* BranchDelegate.Test.m in Sources */,
10631070
46DC40701B2A34EE00D2D203 /* BranchUserCompletedActionTests.m in Sources */,
10641071
4DEC91861F4CD9F500199A05 /* BranchUniversalObject.Test.m in Sources */,
10651072
46D0B6FA1ACD8EF000CDDE82 /* BNCPreferenceHelperTests.m in Sources */,
@@ -1072,6 +1079,7 @@
10721079
46DC40801B2B84CD00D2D203 /* BranchShortUrlRequestTests.m in Sources */,
10731080
46DBB4391B34B22F00642FC8 /* BranchCloseRequestTests.m in Sources */,
10741081
4DF0D75F1F38E62C00D90025 /* BNCCrashlyticsWrapper.Test.m in Sources */,
1082+
4D2AC7CE1FDB3D8300A09651 /* BNCSystemObserver.Test.m in Sources */,
10751083
);
10761084
runOnlyForDeploymentPostprocessing = 0;
10771085
};
@@ -1118,6 +1126,7 @@
11181126
466B58491B17773000A69EDE /* Debug */ = {
11191127
isa = XCBuildConfiguration;
11201128
buildSettings = {
1129+
CLANG_ENABLE_MODULES = YES;
11211130
CLANG_WARN_UNREACHABLE_CODE = YES;
11221131
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11231132
DEFINES_MODULE = NO;
@@ -1127,24 +1136,28 @@
11271136
"DEBUG=1",
11281137
"$(inherited)",
11291138
);
1139+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11301140
MTL_ENABLE_DEBUG_INFO = YES;
11311141
OTHER_LDFLAGS = "-ObjC";
11321142
PRIVATE_HEADERS_FOLDER_PATH = /headers;
11331143
PRODUCT_NAME = "$(TARGET_NAME)";
11341144
PUBLIC_HEADERS_FOLDER_PATH = /headers;
11351145
SKIP_INSTALL = YES;
1146+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
11361147
};
11371148
name = Debug;
11381149
};
11391150
466B584A1B17773000A69EDE /* Release */ = {
11401151
isa = XCBuildConfiguration;
11411152
buildSettings = {
1153+
CLANG_ENABLE_MODULES = YES;
11421154
CLANG_WARN_UNREACHABLE_CODE = YES;
11431155
COPY_PHASE_STRIP = NO;
11441156
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11451157
DEFINES_MODULE = NO;
11461158
ENABLE_STRICT_OBJC_MSGSEND = YES;
11471159
GCC_NO_COMMON_BLOCKS = YES;
1160+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11481161
MTL_ENABLE_DEBUG_INFO = NO;
11491162
OTHER_LDFLAGS = "-ObjC";
11501163
PRIVATE_HEADERS_FOLDER_PATH = /headers;
@@ -1294,6 +1307,7 @@
12941307
MTL_ENABLE_DEBUG_INFO = YES;
12951308
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
12961309
PRODUCT_NAME = "$(TARGET_NAME)";
1310+
SWIFT_OBJC_BRIDGING_HEADER = "../Branch-TestBed/Branch-SDK-Tests/Branch-SDK-Tests-Bridging-Header.h";
12971311
};
12981312
name = Debug;
12991313
};
@@ -1308,6 +1322,7 @@
13081322
MTL_ENABLE_DEBUG_INFO = NO;
13091323
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
13101324
PRODUCT_NAME = "$(TARGET_NAME)";
1325+
SWIFT_OBJC_BRIDGING_HEADER = "../Branch-TestBed/Branch-SDK-Tests/Branch-SDK-Tests-Bridging-Header.h";
13111326
};
13121327
name = Release;
13131328
};

‎Branch-TestBed/Branch-SDK-Tests/BranchInstallRequestTests.m‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,21 @@ - (void)testRequestBody {
8282
BranchInstallRequest *request = [[BranchInstallRequest alloc] init];
8383
id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
8484
[[serverInterfaceMock expect]
85-
postRequest:expectedParams
86-
url:[self stringMatchingPattern:BRANCH_REQUEST_ENDPOINT_INSTALL]
85+
postRequest:[OCMArg checkWithBlock:^BOOL(id value) {
86+
if (![value isKindOfClass:[NSDictionary class]]) {
87+
XCTFail(@"Expected NSDictionary. Got '%@'.", NSStringFromClass([value class]));
88+
return NO;
89+
}
90+
NSDictionary *dictionary = (NSDictionary*)value;
91+
XCTAssertEqualObjects(dictionary, expectedParams);
92+
return YES;
93+
}]
94+
url:[OCMArg checkWithBlock:^BOOL(id value) {
95+
if (![((NSString*)value) bnc_containsString:BRANCH_REQUEST_ENDPOINT_INSTALL]) {
96+
XCTAssertEqualObjects(value, BRANCH_REQUEST_ENDPOINT_INSTALL);
97+
}
98+
return YES;
99+
}]
87100
key:[OCMArg any]
88101
callback:[OCMArg any]];
89102

‎Branch-TestBed/Branch-TestBed-UITests/UITestBed.xcodeproj/xcshareddata/xcschemes/UITestBed.xcscheme‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0830"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "4DFF2B681EEF3B150043F840"
18+
BuildableName = "UITestBed.app"
19+
BlueprintName = "UITestBed"
20+
ReferencedContainer = "container:UITestBed.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "4DFF2B681EEF3B150043F840"
36+
BuildableName = "UITestBed.app"
37+
BlueprintName = "UITestBed"
38+
ReferencedContainer = "container:UITestBed.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "4DFF2B681EEF3B150043F840"
59+
BuildableName = "UITestBed.app"
60+
BlueprintName = "UITestBed"
61+
ReferencedContainer = "container:UITestBed.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<AdditionalOptions>
65+
</AdditionalOptions>
66+
</LaunchAction>
67+
<ProfileAction
68+
buildConfiguration = "Release"
69+
shouldUseLaunchSchemeArgsEnv = "YES"
70+
savedToolIdentifier = ""
71+
useCustomWorkingDirectory = "NO"
72+
debugDocumentVersioning = "YES">
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "4DFF2B681EEF3B150043F840"
78+
BuildableName = "UITestBed.app"
79+
BlueprintName = "UITestBed"
80+
ReferencedContainer = "container:UITestBed.xcodeproj">
81+
</BuildableReference>
82+
</BuildableProductRunnable>
83+
</ProfileAction>
84+
<AnalyzeAction
85+
buildConfiguration = "Debug">
86+
</AnalyzeAction>
87+
<ArchiveAction
88+
buildConfiguration = "Release"
89+
revealArchiveInOrganizer = "YES">
90+
</ArchiveAction>
91+
</Scheme>

‎Branch-TestBed/Branch-TestBed-UITests/UITestBed/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@
8484
"idiom" : "ipad",
8585
"size" : "83.5x83.5",
8686
"scale" : "2x"
87-
},
88-
{
89-
"idiom" : "ios-marketing",
90-
"size" : "1024x1024",
91-
"scale" : "1x"
9287
}
9388
],
9489
"info" : {

‎carthage-files/BranchSDK.xcodeproj/xcshareddata/xcschemes/Branch iOS SDK Carthage.xcscheme‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "0910"
4-
version = "1.3">
4+
version = "1.8">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -37,7 +37,6 @@
3737
buildConfiguration = "Debug"
3838
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3939
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4140
launchStyle = "0"
4241
useCustomWorkingDirectory = "NO"
4342
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)