Merge branch 'master' into SDK-2060-Add-endpoint-manager

Author: echo-branch

Branch-TestBed/Branch-SDK-Tests/BNCReferringURLUtilityTests.m

@@ -401,4 +401,116 @@ - (void)verifyOldGbraidDataIsCleared {
     XCTAssertNil([BNCPreferenceHelper sharedInstance].referrerGBRAIDInitDate);
 }
 
+- (void)testReferringURLWithSccid {
+    NSURL *url = [NSURL URLWithString:@"https://bnctestbed.app.link?sccid=12345"];
+    NSDictionary *expected = @{
+        @"sccid": @"12345"
+    };
+    
+    BNCReferringURLUtility *utility = [self referringUtilityForTests];
+    [utility parseReferringURL:url];
+    NSDictionary *params = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    
+    XCTAssert([expected isEqualToDictionary:params]);
+}
+
+- (void)testReferringURLWithSccidMixedCase {
+    NSURL *url = [NSURL URLWithString:@"https://bnctestbed.app.link?ScCiD=12345"];
+    NSDictionary *expected = @{
+        @"sccid": @"12345"
+    };
+    
+    BNCReferringURLUtility *utility = [self referringUtilityForTests];
+    [utility parseReferringURL:url];
+    NSDictionary *params = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    
+    XCTAssert([expected isEqualToDictionary:params]);
+}
+
+- (void)testReferringURLWithSccidNoValue {
+    NSURL *url = [NSURL URLWithString:@"https://bnctestbed.app.link?sccid="];
+    NSDictionary *expected = @{
+        @"sccid": @""
+    };
+    
+    BNCReferringURLUtility *utility = [self referringUtilityForTests];
+    [utility parseReferringURL:url];
+    NSDictionary *params = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    
+    XCTAssert([expected isEqualToDictionary:params]);
+}
+
+- (void)testReferringURLWithSccidValueCasePreserved {
+    NSURL *url = [NSURL URLWithString:@"https://bnctestbed.app.link?sccid=aAbBcC"];
+    NSDictionary *expected = @{
+        @"sccid": @"aAbBcC"
+    };
+    
+    BNCReferringURLUtility *utility = [self referringUtilityForTests];
+    [utility parseReferringURL:url];
+    NSDictionary *params = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    
+    XCTAssert([expected isEqualToDictionary:params]);
+}
+
+- (void)testReferringURLWithSccidIgnoredParam {
+    NSURL *url = [NSURL URLWithString:@"https://bnctestbed.app.link?sccid=12345&other=abcde"];
+    NSDictionary *expected = @{
+        @"sccid": @"12345"
+    };
+    
+    BNCReferringURLUtility *utility = [self referringUtilityForTests];
+    [utility parseReferringURL:url];
+    NSDictionary *params = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    
+    XCTAssert([expected isEqualToDictionary:params]);
+}
+
+- (void)testReferringURLWithSccidFragment{
+    NSURL *url = [NSURL URLWithString:@"https://bnctestbed.app.link?sccid=12345#header"];
+    NSDictionary *expected = @{
+        @"sccid": @"12345"
+    };
+    
+    BNCReferringURLUtility *utility = [self referringUtilityForTests];
+    [utility parseReferringURL:url];
+    NSDictionary *params = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    
+    XCTAssert([expected isEqualToDictionary:params]);
+}
+
+- (void)testReferringURLWithSccidAsFragment{
+    NSURL *url = [NSURL URLWithString:@"https://bnctestbed.app.link?other=abcde#sccid=12345"];
+    NSDictionary *expected = @{ };
+    
+    BNCReferringURLUtility *utility = [self referringUtilityForTests];
+    [utility parseReferringURL:url];
+    NSDictionary *params = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    
+    XCTAssert([expected isEqualToDictionary:params]);
+}
+
+- (void)testReferringURLWithSccidOverwritesValue {
+    NSURL *url = [NSURL URLWithString:@"https://bnctestbed.app.link?sccid=12345"];
+    NSDictionary *expected = @{
+        @"sccid": @"12345"
+    };
+    
+    NSURL *url2 = [NSURL URLWithString:@"https://bnctestbed.app.link?sccid=abcde"];
+    NSDictionary *expected2 = @{
+        @"sccid": @"abcde"
+    };
+    
+    BNCReferringURLUtility *utility = [self referringUtilityForTests];
+    [utility parseReferringURL:url];
+    NSDictionary *params = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    XCTAssert([expected isEqualToDictionary:params]);
+    
+    [utility parseReferringURL:url2];
+    NSDictionary *params2 = [utility referringURLQueryParamsForEndpoint:openEndpoint];
+    
+    XCTAssert([expected2 isEqualToDictionary:params2]);
+}
+
+
 @end

Branch-TestBed/Branch-SDK-Tests/BNCServerRequestQueueTests.m

@@ -15,10 +15,6 @@
 #import "BranchInstallRequest.h"
 #import "BranchOpenRequest.h"
 #import "BranchEvent.h"
-#import "BNCCommerceEvent.h"
-#import "BranchUserCompletedActionRequest.h"
-#import "BranchSetIdentityRequest.h"
-#import "BranchLogoutRequest.h"
 
 @interface BNCServerRequestQueue ()
 - (NSData *)archiveQueue:(NSArray<BNCServerRequest *> *)queue;
@@ -106,58 +102,6 @@ - (void)testArchiveEventRequest {
     // The request object is not very test friendly, so comparing the two is not helpful at the moment
 }
 
-- (void)testArchiveCommerceEventRequest {
-    BranchCommerceEventRequest *object = [BranchCommerceEventRequest new];
-    
-    NSData *archived = [self.queue archiveObject:object];
-    XCTAssertNotNil(archived);
-    
-    BranchCommerceEventRequest *unarchived = [self.queue unarchiveObjectFromData:archived];
-    XCTAssertNotNil(unarchived);
-    XCTAssert([unarchived isKindOfClass:[BranchCommerceEventRequest class]]);
-
-    // The request object is not very test friendly, so comparing the two is not helpful at the moment
-}
-
-- (void)testArchiveUserCompletedActionRequest {
-    BranchUserCompletedActionRequest *object = [BranchUserCompletedActionRequest new];
-    
-    NSData *archived = [self.queue archiveObject:object];
-    XCTAssertNotNil(archived);
-    
-    BranchUserCompletedActionRequest *unarchived = [self.queue unarchiveObjectFromData:archived];
-    XCTAssertNotNil(unarchived);
-    XCTAssert([unarchived isKindOfClass:[BranchUserCompletedActionRequest class]]);
-
-    // The request object is not very test friendly, so comparing the two is not helpful at the moment
-}
-
-- (void)testArchiveSetIdentityRequest {
-    BranchSetIdentityRequest *object = [BranchSetIdentityRequest new];
-    
-    NSData *archived = [self.queue archiveObject:object];
-    XCTAssertNotNil(archived);
-    
-    BranchSetIdentityRequest *unarchived = [self.queue unarchiveObjectFromData:archived];
-    XCTAssertNotNil(unarchived);
-    XCTAssert([unarchived isKindOfClass:[BranchSetIdentityRequest class]]);
-
-    // The request object is not very test friendly, so comparing the two is not helpful at the moment
-}
-
-- (void)testArchiveLogoutRequest {
-    BranchLogoutRequest *object = [BranchLogoutRequest new];
-    
-    NSData *archived = [self.queue archiveObject:object];
-    XCTAssertNotNil(archived);
-    
-    BranchLogoutRequest *unarchived = [self.queue unarchiveObjectFromData:archived];
-    XCTAssertNotNil(unarchived);
-    XCTAssert([unarchived isKindOfClass:[BranchLogoutRequest class]]);
-
-    // The request object is not very test friendly, so comparing the two is not helpful at the moment
-}
-
 - (void)testArchiveArrayOfRequests {
     NSMutableArray<BNCServerRequest *> *tmp = [NSMutableArray<BNCServerRequest *> new];
     [tmp addObject:[BranchOpenRequest new]];
@@ -189,7 +133,6 @@ - (void)testArchiveArrayOfInvalidObjects {
     [tmp addObject:[BranchOpenRequest new]];
     [tmp addObject:@"Hello World"];
     [tmp addObject:[BranchEventRequest new]];
-    [tmp addObject:[BranchCloseRequest new]];
 
     NSData *data = [self.queue archiveQueue:tmp];
     XCTAssertNotNil(data);
@@ -205,7 +148,6 @@ - (void)testOldArchiveArrayOfInvalidObjects {
     [tmp addObject:[BranchOpenRequest new]];
     [tmp addObject:@"Hello World"];
     [tmp addObject:[BranchEventRequest new]];
-    [tmp addObject:[BranchCloseRequest new]];
 
     NSData *data = [self.queue oldArchiveQueue:tmp];
     XCTAssertNotNil(data);

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

@@ -170,99 +170,6 @@ - (void) testEvent {
     [serverInterfaceMock stopMocking];
 }
 
-- (void) testUserCompletedAction {
-    // Mock the result. Fix up the expectedParameters for simulator hardware --
-
-    NSMutableDictionary *expectedRequest =
-        [self mutableDictionaryFromBundleJSONWithKey:@"V2EventJSON"];
-    expectedRequest[@"branch_key"] = Branch.branchKey;
-    expectedRequest[@"user_data"] = [[BNCDeviceInfo getInstance] v2dictionary];
-    expectedRequest[@"event_data"] = nil;
-    expectedRequest[@"custom_data"] = nil;
-    expectedRequest[@"customer_event_alias"] = nil;
-
-    Branch *branch = [Branch getInstance:@"key_live_foo"];
-    XCTestExpectation *expectation = [self expectationWithDescription:@"v2-event-user-action"];
-    id serverInterfaceMock = OCMPartialMock(branch.serverInterface);
-
-    OCMStub(
-        [serverInterfaceMock genericHTTPRequest:[OCMArg any]
-            retryNumber:0
-            callback:[OCMArg any]
-            retryHandler:[OCMArg any]]
-    ).andDo(^(NSInvocation *invocation) {
-
-        __unsafe_unretained NSURLRequest *request = nil;
-        [invocation getArgument:&request atIndex:2];
-
-        NSError *error = nil;
-        NSString *url = request.URL.absoluteString;
-        NSData *bodyData = request.HTTPBody;
-        NSDictionary *parameters =
-            [NSJSONSerialization JSONObjectWithData:bodyData options:0 error:&error];
-        XCTAssertNil(error);
-
-        NSLog(@"2");
-        NSLog(@"URL: %@.", url);
-        NSLog(@"Body: %@.", parameters);
-
-        if ([url containsString:@"branch.io/v2/event/standard"]) {
-            XCTAssertEqualObjects(expectedRequest, parameters);
-            [expectation fulfill];
-        } else {
-            XCTFail(@"URL is unexpected. %@", url);
-        }
-    });
-
-    // Set up the Branch Univseral Object --
-
-    BranchUniversalObject *buo = [BranchUniversalObject new];
-    buo.canonicalIdentifier = @"item/12345";
-    buo.canonicalUrl        = @"https://branch.io/deepviews";
-    buo.title               = @"My Content Title";
-    buo.contentDescription  = @"my_product_description1";
-    buo.imageUrl            = @"https://test_img_url";
-    buo.keywords            = @[ @"My_Keyword1", @"My_Keyword2"];
-    buo.creationDate        = [NSDate dateWithTimeIntervalSince1970:1501869445321.0/1000.0];
-    buo.expirationDate      = [NSDate dateWithTimeIntervalSince1970:212123232544.0/1000.0];
-    buo.locallyIndex        = YES;
-    buo.publiclyIndex       = NO;
-
-    buo.contentMetadata.contentSchema    = BranchContentSchemaCommerceProduct;
-    buo.contentMetadata.quantity         = 2;
-    buo.contentMetadata.price            = [NSDecimalNumber decimalNumberWithString:@"23.2"];
-    buo.contentMetadata.currency         = BNCCurrencyUSD;
-    buo.contentMetadata.sku              = @"1994320302";
-    buo.contentMetadata.productName      = @"my_product_name1";
-    buo.contentMetadata.productBrand     = @"my_prod_Brand1";
-    buo.contentMetadata.productCategory  = BNCProductCategoryBabyToddler;
-    buo.contentMetadata.productVariant   = @"3T";
-    buo.contentMetadata.condition        = @"FAIR";
-    buo.contentMetadata.ratingAverage    = 5;
-    buo.contentMetadata.ratingCount      = 5;
-    buo.contentMetadata.ratingMax        = 7;
-    buo.contentMetadata.rating           = 6;
-    buo.contentMetadata.addressStreet    = @"Street_name1";
-    buo.contentMetadata.addressCity      = @"city1";
-    buo.contentMetadata.addressRegion    = @"Region1";
-    buo.contentMetadata.addressCountry   = @"Country1";
-    buo.contentMetadata.addressPostalCode= @"postal_code";
-    buo.contentMetadata.latitude         = 12.07;
-    buo.contentMetadata.longitude        = -97.5;
-    buo.contentMetadata.imageCaptions    = (id) @[@"my_img_caption1", @"my_img_caption_2"];
-    buo.contentMetadata.customMetadata   = (NSMutableDictionary*) @{
-        @"Custom_Content_metadata_key1": @"Custom_Content_metadata_val1",
-        @"Custom_Content_metadata_key2": @"Custom_Content_metadata_val2"
-    };
-
-    // Set up and invoke --
-    [branch clearNetworkQueue];
-    [buo userCompletedAction:@"PURCHASE"];
-    
-    [self waitForExpectationsWithTimeout:5.0 handler:nil];
-    [serverInterfaceMock stopMocking];
-}
-
 - (void) testExampleSyntax {
     BranchUniversalObject *contentItem = [BranchUniversalObject new];
     contentItem.canonicalIdentifier = @"item/123";