Skip to content

Commit fa39acf

Browse files
tapashmajumdertapashmajumder
committed
Rename IterableAPI => IterableAPIInternal
1 parent 49f1d30 commit fa39acf

9 files changed

+112
-114
lines changed

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

Lines changed: 21 additions & 21 deletions
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+
[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
60+
[[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
73+
[[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
86+
[[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
99+
[[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
112+
[[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
125+
[[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
138+
[[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
151+
[[IterableAPIInternal 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 = [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
169+
[[IterableAPIInternal 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 *) [[IterableAPIInternal sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
187187
request.timeoutInterval = 0.01;
188-
[[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
188+
[[IterableAPIInternal sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
189189
[expectation fulfill];
190190
XCTAssert([reason containsString:@"timed out"]);
191191
}];

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ @implementation IterableAPITests
3434
- (void)setUp {
3535
[super setUp];
3636

37-
[IterableAPI initializeWithApiKey:@""];
37+
[IterableAPIInternal initializeWithApiKey:@""];
3838
}
3939

4040
- (void)tearDown {
@@ -43,8 +43,8 @@ - (void)tearDown {
4343
}
4444

4545
- (void)testPushServicePlatformToString {
46-
XCTAssertEqualObjects(@"APNS", [IterableAPI pushServicePlatformToString:APNS]);
47-
XCTAssertEqualObjects(@"APNS_SANDBOX", [IterableAPI pushServicePlatformToString:APNS_SANDBOX]);
46+
XCTAssertEqualObjects(@"APNS", [IterableAPIInternal pushServicePlatformToString:APNS]);
47+
XCTAssertEqualObjects(@"APNS_SANDBOX", [IterableAPIInternal pushServicePlatformToString:APNS_SANDBOX]);
4848
}
4949

5050
- (void)testDictToJson {
@@ -65,7 +65,7 @@ - (void)testDictToJson {
6565
}
6666
}
6767
};
68-
NSString *result = [IterableAPI dictToJson:args];
68+
NSString *result = [IterableAPIInternal dictToJson:args];
6969
NSData *data = [result dataUsingEncoding:NSUTF8StringEncoding];
7070
id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
7171
XCTAssertEqualObjects(args, json);
@@ -81,12 +81,12 @@ - (void)testDictToJson {
8181
}
8282

8383
- (void)testUserInterfaceIdionEnumToString {
84-
XCTAssertEqualObjects(@"Phone", [IterableAPI userInterfaceIdiomEnumToString:UIUserInterfaceIdiomPhone]);
85-
XCTAssertEqualObjects(@"Pad", [IterableAPI userInterfaceIdiomEnumToString:UIUserInterfaceIdiomPad]);
84+
XCTAssertEqualObjects(@"Phone", [IterableAPIInternal userInterfaceIdiomEnumToString:UIUserInterfaceIdiomPhone]);
85+
XCTAssertEqualObjects(@"Pad", [IterableAPIInternal userInterfaceIdiomEnumToString:UIUserInterfaceIdiomPad]);
8686
// 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]);
87+
XCTAssertEqualObjects(@"Unspecified", [IterableAPIInternal userInterfaceIdiomEnumToString:UIUserInterfaceIdiomTV]);
88+
XCTAssertEqualObjects(@"Unspecified", [IterableAPIInternal userInterfaceIdiomEnumToString:UIUserInterfaceIdiomUnspecified]);
89+
XCTAssertEqualObjects(@"Unspecified", [IterableAPIInternal userInterfaceIdiomEnumToString:192387]);
9090
}
9191

9292
- (void)testUniversalDeeplinkRewrite {
@@ -97,7 +97,7 @@ - (void)testUniversalDeeplinkRewrite {
9797
XCTAssertTrue(NSThread.isMainThread);
9898
[expectation fulfill];
9999
};
100-
[IterableAPI getAndTrackDeeplink:iterableLink callbackBlock:aBlock];
100+
[IterableAPIInternal getAndTrackDeeplink:iterableLink callbackBlock:aBlock];
101101

102102
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
103103
}
@@ -109,7 +109,7 @@ - (void)testUniversalDeeplinkNoRewrite {
109109
XCTAssertEqualObjects(iterableNoRewriteURL, redirectUrl);
110110
[expectation fulfill];
111111
};
112-
[IterableAPI getAndTrackDeeplink:normalLink callbackBlock:uBlock];
112+
[IterableAPIInternal getAndTrackDeeplink:normalLink callbackBlock:uBlock];
113113

114114
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
115115
}
@@ -126,9 +126,9 @@ - (void)testHandleUniversalLinkRewrite {
126126

127127
IterableConfig *config = [[IterableConfig alloc] init];
128128
config.urlDelegate = urlDelegateMock;
129-
[IterableAPI initializeWithApiKey:@"" config:config];
129+
[IterableAPIInternal initializeWithApiKey:@"" config:config];
130130
NSURL *iterableLink = [NSURL URLWithString:iterableRewriteURL];
131-
[IterableAPI handleUniversalLink:iterableLink];
131+
[IterableAPIInternal handleUniversalLink:iterableLink];
132132

133133
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
134134
}
@@ -141,12 +141,12 @@ - (void)testDeeplinkAttributionInfo {
141141
XCTestExpectation *expectation = [self expectationWithDescription:@"High Expectations"];
142142
NSURL *normalLink = [NSURL URLWithString:iterableRewriteURL];
143143
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);
144+
XCTAssertEqualObjects(IterableAPIInternal.sharedInstance.attributionInfo.campaignId, campaignId);
145+
XCTAssertEqualObjects(IterableAPIInternal.sharedInstance.attributionInfo.templateId, templateId);
146+
XCTAssertEqualObjects(IterableAPIInternal.sharedInstance.attributionInfo.messageId, messageId);
147147
[expectation fulfill];
148148
};
149-
[IterableAPI getAndTrackDeeplink:normalLink callbackBlock:uBlock];
149+
[IterableAPIInternal getAndTrackDeeplink:normalLink callbackBlock:uBlock];
150150

151151
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
152152
}
@@ -159,7 +159,7 @@ - (void)testNoURLRedirect {
159159
XCTAssertNotEqual(exampleUrl, redirectUrl);
160160
XCTAssertEqualObjects(redirectRequest, redirectUrl);
161161
};
162-
[IterableAPI getAndTrackDeeplink:redirectLink callbackBlock:redirectBlock];
162+
[IterableAPIInternal getAndTrackDeeplink:redirectLink callbackBlock:redirectBlock];
163163

164164
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
165165
}
@@ -172,7 +172,7 @@ - (void)testUniversalDeeplinkHttp {
172172
XCTAssertEqualObjects(googleHttps, redirectUrl);
173173
XCTAssertNotEqual(googleHttp, redirectUrl);
174174
};
175-
[IterableAPI getAndTrackDeeplink:googleHttpLink callbackBlock:googleHttpBlock];
175+
[IterableAPIInternal getAndTrackDeeplink:googleHttpLink callbackBlock:googleHttpBlock];
176176

177177
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
178178
}
@@ -186,13 +186,13 @@ - (void)testUniversalDeeplinkHttps {
186186
[expectation fulfill];
187187
XCTAssertEqualObjects(googleHttps, redirectUrl);
188188
};
189-
[IterableAPI getAndTrackDeeplink:googleHttpsLink callbackBlock:googleHttpsBlock];
189+
[IterableAPIInternal getAndTrackDeeplink:googleHttpsLink callbackBlock:googleHttpsBlock];
190190

191191
[self waitForExpectationsWithTimeout:IterableNetworkResponseExpectationTimeout handler:nil];
192192
}
193193

194194
- (void)testURLQueryParamRewrite {
195-
[IterableAPI initializeWithApiKey:@""];
195+
[IterableAPIInternal initializeWithApiKey:@""];
196196

197197
NSCharacterSet* set = [NSCharacterSet URLQueryAllowedCharacterSet];
198198

@@ -211,19 +211,19 @@ - (void)testURLQueryParamRewrite {
211211
}
212212

213213
//Test full set of possible URLQueryAllowedCharacterSet characters
214-
NSString* encodedSet = [[IterableAPI sharedInstance] encodeURLParam:strSet];
214+
NSString* encodedSet = [[IterableAPIInternal sharedInstance] encodeURLParam:strSet];
215215
XCTAssertNotEqual(encodedSet, strSet);
216216
XCTAssert([encodedSet isEqualToString:@"!$&'()*%2B,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"]);
217217

218-
NSString* encoded = [[IterableAPI sharedInstance] encodeURLParam:@"[email protected]"];
218+
NSString* encoded = [[IterableAPIInternal sharedInstance] encodeURLParam:@"[email protected]"];
219219
XCTAssertNotEqual(encoded, @"[email protected]");
220220
XCTAssert([encoded isEqualToString:@"you%[email protected]"]);
221221

222-
NSString* emptySet = [[IterableAPI sharedInstance] encodeURLParam:@""];
222+
NSString* emptySet = [[IterableAPIInternal sharedInstance] encodeURLParam:@""];
223223
XCTAssertEqual(emptySet, @"");
224224
XCTAssert([emptySet isEqualToString:@""]);
225225

226-
NSString* nilSet = [[IterableAPI sharedInstance] encodeURLParam:nil];
226+
NSString* nilSet = [[IterableAPIInternal sharedInstance] encodeURLParam:nil];
227227
XCTAssertEqualObjects(nilSet, nil);
228228
}
229229

@@ -245,27 +245,27 @@ - (void)testRegisterToken {
245245

246246
IterableConfig *config = [[IterableConfig alloc] init];
247247
config.pushIntegrationName = @"pushIntegration";
248-
[IterableAPI initializeWithApiKey:@"apiKey" config:config];
249-
[[IterableAPI sharedInstance] setEmail:@"[email protected]"];
250-
[[IterableAPI sharedInstance] registerToken:[@"token" dataUsingEncoding:kCFStringEncodingUTF8]];
248+
[IterableAPIInternal initializeWithApiKey:@"apiKey" config:config];
249+
[[IterableAPIInternal sharedInstance] setEmail:@"[email protected]"];
250+
[[IterableAPIInternal sharedInstance] registerToken:[@"token" dataUsingEncoding:kCFStringEncodingUTF8]];
251251

252252
[self waitForExpectations:@[expectation] timeout:5.0];
253253
[OHHTTPStubs removeAllStubs];
254254
}
255255

256256
- (void)testEmailUserIdPersistence {
257-
[IterableAPI initializeWithApiKey:@"apiKey"];
258-
[[IterableAPI sharedInstance] setEmail:@"[email protected]"];
257+
[IterableAPIInternal initializeWithApiKey:@"apiKey"];
258+
[[IterableAPIInternal sharedInstance] setEmail:@"[email protected]"];
259259

260-
[IterableAPI initializeWithApiKey:@"apiKey"];
261-
XCTAssertEqualObjects([IterableAPI sharedInstance].email, @"[email protected]");
262-
XCTAssertNil([IterableAPI sharedInstance].userId);
260+
[IterableAPIInternal initializeWithApiKey:@"apiKey"];
261+
XCTAssertEqualObjects([IterableAPIInternal sharedInstance].email, @"[email protected]");
262+
XCTAssertNil([IterableAPIInternal sharedInstance].userId);
263263

264-
[[IterableAPI sharedInstance] setUserId:@"testUserId"];
264+
[[IterableAPIInternal sharedInstance] setUserId:@"testUserId"];
265265

266-
[IterableAPI initializeWithApiKey:@"apiKey"];
267-
XCTAssertEqualObjects([IterableAPI sharedInstance].userId, @"testUserId");
268-
XCTAssertNil([IterableAPI sharedInstance].email);
266+
[IterableAPIInternal initializeWithApiKey:@"apiKey"];
267+
XCTAssertEqualObjects([IterableAPIInternal sharedInstance].userId, @"testUserId");
268+
XCTAssertNil([IterableAPIInternal sharedInstance].email);
269269
}
270270

271271

‎Tests/swift-sdk-swift-tests/IterableActionRunnerTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class IterableActionRunnerTests: XCTestCase {
1717
override func setUp() {
1818
super.setUp()
1919
// Put setup code here. This method is called before the invocation of each test method in the class.
20-
IterableAPI.initialize(apiKey:"", config: IterableConfig())
20+
IterableAPIInternal.initialize(apiKey:"", config: IterableConfig())
2121
}
2222

2323
override func tearDown() {

‎Tests/swift-sdk-swift-tests/IterableNotificationResponseTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class IterableNotificationResponseTests: XCTestCase {
2121
override func setUp() {
2222
super.setUp()
2323
// Put setup code here. This method is called before the invocation of each test method in the class.
24-
IterableAPI.initialize(apiKey:"", config: IterableConfig(), dateProvider: dateProvider)
24+
IterableAPIInternal.initialize(apiKey:"", config: IterableConfig(), dateProvider: dateProvider)
2525
}
2626

2727
override func tearDown() {
@@ -136,7 +136,7 @@ class IterableNotificationResponseTests: XCTestCase {
136136
}
137137

138138
func testSavePushPayload() {
139-
let api = IterableAPI.sharedInstance!
139+
let api = IterableAPIInternal.sharedInstance!
140140
let messageId = UUID().uuidString
141141
let userInfo: [AnyHashable : Any] = [
142142
"itbl": [
@@ -171,7 +171,7 @@ class IterableNotificationResponseTests: XCTestCase {
171171
}
172172

173173
func testSaveAttributionInfo() {
174-
let api = IterableAPI.sharedInstance!
174+
let api = IterableAPIInternal.sharedInstance!
175175
let messageId = UUID().uuidString
176176
let userInfo: [AnyHashable : Any] = [
177177
"itbl": [

0 commit comments

Comments
 (0)