CORE-1391 correct failing test around secure coding

Branch-SDK/BNCCommerceEvent.m

@@ -615,7 +615,7 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.metadata forKey:@"metadata"];
 }
 
-+ (BOOL) supportsSecureCoding {
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 

Branch-SDK/BNCLinkData.m

@@ -186,7 +186,7 @@ - (id)initWithCoder:(NSCoder *)coder {
     return self;
 }
 
-+ (BOOL) supportsSecureCoding {
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 

Branch-SDK/BNCServerRequest.m

@@ -33,7 +33,7 @@ - (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableD
     }
 }
 
-+ (BOOL) supportsSecureCoding {
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 

Branch-SDK/BNCServerRequestQueue.m

@@ -323,8 +323,14 @@ - (NSData *)oldArchiveQueue:(NSArray<BNCServerRequest *> *)queue {
 
 - (NSData *)archiveObject:(NSObject *)object {
     NSData *data = nil;
+    NSError *error = nil;
     if (@available(iOS 12.0, *)) {
-        data = [NSKeyedArchiver archivedDataWithRootObject:object requiringSecureCoding:YES error:NULL];
+        data = [NSKeyedArchiver archivedDataWithRootObject:object requiringSecureCoding:YES error:&error];
+
+        if (!data && error) {
+            BNCLogWarning([NSString stringWithFormat:@"Failed to archive: %@", error]);
+        }
+
     } else {
         #if __IPHONE_OS_VERSION_MIN_REQUIRED < 12000
         data = [NSKeyedArchiver archivedDataWithRootObject:object];

Branch-SDK/BranchCreditHistoryRequest.m

@@ -97,7 +97,7 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeInteger:self.order forKey:@"order"];
 }
 
-+ (BOOL) supportsSecureCoding {
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 

Branch-SDK/BranchEvent.m

@@ -106,7 +106,7 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.eventDictionary forKey:@"eventDictionary"];
 }
 
-+ (BOOL) supportsSecureCoding {
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 

Branch-SDK/BranchRedeemRewardsRequest.m

@@ -75,4 +75,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.bucket forKey:@"bucket"];
 }
 
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
 @end

Branch-SDK/BranchRegisterViewRequest.m

@@ -77,4 +77,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.params forKey:@"params"];
 }
 
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
 @end

Branch-SDK/BranchSetIdentityRequest.m

@@ -86,4 +86,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.userId forKey:@"userId"];
 }
 
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
 @end

Branch-SDK/BranchShortUrlRequest.m

@@ -178,4 +178,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:[BNCEncodingUtils encodeDictionaryToJsonString:self.params] forKey:@"params"];
 }
 
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
 @end

Branch-SDK/BranchUserCompletedActionRequest.m

@@ -78,4 +78,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.state forKey:@"state"];
 }
 
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
 @end

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

@@ -9,9 +9,16 @@
 #import <XCTest/XCTest.h>
 #import "BNCServerRequestQueue.h"
 #import "BNCServerRequest.h"
-#import "BranchOpenRequest.h"
 #import "BranchCloseRequest.h"
+
+// Analytics requests
+#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;
@@ -60,7 +67,20 @@ - (void)testArchiveString {
     XCTAssert([object isEqual:unarchived]);
 }
 
-- (void)testArchiveRequest {
+- (void)testArchiveInstallRequest {
+    BranchInstallRequest *object = [BranchInstallRequest new];
+
+    NSData *archived = [self.queue archiveObject:object];
+    XCTAssertNotNil(archived);
+
+    BranchInstallRequest *unarchived = [self.queue unarchiveObjectFromData:archived];
+    XCTAssertNotNil(unarchived);
+    XCTAssert([unarchived isKindOfClass:[BranchInstallRequest class]]);
+
+    // The request object is not very test friendly, so comparing the two is not helpful at the moment
+}
+
+- (void)testArchiveOpenRequest {
     BranchOpenRequest *object = [BranchOpenRequest new];
 
     NSData *archived = [self.queue archiveObject:object];
@@ -73,6 +93,71 @@ - (void)testArchiveRequest {
     // The request object is not very test friendly, so comparing the two is not helpful at the moment
 }
 
+- (void)testArchiveEventRequest {
+    BranchEventRequest *object = [BranchEventRequest new];
+
+    NSData *archived = [self.queue archiveObject:object];
+    XCTAssertNotNil(archived);
+
+    BranchEventRequest *unarchived = [self.queue unarchiveObjectFromData:archived];
+    XCTAssertNotNil(unarchived);
+    XCTAssert([unarchived isKindOfClass:[BranchEventRequest class]]);
+
+    // 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]];