Merge pull request #1273 from BranchMetrics/SDK-2005-iOS-placeholder-stop-calling-v1-profile-and-v1-logout

SDK 2005 iOS placeholder stop calling v1 profile and v1 logout

Author: echo-branch

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

@@ -15,8 +15,6 @@
 #import "BranchInstallRequest.h"
 #import "BranchOpenRequest.h"
 #import "BranchEvent.h"
-#import "BranchSetIdentityRequest.h"
-#import "BranchLogoutRequest.h"
 
 @interface BNCServerRequestQueue ()
 - (NSData *)archiveQueue:(NSArray<BNCServerRequest *> *)queue;
@@ -104,32 +102,6 @@ - (void)testArchiveEventRequest {
     // 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]];
@@ -161,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);
@@ -177,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/BranchLogoutRequestTests.m

@@ -180,31 +180,17 @@ - (void)test13GetShortURLAfterLogout {
     BNCServerResponse *logoutResp = [[BNCServerResponse alloc] init];
     logoutResp.data = @{ @"session_id": @"foo", @"randomized_bundle_token": @"foo", @"link": @"http://foo" };
 
-    __block BNCServerCallback logoutCallback;
-    [[[serverInterfaceMock expect]
-        andDo:^(NSInvocation *invocation) {
-            logoutCallback(logoutResp, nil);
-        }]
-            postRequest:[OCMArg any]
-            url:[preferenceHelper
-            getAPIURL:@"logout"]
-            key:[OCMArg any]
-            callback:[OCMArg
-            checkWithBlock:^BOOL(BNCServerCallback callback) {
-                logoutCallback = callback;
-                return YES;
-            }]];
 
     XCTestExpectation *logoutExpectation =
         [self expectationWithDescription:@"Logout Session"];
 
+    self.hasExceededExpectations = NO;
     [branch logoutWithCallback:^(BOOL changed, NSError * _Nullable error) {
         XCTAssertNil(error);
         NSLog(@"Fullfilled 2.");
         [self safelyFulfillExpectation:logoutExpectation];
     }];
 
-    self.hasExceededExpectations = NO;
     [self awaitExpectations];
 
     // Get short URL

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

@@ -7,9 +7,9 @@
 //
 
 #import "BNCTestCase.h"
-#import "BranchSetIdentityRequest.h"
 #import "BranchConstants.h"
 #import "BNCPreferenceHelper.h"
+#import "Branch.h"
 #import <OCMock/OCMock.h>
 
 static NSString * const IDENTITY_TEST_USER_ID = @"foo_id";
@@ -19,170 +19,11 @@ @interface BranchSetIdentityRequestTests : BNCTestCase
 
 @implementation BranchSetIdentityRequestTests
 
-- (void)testRequestBody {
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-    NSDictionary * const expectedParams = @{
-        BRANCH_REQUEST_KEY_DEVELOPER_IDENTITY: IDENTITY_TEST_USER_ID,
-        BRANCH_REQUEST_KEY_RANDOMIZED_BUNDLE_TOKEN: preferenceHelper.randomizedBundleToken,
-        BRANCH_REQUEST_KEY_RANDOMIZED_DEVICE_TOKEN: preferenceHelper.randomizedDeviceToken,
-        BRANCH_REQUEST_KEY_SESSION_ID: preferenceHelper.sessionID
-    };
-
-    BranchSetIdentityRequest *request = [[BranchSetIdentityRequest alloc] initWithUserId:IDENTITY_TEST_USER_ID callback:NULL];
-    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-    [[serverInterfaceMock expect] postRequest:expectedParams url:[self stringMatchingPattern:BRANCH_REQUEST_ENDPOINT_SET_IDENTITY] key:[OCMArg any] callback:[OCMArg any]];
-    
-    [request makeRequest:serverInterfaceMock key:nil callback:NULL];
-    
-    [serverInterfaceMock verify];
-}
-
-- (void)testBasicSuccess {
-    NSString * const PRE_RESPONSE_USER_IDENTITY = @"foo";
-    NSString * const PRE_RESPONSE_IDENTITY = @"foo";
-    NSString * const PRE_RESPONSE_USER_URL = @"http://foo";
-    NSString * const PRE_RESPONSE_INSTALL_PARAMS = @"{\"foo\":\"bar\"}";
-    NSString * const RESPONSE_IDENTITY = @"bar";
-    NSString * const RESPONSE_USER_URL = @"http://bar";
-    NSString * const RESPONSE_INSTALL_PARAMS = @"{\"bar\":\"foo\"}";
-    NSDictionary * const RESPONSE_INSTALL_PARAMS_DICT = @{ @"bar": @"foo" };
-    __block NSInteger callbackCount = 0;
-    
-    
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-    preferenceHelper.userIdentity = PRE_RESPONSE_USER_IDENTITY;
-    preferenceHelper.randomizedBundleToken = PRE_RESPONSE_IDENTITY;
-    preferenceHelper.userUrl = PRE_RESPONSE_USER_URL;
-    preferenceHelper.installParams = PRE_RESPONSE_INSTALL_PARAMS;
-    
-    BNCServerResponse * const goodResponse = [[BNCServerResponse alloc] init];
-    goodResponse.data = @{
-        BRANCH_RESPONSE_KEY_RANDOMIZED_BUNDLE_TOKEN: RESPONSE_IDENTITY,
-        BRANCH_RESPONSE_KEY_USER_URL: RESPONSE_USER_URL,
-        BRANCH_RESPONSE_KEY_INSTALL_PARAMS: RESPONSE_INSTALL_PARAMS
-    };
-    
-    BranchSetIdentityRequest *request = [[BranchSetIdentityRequest alloc] initWithUserId:IDENTITY_TEST_USER_ID callback:^(NSDictionary *params, NSError *error) {
-        callbackCount++;
-        XCTAssertEqualObjects(params, RESPONSE_INSTALL_PARAMS_DICT);
-        XCTAssertNil(error);
-    }];
-    
-    [request processResponse:goodResponse error:nil];
-    
-    XCTAssertEqual(callbackCount, 1);
-    XCTAssertEqualObjects(preferenceHelper.userIdentity, IDENTITY_TEST_USER_ID);
-    XCTAssertEqualObjects(preferenceHelper.randomizedBundleToken, RESPONSE_IDENTITY);
-    XCTAssertEqualObjects(preferenceHelper.userUrl, RESPONSE_USER_URL);
-    XCTAssertEqualObjects(preferenceHelper.installParams, RESPONSE_INSTALL_PARAMS);
-}
-
-- (void)testBasicErrorHandling {
-    NSError * const TEST_ERROR = [NSError errorWithDomain:@"foo" code:1 userInfo:nil];
-    __block NSInteger callbackCount = 0;
-    
-    BranchSetIdentityRequest *request =
-        [[BranchSetIdentityRequest alloc]
-            initWithUserId:IDENTITY_TEST_USER_ID
-            callback:^(NSDictionary *params, NSError *error) {
-                callbackCount++;
-                XCTAssert(params != nil && params.count == 0);
-                XCTAssertEqual(error, TEST_ERROR);
-            }];
-    
-    [request processResponse:nil error:TEST_ERROR];
-    XCTAssertEqual(callbackCount, 1);
-}
-
-- (void)testMultipleErrors {
-    NSError * const TEST_ERROR = [NSError errorWithDomain:@"foo" code:1 userInfo:nil];
-    __block NSInteger callbackCount = 0;
-    
-    BranchSetIdentityRequest *request =
-        [[BranchSetIdentityRequest alloc]
-            initWithUserId:IDENTITY_TEST_USER_ID
-            callback:^(NSDictionary *params, NSError *error) {
-                callbackCount++;
-                XCTAssert(params != nil && params.count == 0);
-                XCTAssertEqual(error, TEST_ERROR);
-            }];
-
-    [request processResponse:nil error:TEST_ERROR];
-    [request processResponse:nil error:TEST_ERROR];
-    
-    XCTAssertEqual(callbackCount, 1);
-}
-
-- (void)testErrorFollowedBySuccess {
-    NSError * const TEST_ERROR = [NSError errorWithDomain:@"foo" code:1 userInfo:nil];
-    NSString * const PRE_RESPONSE_USER_IDENTITY = @"foo";
-    NSString * const PRE_RESPONSE_IDENTITY = @"foo";
-    NSString * const PRE_RESPONSE_USER_URL = @"http://foo";
-    NSString * const PRE_RESPONSE_INSTALL_PARAMS = @"{\"foo\":\"bar\"}";
-    NSString * const RESPONSE_IDENTITY = @"bar";
-    NSString * const RESPONSE_USER_URL = @"http://bar";
-    NSString * const RESPONSE_INSTALL_PARAMS = @"{\"bar\":\"foo\"}";
-    __block NSInteger callbackCount = 0;
-    
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-    preferenceHelper.userIdentity = PRE_RESPONSE_USER_IDENTITY;
-    preferenceHelper.randomizedBundleToken = PRE_RESPONSE_IDENTITY;
-    preferenceHelper.userUrl = PRE_RESPONSE_USER_URL;
-    preferenceHelper.installParams = PRE_RESPONSE_INSTALL_PARAMS;
-
-    BNCServerResponse * const goodResponse = [[BNCServerResponse alloc] init];
-    goodResponse.data = @{
-        BRANCH_RESPONSE_KEY_RANDOMIZED_BUNDLE_TOKEN: RESPONSE_IDENTITY,
-        BRANCH_RESPONSE_KEY_USER_URL: RESPONSE_USER_URL,
-        BRANCH_RESPONSE_KEY_INSTALL_PARAMS: RESPONSE_INSTALL_PARAMS
-    };
-    
-    BranchSetIdentityRequest *request =
-        [[BranchSetIdentityRequest alloc]
-            initWithUserId:IDENTITY_TEST_USER_ID
-            callback:^(NSDictionary *params, NSError *error) {
-                callbackCount++;
-                XCTAssert(params != nil && params.count == 0);
-                XCTAssertEqual(error, TEST_ERROR);
-            }];
-
-    [request processResponse:nil error:TEST_ERROR];
-    [request processResponse:goodResponse error:nil];
-    
-    XCTAssertEqual(callbackCount, 1); // callback should have only been called once, but preferences should be updated
-    XCTAssertEqualObjects(preferenceHelper.userIdentity, IDENTITY_TEST_USER_ID);
-    XCTAssertEqualObjects(preferenceHelper.randomizedBundleToken, RESPONSE_IDENTITY);
-    XCTAssertEqualObjects(preferenceHelper.userUrl, RESPONSE_USER_URL);
-    XCTAssertEqualObjects(preferenceHelper.installParams, RESPONSE_INSTALL_PARAMS);
-}
-
-
-- (void)testEmptyResponseFieldsAfterSetIdentity {
-    
-    BNCServerResponse *response = [[BNCServerResponse alloc] init];
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-    
-    __block NSInteger callbackCount = 0;
-    
-    BranchSetIdentityRequest *request = [[BranchSetIdentityRequest alloc] initWithUserId:IDENTITY_TEST_USER_ID callback:^(NSDictionary *params, NSError *error) {
-        callbackCount++;
-        XCTAssertNil(error);
-    }];
-    
-    response.data = @{};
-    [request processResponse:response error:nil];
-    
-    XCTAssertNotNil(preferenceHelper.randomizedDeviceToken);
-    XCTAssertNotNil(preferenceHelper.userUrl);
-    XCTAssertNotNil(preferenceHelper.sessionID);
-    XCTAssertNotNil(preferenceHelper.randomizedBundleToken);
-}
-
 #pragma mark -  setIdentity Tests
 - (void)testSetIdentityWithCallback {
     Branch *branch = [Branch getInstance];
     [branch logoutWithCallback:^(BOOL changed, NSError * _Nullable error) {
-        BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper new];
+        BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
 
         XCTestExpectation *expectation = [self expectationWithDescription:@"setIdentity callback is called"];
 
@@ -198,7 +39,7 @@ - (void)testSetIdentityWithCallback {
 - (void)testSetIdentityWithNilUserId {
     Branch *branch = [Branch getInstance];
     [branch logoutWithCallback:^(BOOL changed, NSError * _Nullable error) {
-        BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper new];
+        BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
 
         XCTestExpectation *expectation = [self expectationWithDescription:@"setIdentityWithNil callback is called"];
 
@@ -216,7 +57,7 @@ - (void)testSetIdentityWithNilUserId {
 - (void)testSetIdentityWithUserId {
     Branch *branch = [Branch getInstance];
     [branch logoutWithCallback:^(BOOL changed, NSError * _Nullable error) {
-        BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper new];
+        BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
 
         NSString *testUserId = @"testUserId";
         [branch setIdentity:testUserId withCallback:nil];