Fixed Unit tests and added encoding functions

* Fixed property type of linkParams (strong) and added code to initialize it. * Added encoding functions for class BranchOpenRequestLinkParams. * Fixed value passed to saveAppClipData. It should be local variable referringURL.
BranchMetrics · Dec 4, 2024 · 2d63de1 · 2d63de1
1 parent 943ab31
commit 2d63de1
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 23 deletions.
diff --git a/Branch-TestBed/Branch-SDK-Tests/BNCClassSerializationTests.m b/Branch-TestBed/Branch-SDK-Tests/BNCClassSerializationTests.m
@@ -71,7 +71,8 @@ - (void)testBranchEventRequestArchive {
 
 - (void)testBranchOpenRequestArchive {
     BranchOpenRequest *request = [[BranchOpenRequest alloc] initWithCallback:nil];
-    request.urlString = @"https://branch.io";
+    request.linkParams = [[BranchOpenRequestLinkParams alloc] init];
+    request.linkParams.referringURL = @"https://branch.io";
 
     // archive the event
     NSError *error = nil;
@@ -88,14 +89,15 @@ - (void)testBranchOpenRequestArchive {
     XCTAssertTrue([object isKindOfClass:BranchOpenRequest.class]);
     BranchOpenRequest *unarchivedRequest = (BranchOpenRequest *)object;
 
-    XCTAssertTrue([request.urlString isEqualToString:unarchivedRequest.urlString]);
+    XCTAssertTrue([request.linkParams.referringURL isEqualToString:unarchivedRequest.linkParams.referringURL]);
     XCTAssertNil(unarchivedRequest.callback);
     XCTAssertTrue([@"open" isEqualToString:[unarchivedRequest getActionName]]);
 }
 
 - (void)testBranchInstallRequestArchive {
     BranchInstallRequest *request = [[BranchInstallRequest alloc] initWithCallback:nil];
-    request.urlString = @"https://branch.io";
+    request.linkParams = [[BranchOpenRequestLinkParams alloc] init];
+    request.linkParams.referringURL = @"https://branch.io";
 
     // archive the event
     NSError *error = nil;
@@ -112,7 +114,7 @@ - (void)testBranchInstallRequestArchive {
     XCTAssertTrue([object isKindOfClass:BranchInstallRequest.class]);
     BranchInstallRequest *unarchivedRequest = (BranchInstallRequest *)object;
 
-    XCTAssertTrue([request.urlString isEqualToString:unarchivedRequest.urlString]);
+    XCTAssertTrue([request.linkParams.referringURL isEqualToString:unarchivedRequest.linkParams.referringURL]);
     XCTAssertNil(unarchivedRequest.callback);
     XCTAssertTrue([@"install" isEqualToString:[unarchivedRequest getActionName]]);
 }

diff --git a/Branch-TestBed/Branch-SDK-Tests/BNCPreferenceHelperTests.m b/Branch-TestBed/Branch-SDK-Tests/BNCPreferenceHelperTests.m
@@ -243,13 +243,6 @@ - (void)testSetLastStrongMatchDate {
     XCTAssertEqualObjects(expectedDate, actualDate);
 }
 
-- (void)testSetAppVersion {
-    NSString *expectedVersion = @"1.0.0";
-    [self.prefHelper setAppVersion: expectedVersion];
-
-    NSString *actualVersion = [self.prefHelper appVersion];
-    XCTAssertEqualObjects(expectedVersion, actualVersion);
-}
 
 - (void)testSetLocalUrl {
     NSString *expectedLocalURL = @"https://local.example.com";

diff --git a/Branch-TestBed/Branch-SDK-Tests/BNCRequestFactoryTests.m b/Branch-TestBed/Branch-SDK-Tests/BNCRequestFactoryTests.m
@@ -29,7 +29,7 @@ - (void)tearDown {
 
 - (void)testInitWithBranchKeyNil {
     BNCRequestFactory *factory = [[BNCRequestFactory alloc] initWithBranchKey:nil UUID:_requestUUID TimeStamp:_requestCreationTimeStamp];
-    NSDictionary *json = [factory dataForInstallWithURLString:@"https://branch.io"];
+    NSDictionary *json = [factory dataForInstallWithLinkParams:nil];
     XCTAssertNotNil(json);
 
     // key is omitted when nil
@@ -40,7 +40,7 @@ - (void)testInitWithBranchKeyNil {
 
 - (void)testInitWithBranchKeyEmpty {
     BNCRequestFactory *factory = [[BNCRequestFactory alloc] initWithBranchKey:@"" UUID:self.requestUUID TimeStamp:self.requestCreationTimeStamp];
-    NSDictionary *json = [factory dataForInstallWithURLString:@"https://branch.io"];
+    NSDictionary *json = [factory dataForInstallWithLinkParams:nil];
     XCTAssertNotNil(json);
 
     // empty string is allowed
@@ -52,7 +52,7 @@ - (void)testInitWithBranchKeyEmpty {
 
 - (void)testInitWithBranchKey {
     BNCRequestFactory *factory = [[BNCRequestFactory alloc] initWithBranchKey:@"key_abcd" UUID:self.requestUUID TimeStamp:self.requestCreationTimeStamp];
-    NSDictionary *json = [factory dataForInstallWithURLString:@"https://branch.io"];
+    NSDictionary *json = [factory dataForInstallWithLinkParams:nil];
     XCTAssertNotNil(json);
     XCTAssertTrue([@"key_abcd" isEqualToString:[json objectForKey:@"branch_key"]]);
 
@@ -62,7 +62,7 @@ - (void)testInitWithBranchKey {
 
 - (void)testDataForInstall {
     BNCRequestFactory *factory = [[BNCRequestFactory alloc] initWithBranchKey:@"key_abcd" UUID:self.requestUUID TimeStamp:self.requestCreationTimeStamp];
-    NSDictionary *json = [factory dataForInstallWithURLString:@"https://branch.io"];
+    NSDictionary *json = [factory dataForInstallWithLinkParams:nil];
     XCTAssertNotNil(json);
 
     XCTAssertTrue([@"key_abcd" isEqualToString:[json objectForKey:@"branch_key"]]);
@@ -79,7 +79,7 @@ - (void)testDataForInstall {
 
 - (void)testDataForOpen {
     BNCRequestFactory *factory = [[BNCRequestFactory alloc] initWithBranchKey:@"key_abcd" UUID:self.requestUUID TimeStamp:self.requestCreationTimeStamp];
-    NSDictionary *json = [factory dataForOpenWithURLString:@"https://branch.io"];
+    NSDictionary *json = [factory dataForInstallWithLinkParams:nil];
     XCTAssertNotNil(json);
 
     XCTAssertTrue([@"key_abcd" isEqualToString:[json objectForKey:@"branch_key"]]);

diff --git a/Sources/BranchSDK/BranchOpenRequest.m b/Sources/BranchSDK/BranchOpenRequest.m
@@ -40,6 +40,7 @@ - (id)initWithCallback:(callbackWithStatus)callback isInstall:(BOOL)isInstall {
     if ((self = [super init])) {
         _callback = callback;
         _isInstall = isInstall;
+        _linkParams = [[BranchOpenRequestLinkParams alloc] init];
     }
 
     return self;
@@ -166,7 +167,7 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     [BranchOpenRequest releaseOpenResponseLock];
 
     if (self.isInstall) {
-        [[BNCAppGroupsData shared] saveAppClipData: self.linkParams.referringURL];
+        [[BNCAppGroupsData shared] saveAppClipData: referringURL];
     }
 
 #if !TARGET_OS_TV
@@ -248,14 +249,15 @@ - (NSString *)getActionName {
 
 - (instancetype)initWithCoder:(NSCoder *)decoder {
     self = [super initWithCoder:decoder];
-    if (!self) return self;
-    self.linkParams.referringURL = [decoder decodeObjectOfClass:NSString.class forKey:@"urlString"];
+    if (self) {
+        self.linkParams = [decoder decodeObjectOfClass:BranchOpenRequestLinkParams.class forKey:@"urlString"];
+    }
     return self;
 }
 
 - (void)encodeWithCoder:(NSCoder *)coder {
     [super encodeWithCoder:coder];
-    [coder encodeObject:self.linkParams.referringURL forKey:@"urlString"];
+    [coder encodeObject:self.linkParams forKey:@"urlString"];
 }
 
 + (BOOL)supportsSecureCoding {
@@ -322,4 +324,20 @@ - (instancetype)init
     return self;
 }
 
+- (instancetype)initWithCoder:(NSCoder *)decoder {
+    self = [super init];
+    if (self) {
+        self.referringURL = [decoder decodeObjectOfClass:NSString.class forKey:@"referringURL"];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [coder encodeObject:self.referringURL forKey:@"referringURL"];
+}
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
 @end
diff --git a/Sources/BranchSDK/Private/BNCRequestFactory.h b/Sources/BranchSDK/Private/BNCRequestFactory.h
@@ -8,7 +8,6 @@
 
 #import <Foundation/Foundation.h>
 #import "BranchOpenRequest.h"
-#import "BranchInstallRequest.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Sources/BranchSDK/Private/BranchOpenRequest.h b/Sources/BranchSDK/Private/BranchOpenRequest.h
@@ -9,7 +9,7 @@
 #import "BNCServerRequest.h"
 #import "BNCCallbacks.h"
 
-@interface BranchOpenRequestLinkParams : NSObject
+@interface BranchOpenRequestLinkParams : NSObject <NSSecureCoding>
 @property (copy, nonatomic) NSString *linkClickIdentifier;
 @property (copy, nonatomic) NSString *spotlightIdentifier;
 @property (copy, nonatomic) NSString *referringURL; // URL that triggered this install or open event
@@ -20,7 +20,7 @@
 
 
 @property (nonatomic, copy) callbackWithStatus callback;
-@property (nonatomic, copy, readwrite) BranchOpenRequestLinkParams *linkParams;
+@property (nonatomic, strong, readwrite) BranchOpenRequestLinkParams *linkParams;
 
 + (void) waitForOpenResponseLock;
 + (void) releaseOpenResponseLock;