Skip to content

Commit f70fe31

Browse files
nsingh-branchnsingh-branch
committed
Updated existing tests
1 parent a9345c6 commit f70fe31

File tree

5 files changed

+9
-103
lines changed

5 files changed

+9
-103
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -241,24 +241,4 @@ - (void)testURLSkipList {
241241
XCTAssert([filterDesc isEqualToString:valueDesc]);
242242
}
243243

244-
//- (void)testReferrerGBRAIDValidityWindow {
245-
//
246-
// NSTimeInterval DEFAULT_REFERRER_GBRAID_WINDOW = 2592000;
247-
//
248-
// XCTAssertEqual(self.prefHelper.referrerGBRAIDValidityWindow, DEFAULT_REFERRER_GBRAID_WINDOW);
249-
//
250-
// NSTimeInterval randomNumber = 9000;
251-
// self.prefHelper.referrerGBRAIDValidityWindow = randomNumber;
252-
// XCTAssertEqual(self.prefHelper.referrerGBRAIDValidityWindow, randomNumber);
253-
//
254-
// NSString *gbraidValue = @"CjwKCAiA3L6PBhBvEiwAINlJ9Chixm216y8kYYJ1K94dm4FEkOgFfhIdKQdjWsYB7FqE7rf_zkGNEhoCuIEQAvD_BwE";
255-
// self.prefHelper.referrerGBRAID = gbraidValue;
256-
// XCTAssertTrue([self.prefHelper.referrerGBRAID isEqualToString:gbraidValue]);
257-
//
258-
// NSDate *now = [NSDate date];
259-
// self.prefHelper.referrerGBRAIDInitDate = now;
260-
// XCTAssertEqual(self.prefHelper.referrerGBRAIDInitDate, now);
261-
//
262-
//}
263-
264244
@end

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

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -423,53 +423,4 @@ - (void)testRequestIdFromHeader {
423423
[self waitForExpectationsWithTimeout:5.0 handler:nil];
424424
}
425425

426-
//- (void) testServerInterfaceDictionaryPrepForGbraid {
427-
//
428-
// [HTTPStubs removeAllStubs];
429-
//
430-
// BNCServerInterface *serverInterface = [[BNCServerInterface alloc] init];
431-
// serverInterface.preferenceHelper = [BNCPreferenceHelper sharedInstance];
432-
// serverInterface.preferenceHelper.retryCount = 3;
433-
// serverInterface.requestEndpoint = @"/v2/event/standard";
434-
//
435-
// [BNCPreferenceHelper sharedInstance].randomizedBundleToken = @"575759106028389737";
436-
//
437-
// // Set referrerGBRAID and referrerGBRAIDInitDate
438-
// NSString *gbraidValue = @"CjwKCAiA3L6PBhBvEiwAINlJ9Chixm216y8kYYJ1K94dm4FEkOgFfhIdKQdjWsYB7FqE7rf_zkGNEhoCuIEQAvD_BwE";
439-
// [BNCPreferenceHelper sharedInstance].referrerGBRAID = gbraidValue;
440-
// NSDate *now = [NSDate date];
441-
// [BNCPreferenceHelper sharedInstance].referrerGBRAIDInitDate = now;
442-
//
443-
// //Check - gbraid should be present
444-
// NSMutableDictionary *result = [serverInterface prepareParamDict:NULL key:@"1234567890" retryNumber:3 requestType:@"POST"];
445-
// XCTAssertNotNil([result objectForKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID]);
446-
// XCTAssertTrue([[result objectForKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID] isEqualToString:gbraidValue]);
447-
//
448-
// // Check for gbraid timestamp
449-
// XCTAssertNotNil([result objectForKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID_TIMESTAMP]);
450-
// NSString *tsInMs = [NSString stringWithFormat:@"%lld", (long long)([now timeIntervalSince1970]*1000)];
451-
// XCTAssertTrue([[result objectForKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID_TIMESTAMP] isEqualToString:tsInMs]);
452-
//
453-
// //Check - gbraid should be present - endpoint is open
454-
// serverInterface.requestEndpoint = @"/v1/open";
455-
// result = [serverInterface prepareParamDict:NULL key:@"1234567890" retryNumber:3 requestType:@"POST"];
456-
// XCTAssertNotNil([result objectForKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID]);
457-
//
458-
// //Check - gbraid should not be present - validity is expired
459-
// NSDate *pastDate = [[NSDate date] dateByAddingTimeInterval:-2592001];
460-
// [BNCPreferenceHelper sharedInstance].referrerGBRAIDInitDate = pastDate;
461-
// serverInterface.requestEndpoint = @"/v2/event/standard";
462-
// result = [serverInterface prepareParamDict:NULL key:@"1234567890" retryNumber:3 requestType:@"POST"];
463-
// XCTAssertNil([result objectForKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID]);
464-
//
465-
// //Check - gbraid should be present. Date is reset
466-
// [BNCPreferenceHelper sharedInstance].referrerGBRAIDInitDate = now;
467-
// result = [serverInterface prepareParamDict:NULL key:@"1234567890" retryNumber:3 requestType:@"POST"];
468-
// XCTAssertNotNil([result objectForKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID]);
469-
// XCTAssertTrue([[result objectForKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID] isEqualToString:gbraidValue]);
470-
//
471-
// [BNCPreferenceHelper sharedInstance].referrerGBRAID = nil;
472-
//
473-
//}
474-
475426
@end

‎Branch-TestBed/Branch-SDK-Tests/BNCTestCase.strings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ Instance 0x132585f70 is of class 'DumpClass' of class 'NSObject':
135135
"
136136
{
137137
\"name\": \"PURCHASE\",
138+
\"gbraid\": \"gbraid456\",
139+
\"gclid\": \"gclid123\",
138140
\"metadata\" : {
139141
\"skan_time_window\": \"5184000.000000\"
140142
},

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

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -131,22 +131,6 @@ - (void) testEvent {
131131
expectedRequest[@"branch_key"] = Branch.branchKey;
132132
expectedRequest[@"user_data"] = [[BNCDeviceInfo getInstance] v2dictionary];
133133

134-
// Add params for Gbraid
135-
// BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
136-
// if(preferenceHelper.referrerGBRAID){
137-
// NSTimeInterval validityWindow = preferenceHelper.referrerGBRAIDValidityWindow;
138-
// if (validityWindow) {
139-
// NSDate *initDate = preferenceHelper.referrerGBRAIDInitDate ;
140-
// NSDate *expirationDate = [initDate dateByAddingTimeInterval:validityWindow];
141-
// NSDate *now = [NSDate date];
142-
// if ([now compare:expirationDate] == NSOrderedAscending) {
143-
// expectedRequest[BRANCH_REQUEST_KEY_REFERRER_GBRAID] = preferenceHelper.referrerGBRAID;
144-
// long long timestampInMilliSec = (long long)([initDate timeIntervalSince1970] * 1000.0);
145-
// expectedRequest[BRANCH_REQUEST_KEY_REFERRER_GBRAID_TIMESTAMP] = [NSString stringWithFormat:@"%lld", timestampInMilliSec];
146-
// }
147-
// }
148-
// }
149-
150134
Branch *branch = [Branch getInstance:@"key_live_foo"];
151135
XCTestExpectation *expectation = [self expectationWithDescription:@"v2-event"];
152136
id serverInterfaceMock = OCMPartialMock(branch.serverInterface);
@@ -172,6 +156,8 @@ - (void) testEvent {
172156
NSLog(@"testEvent 1");
173157
NSLog(@"URL: %@.", url);
174158
NSLog(@"Body: %@.", parameters);
159+
160+
expectedRequest[@"gbraid_timestamp"] = parameters[@"gbraid_timestamp"];
175161

176162
if ([url containsString:@"branch.io/v2/event/standard"]) {
177163
XCTAssertEqualObjects(expectedRequest, parameters);
@@ -182,7 +168,7 @@ - (void) testEvent {
182168
[branch clearNetworkQueue];
183169
event.contentItems = (NSMutableArray*) @[ buo ];
184170
[event logEvent];
185-
[self waitForExpectationsWithTimeout:5.0 handler:nil];
171+
[self waitForExpectationsWithTimeout:15.0 handler:nil];
186172
[serverInterfaceMock stopMocking];
187173
}
188174

@@ -196,22 +182,6 @@ - (void) testUserCompletedAction {
196182
expectedRequest[@"event_data"] = nil;
197183
expectedRequest[@"custom_data"] = nil;
198184
expectedRequest[@"customer_event_alias"] = nil;
199-
200-
// Add params for Gbraid
201-
// BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
202-
// if(preferenceHelper.referrerGBRAID){
203-
// NSTimeInterval validityWindow = preferenceHelper.referrerGBRAIDValidityWindow;
204-
// if (validityWindow) {
205-
// NSDate *initDate = preferenceHelper.referrerGBRAIDInitDate ;
206-
// NSDate *expirationDate = [initDate dateByAddingTimeInterval:validityWindow];
207-
// NSDate *now = [NSDate date];
208-
// if ([now compare:expirationDate] == NSOrderedAscending) {
209-
// expectedRequest[BRANCH_REQUEST_KEY_REFERRER_GBRAID] = preferenceHelper.referrerGBRAID;
210-
// long long timestampInMilliSec = (long long)([initDate timeIntervalSince1970] * 1000.0);
211-
// expectedRequest[BRANCH_REQUEST_KEY_REFERRER_GBRAID_TIMESTAMP] = [NSString stringWithFormat:@"%lld", timestampInMilliSec];
212-
// }
213-
// }
214-
// }
215185

216186
Branch *branch = [Branch getInstance:@"key_live_foo"];
217187
XCTestExpectation *expectation = [self expectationWithDescription:@"v2-event-user-action"];
@@ -238,6 +208,8 @@ - (void) testUserCompletedAction {
238208
NSLog(@"URL: %@.", url);
239209
NSLog(@"Body: %@.", parameters);
240210

211+
expectedRequest[@"gbraid_timestamp"] = parameters[@"gbraid_timestamp"];
212+
241213
if ([url containsString:@"branch.io/v2/event/standard"]) {
242214
XCTAssertEqualObjects(expectedRequest, parameters);
243215
[expectation fulfill];

‎BranchSDK/BNCReferringURLUtility.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,13 @@ - (NSMutableDictionary *)serializeToJson:(NSMutableDictionary<NSString *, BNCUrl
165165
param.name = paramDict[BRANCH_URL_QUERY_PARAMETERS_NAME_KEY];
166166
param.value = paramDict[BRANCH_URL_QUERY_PARAMETERS_VALUE_KEY];
167167
param.timestamp = paramDict[BRANCH_URL_QUERY_PARAMETERS_TIMESTAMP_KEY];
168+
param.validityWindow = [paramDict[BRANCH_URL_QUERY_PARAMETERS_VALIDITY_WINDOW_KEY] doubleValue];
169+
168170
if (paramDict[BRANCH_URL_QUERY_PARAMETERS_IS_DEEPLINK_KEY] != nil) {
169171
param.isDeepLink = ((NSNumber *)paramDict[BRANCH_URL_QUERY_PARAMETERS_IS_DEEPLINK_KEY]).boolValue;
170172
} else {
171173
param.isDeepLink = NO;
172174
}
173-
param.validityWindow = [paramDict[BRANCH_URL_QUERY_PARAMETERS_VALIDITY_WINDOW_KEY] doubleValue];
174175

175176
result[param.name] = param;
176177
}

0 commit comments

Comments
 (0)