Skip to content

Commit ff7688b

Browse files
tapashmajumdertapashmajumder
authored
Merge pull request #9 from Iterable/feature/ITBL-5408-swift-sdk-refactoring
[ITBL-5408]-swift-sdk-static-calls
2 parents 49f1d30 + ba2ef37 commit ff7688b

23 files changed

+1788
-1297
lines changed

‎Tests/notification-extension-tests/NotificationExtensionTests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@import IterableAppExtensions;
1414

1515
static CGFloat const IterableNotificationCenterRequestDelay = 0.05;
16-
static CGFloat const IterableNotificationCenterExpectationTimeout = 5.0;
16+
static CGFloat const IterableNotificationCenterExpectationTimeout = 15.0;
1717

1818
@interface NotificationExtensionTests : XCTestCase
1919

‎Tests/swift-sdk-objc-tests/IterableAPITests.m renamed to ‎Tests/swift-sdk-objc-tests/IterableAPIImplementationTests.m

+39-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
//
2-
// IterableAPITests.m
3-
// Iterable-iOS-SDK
42
//
53
// Created by Ilya Brin on 5/25/16.
64
// Copyright © 2016 Iterable. All rights reserved.
@@ -18,10 +16,10 @@
1816

1917
static CGFloat const IterableNetworkResponseExpectationTimeout = 5.0;
2018

21-
@interface IterableAPITests : XCTestCase
19+
@interface IterableAPIImplementationTests : XCTestCase
2220
@end
2321

24-
@implementation IterableAPITests
22+
@implementation IterableAPIImplementationTests
2523

2624
NSString *redirectRequest = @"https://httpbin.org/redirect-to?url=http://example.com";
2725
NSString *exampleUrl = @"http://example.com";
@@ -33,8 +31,7 @@ @implementation IterableAPITests
3331

3432
- (void)setUp {
3533
[super setUp];
36-
37-
[IterableAPI initializeWithApiKey:@""];
34+
[IterableAPIImplementation initializeWithApiKey:@""];
3835
}
3936

4037
- (void)tearDown {
@@ -43,8 +40,8 @@ - (void)tearDown {
4340
}
4441

4542
- (void)testPushServicePlatformToString {
46-
XCTAssertEqualObjects(@"APNS", [IterableAPI pushServicePlatformToString:APNS]);
47-
XCTAssertEqualObjects(@"APNS_SANDBOX", [IterableAPI pushServicePlatformToString:APNS_SANDBOX]);
43+
XCTAssertEqualObjects(@"APNS", [IterableAPIImplementation pushServicePlatformToString:APNS]);
44+
XCTAssertEqualObjects(@"APNS_SANDBOX", [IterableAPIImplementation pushServicePlatformToString:APNS_SANDBOX]);
4845
}
4946

5047
- (void)testDictToJson {
@@ -65,7 +62,7 @@ - (void)testDictToJson {
6562
}
6663
}
6764
};
68-
NSString *result = [IterableAPI dictToJson:args];
65+
NSString *result = [IterableAPIImplementation dictToJson:args];
6966
NSData *data = [result dataUsingEncoding:NSUTF8StringEncoding];
7067
id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
7168
XCTAssertEqualObjects(args, json);
@@ -81,12 +78,12 @@ - (void)testDictToJson {
8178
}
8279

8380
- (void)testUserInterfaceIdionEnumToString {
84-
XCTAssertEqualObjects(@"Phone", [IterableAPI userInterfaceIdiomEnumToString:UIUserInterfaceIdiomPhone]);
85-
XCTAssertEqualObjects(@"Pad", [IterableAPI userInterfaceIdiomEnumToString:UIUserInterfaceIdiomPad]);
81+
XCTAssertEqualObjects(@"Phone", [IterableAPIImplementation userInterfaceIdiomEnumToString:UIUserInterfaceIdiomPhone]);
82+
XCTAssertEqualObjects(@"Pad", [IterableAPIImplementation userInterfaceIdiomEnumToString:UIUserInterfaceIdiomPad]);
8683
// we don't care about TVs for now
87-
XCTAssertEqualObjects(@"Unspecified", [IterableAPI userInterfaceIdiomEnumToString:UIUserInterfaceIdiomTV]);
88-
XCTAssertEqualObjects(@"Unspecified", [IterableAPI userInterfaceIdiomEnumToString:UIUserInterfaceIdiomUnspecified]);
89-
XCTAssertEqualObjects(@"Unspecified", [IterableAPI userInterfaceIdiomEnumToString:192387]);
84+
XCTAssertEqualObjects(@"Unspecified", [IterableAPIImplementation userInterfaceIdiomEnumToString:UIUserInterfaceIdiomTV]);
85+
XCTAssertEqualObjects(@"Unspecified", [IterableAPIImplementation userInterfaceIdiomEnumToString:UIUserInterfaceIdiomUnspecified]);
86+
XCTAssertEqualObjects(@"Unspecified", [IterableAPIImplementation userInterfaceIdiomEnumToString:192387]);
9087
}
9188

9289
- (void)testUniversalDeeplinkRewrite {
@@ -97,7 +94,7 @@ - (void)testUniversalDeeplinkRewrite {
9794
XCTAssertTrue(NSThread.isMainThread);
9895
[expectation fulfill];
9996
};
100-
[IterableAPI getAndTrackDeeplink:iterableLink callbackBlock:aBlock];
97+
[IterableAPIImplementation getAndTrackDeeplink:iterableLink callbackBlock:aBlock];
10198

10299
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
103100
}
@@ -109,7 +106,7 @@ - (void)testUniversalDeeplinkNoRewrite {
109106
XCTAssertEqualObjects(iterableNoRewriteURL, redirectUrl);
110107
[expectation fulfill];
111108
};
112-
[IterableAPI getAndTrackDeeplink:normalLink callbackBlock:uBlock];
109+
[IterableAPIImplementation getAndTrackDeeplink:normalLink callbackBlock:uBlock];
113110

114111
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
115112
}
@@ -126,9 +123,9 @@ - (void)testHandleUniversalLinkRewrite {
126123

127124
IterableConfig *config = [[IterableConfig alloc] init];
128125
config.urlDelegate = urlDelegateMock;
129-
[IterableAPI initializeWithApiKey:@"" config:config];
126+
[IterableAPIImplementation initializeWithApiKey:@"" config:config];
130127
NSURL *iterableLink = [NSURL URLWithString:iterableRewriteURL];
131-
[IterableAPI handleUniversalLink:iterableLink];
128+
[IterableAPIImplementation handleUniversalLink:iterableLink];
132129

133130
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
134131
}
@@ -141,12 +138,12 @@ - (void)testDeeplinkAttributionInfo {
141138
XCTestExpectation *expectation = [self expectationWithDescription:@"High Expectations"];
142139
NSURL *normalLink = [NSURL URLWithString:iterableRewriteURL];
143140
ITEActionBlock uBlock = ^(NSString* redirectUrl) {
144-
XCTAssertEqualObjects(IterableAPI.sharedInstance.attributionInfo.campaignId, campaignId);
145-
XCTAssertEqualObjects(IterableAPI.sharedInstance.attributionInfo.templateId, templateId);
146-
XCTAssertEqualObjects(IterableAPI.sharedInstance.attributionInfo.messageId, messageId);
141+
XCTAssertEqualObjects(IterableAPIImplementation.sharedInstance.attributionInfo.campaignId, campaignId);
142+
XCTAssertEqualObjects(IterableAPIImplementation.sharedInstance.attributionInfo.templateId, templateId);
143+
XCTAssertEqualObjects(IterableAPIImplementation.sharedInstance.attributionInfo.messageId, messageId);
147144
[expectation fulfill];
148145
};
149-
[IterableAPI getAndTrackDeeplink:normalLink callbackBlock:uBlock];
146+
[IterableAPIImplementation getAndTrackDeeplink:normalLink callbackBlock:uBlock];
150147

151148
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
152149
}
@@ -159,7 +156,7 @@ - (void)testNoURLRedirect {
159156
XCTAssertNotEqual(exampleUrl, redirectUrl);
160157
XCTAssertEqualObjects(redirectRequest, redirectUrl);
161158
};
162-
[IterableAPI getAndTrackDeeplink:redirectLink callbackBlock:redirectBlock];
159+
[IterableAPIImplementation getAndTrackDeeplink:redirectLink callbackBlock:redirectBlock];
163160

164161
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
165162
}
@@ -172,7 +169,7 @@ - (void)testUniversalDeeplinkHttp {
172169
XCTAssertEqualObjects(googleHttps, redirectUrl);
173170
XCTAssertNotEqual(googleHttp, redirectUrl);
174171
};
175-
[IterableAPI getAndTrackDeeplink:googleHttpLink callbackBlock:googleHttpBlock];
172+
[IterableAPIImplementation getAndTrackDeeplink:googleHttpLink callbackBlock:googleHttpBlock];
176173

177174
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
178175
}
@@ -186,13 +183,13 @@ - (void)testUniversalDeeplinkHttps {
186183
[expectation fulfill];
187184
XCTAssertEqualObjects(googleHttps, redirectUrl);
188185
};
189-
[IterableAPI getAndTrackDeeplink:googleHttpsLink callbackBlock:googleHttpsBlock];
186+
[IterableAPIImplementation getAndTrackDeeplink:googleHttpsLink callbackBlock:googleHttpsBlock];
190187

191188
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
192189
}
193190

194191
- (void)testURLQueryParamRewrite {
195-
[IterableAPI initializeWithApiKey:@""];
192+
[IterableAPIImplementation initializeWithApiKey:@""];
196193

197194
NSCharacterSet* set = [NSCharacterSet URLQueryAllowedCharacterSet];
198195

@@ -211,19 +208,19 @@ - (void)testURLQueryParamRewrite {
211208
}
212209

213210
//Test full set of possible URLQueryAllowedCharacterSet characters
214-
NSString* encodedSet = [[IterableAPI sharedInstance] encodeURLParam:strSet];
211+
NSString* encodedSet = [[IterableAPIImplementation sharedInstance] encodeURLParam:strSet];
215212
XCTAssertNotEqual(encodedSet, strSet);
216213
XCTAssert([encodedSet isEqualToString:@"!$&'()*%2B,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"]);
217214

218-
NSString* encoded = [[IterableAPI sharedInstance] encodeURLParam:@"[email protected]"];
215+
NSString* encoded = [[IterableAPIImplementation sharedInstance] encodeURLParam:@"[email protected]"];
219216
XCTAssertNotEqual(encoded, @"[email protected]");
220217
XCTAssert([encoded isEqualToString:@"you%[email protected]"]);
221218

222-
NSString* emptySet = [[IterableAPI sharedInstance] encodeURLParam:@""];
219+
NSString* emptySet = [[IterableAPIImplementation sharedInstance] encodeURLParam:@""];
223220
XCTAssertEqual(emptySet, @"");
224221
XCTAssert([emptySet isEqualToString:@""]);
225222

226-
NSString* nilSet = [[IterableAPI sharedInstance] encodeURLParam:nil];
223+
NSString* nilSet = [[IterableAPIImplementation sharedInstance] encodeURLParam:nil];
227224
XCTAssertEqualObjects(nilSet, nil);
228225
}
229226

@@ -245,27 +242,27 @@ - (void)testRegisterToken {
245242

246243
IterableConfig *config = [[IterableConfig alloc] init];
247244
config.pushIntegrationName = @"pushIntegration";
248-
[IterableAPI initializeWithApiKey:@"apiKey" config:config];
249-
[[IterableAPI sharedInstance] setEmail:@"[email protected]"];
250-
[[IterableAPI sharedInstance] registerToken:[@"token" dataUsingEncoding:kCFStringEncodingUTF8]];
245+
[IterableAPIImplementation initializeWithApiKey:@"apiKey" config:config];
246+
[[IterableAPIImplementation sharedInstance] setEmail:@"[email protected]"];
247+
[[IterableAPIImplementation sharedInstance] registerToken:[@"token" dataUsingEncoding:kCFStringEncodingUTF8]];
251248

252249
[self waitForExpectations:@[expectation] timeout:5.0];
253250
[OHHTTPStubs removeAllStubs];
254251
}
255252

256253
- (void)testEmailUserIdPersistence {
257-
[IterableAPI initializeWithApiKey:@"apiKey"];
258-
[[IterableAPI sharedInstance] setEmail:@"[email protected]"];
254+
[IterableAPIImplementation initializeWithApiKey:@"apiKey"];
255+
[[IterableAPIImplementation sharedInstance] setEmail:@"[email protected]"];
259256

260-
[IterableAPI initializeWithApiKey:@"apiKey"];
261-
XCTAssertEqualObjects([IterableAPI sharedInstance].email, @"[email protected]");
262-
XCTAssertNil([IterableAPI sharedInstance].userId);
257+
[IterableAPIImplementation initializeWithApiKey:@"apiKey"];
258+
XCTAssertEqualObjects([IterableAPIImplementation sharedInstance].email, @"[email protected]");
259+
XCTAssertNil([IterableAPIImplementation sharedInstance].userId);
263260

264-
[[IterableAPI sharedInstance] setUserId:@"testUserId"];
261+
[[IterableAPIImplementation sharedInstance] setUserId:@"testUserId"];
265262

266-
[IterableAPI initializeWithApiKey:@"apiKey"];
267-
XCTAssertEqualObjects([IterableAPI sharedInstance].userId, @"testUserId");
268-
XCTAssertNil([IterableAPI sharedInstance].email);
263+
[IterableAPIImplementation initializeWithApiKey:@"apiKey"];
264+
XCTAssertEqualObjects([IterableAPIImplementation sharedInstance].userId, @"testUserId");
265+
XCTAssertNil([IterableAPIImplementation sharedInstance].email);
269266
}
270267

271268

‎Tests/swift-sdk-objc-tests/IterableAPIResponseTests.m

+21-21
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ @implementation IterableAPIResponseTests
2323

2424
- (void)setUp {
2525
[super setUp];
26-
[IterableAPI initializeWithApiKey:@""];
26+
[IterableAPIImplementation initializeWithApiKey:@""];
2727
}
2828

2929
- (void)tearDown {
@@ -56,8 +56,8 @@ - (void)testResponseCode200 {
5656

5757
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onSuccess is called"];
5858

59-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
60-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:^(NSDictionary * _Nonnull data) {
59+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
60+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:^(NSDictionary * _Nonnull data) {
6161
[expectation fulfill];
6262
XCTAssert([data isEqualToDictionary:responseData]);
6363
} onFailure:nil];
@@ -69,8 +69,8 @@ - (void)testResponseCode200WithNoData {
6969

7070
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
7171

72-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
73-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
72+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
73+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
7474
[expectation fulfill];
7575
XCTAssertEqualObjects(reason, @"No data received");
7676
}];
@@ -82,8 +82,8 @@ - (void)testResponseCode200WithInvalidJson {
8282

8383
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
8484

85-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
86-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
85+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
86+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
8787
[expectation fulfill];
8888
XCTAssert([reason containsString:@"Could not parse json"]);
8989
}];
@@ -95,8 +95,8 @@ - (void)testResponseCode400WithoutMessage {
9595

9696
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
9797

98-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
99-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
98+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
99+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
100100
[expectation fulfill];
101101
XCTAssert([reason containsString:@"Invalid Request"]);
102102
}];
@@ -108,8 +108,8 @@ - (void)testResponseCode400WithMessage {
108108

109109
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
110110

111-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
112-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
111+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
112+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
113113
[expectation fulfill];
114114
XCTAssertEqualObjects(reason, @"Test error");
115115
}];
@@ -121,8 +121,8 @@ - (void)testResponseCode401 {
121121

122122
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
123123

124-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
125-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
124+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
125+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
126126
[expectation fulfill];
127127
XCTAssertEqualObjects(reason, @"Invalid API Key");
128128
}];
@@ -134,8 +134,8 @@ - (void)testResponseCode500 {
134134

135135
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
136136

137-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
138-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
137+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
138+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
139139
[expectation fulfill];
140140
XCTAssertEqualObjects(reason, @"Internal Server Error");
141141
}];
@@ -147,8 +147,8 @@ - (void)testNon200ResponseCode {
147147

148148
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
149149

150-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
151-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
150+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
151+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
152152
[expectation fulfill];
153153
XCTAssert([reason containsString:@"Received non-200 response"]);
154154
}];
@@ -165,8 +165,8 @@ - (void)testNoNetworkResponse {
165165

166166
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
167167

168-
NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
169-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
168+
NSURLRequest *request = [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
169+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
170170
[expectation fulfill];
171171
XCTAssert([reason containsString:@"NSURLErrorDomain"]);
172172
}];
@@ -183,9 +183,9 @@ - (void)testNetworkTimeoutResponse {
183183

184184
XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
185185

186-
NSMutableURLRequest *request = (NSMutableURLRequest *) [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
186+
NSMutableURLRequest *request = (NSMutableURLRequest *) [[IterableAPIImplementation sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
187187
request.timeoutInterval = 0.01;
188-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
188+
[[IterableAPIImplementation sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
189189
[expectation fulfill];
190190
XCTAssert([reason containsString:@"timed out"]);
191191
}];

0 commit comments

Comments
 (0)