Replace deprecated API in Auth unit tests

Author: ncooke3

FirebaseAuth/Tests/Unit/FIRAdditionalUserInfoTests.m

@@ -102,13 +102,21 @@ - (void)testAdditionalUserInfoCoding {
                                                 profile:[[self class] profile]
                                                username:kUserName
                                               isNewUser:kIsNewUser];
-  NSData *data = [NSKeyedArchiver archivedDataWithRootObject:userInfo];
-  XCTAssertNotNil(data, @"Should not be nil if archiving succeeded.");
-  XCTAssertNoThrow([NSKeyedUnarchiver unarchiveObjectWithData:data],
-                   @"Unarchiving should not throw and exception.");
-  FIRAdditionalUserInfo *unarchivedUserInfo = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-  XCTAssertTrue([unarchivedUserInfo isKindOfClass:[FIRAdditionalUserInfo class]],
+  NSError *archiveError = nil;
+  NSData *archivedUserInfo = [NSKeyedArchiver archivedDataWithRootObject:userInfo
+                                                   requiringSecureCoding:YES
+                                                                   error:&archiveError];
+  XCTAssertNotNil(archivedUserInfo, @"Should not be nil if archiving succeeded.");
+  XCTAssertNil(archiveError, @"Should be nil if archiving succeeded.");
+
+  NSError *unarchiveError = nil;
+  FIRAdditionalUserInfo *unarchivedUserInfo = (FIRAdditionalUserInfo *)[NSKeyedUnarchiver
+      unarchivedObjectOfClass:FIRAdditionalUserInfo.class
+                     fromData:archivedUserInfo
+                        error:&unarchiveError];
+  XCTAssertTrue([unarchivedUserInfo isKindOfClass:FIRAdditionalUserInfo.class],
                 @"Unarchived object must be of kind FIRAdditionalUserInfo class.");
+  XCTAssertNil(unarchiveError);
   XCTAssertEqualObjects(unarchivedUserInfo.providerID, userInfo.providerID);
   XCTAssertEqualObjects(unarchivedUserInfo.profile, userInfo.profile);
   XCTAssertEqualObjects(unarchivedUserInfo.username, userInfo.username);

FirebaseAuth/Tests/Unit/FIRAuthAppCredentialTests.m

@@ -55,11 +55,25 @@ - (void)testSecureCoding {
 
   FIRAuthAppCredential *credential = [[FIRAuthAppCredential alloc] initWithReceipt:kReceipt
                                                                             secret:kSecret];
-  NSData *data = [NSKeyedArchiver archivedDataWithRootObject:credential];
-  XCTAssertNotNil(data);
-  FIRAuthAppCredential *otherCredential = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-  XCTAssertEqualObjects(otherCredential.receipt, kReceipt);
-  XCTAssertEqualObjects(otherCredential.secret, kSecret);
+
+  NSError *archiveError = nil;
+  NSData *archivedAppCredential = [NSKeyedArchiver archivedDataWithRootObject:credential
+                                                        requiringSecureCoding:YES
+                                                                        error:&archiveError];
+  XCTAssertNotNil(archivedAppCredential, @"Should not be nil if archiving succeeded.");
+  XCTAssertNil(archiveError, @"Should be nil if archiving succeeded.");
+
+  NSError *unarchiveError = nil;
+  FIRAuthAppCredential *unarchivedAppCredential =
+      (FIRAuthAppCredential *)[NSKeyedUnarchiver unarchivedObjectOfClass:FIRAuthAppCredential.class
+                                                                fromData:archivedAppCredential
+                                                                   error:&unarchiveError];
+  XCTAssertTrue([unarchivedAppCredential isKindOfClass:FIRAuthAppCredential.class],
+                @"Unarchived object must be of kind FIRAuthAppCredential class.");
+  XCTAssertNil(unarchiveError);
+
+  XCTAssertEqualObjects(unarchivedAppCredential.receipt, kReceipt);
+  XCTAssertEqualObjects(unarchivedAppCredential.secret, kSecret);
 }
 
 @end

FirebaseAuth/Tests/Unit/FIRUserMetadataTests.m

@@ -59,14 +59,26 @@ - (void)testUserMetadataCoding {
       [NSDate dateWithTimeIntervalSince1970:kLastSignInDateTimeIntervalInSeconds];
   FIRUserMetadata *userMetadata = [[FIRUserMetadata alloc] initWithCreationDate:creationDate
                                                                  lastSignInDate:lastSignInDate];
-  NSData *data = [NSKeyedArchiver archivedDataWithRootObject:userMetadata];
-  XCTAssertNotNil(data, @"Should not be nil if archving succeeded.");
-  XCTAssertNoThrow([NSKeyedUnarchiver unarchiveObjectWithData:data],
-                   @"Unarchiving should not throw an exception");
-  FIRUserMetadata *unArchivedUserMetadata = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-  XCTAssertTrue([unArchivedUserMetadata isKindOfClass:[FIRUserMetadata class]]);
-  XCTAssertEqualObjects(unArchivedUserMetadata.creationDate, creationDate);
-  XCTAssertEqualObjects(unArchivedUserMetadata.lastSignInDate, lastSignInDate);
+
+  NSError *archiveError = nil;
+  NSData *archivedUserMetadata = [NSKeyedArchiver archivedDataWithRootObject:userMetadata
+                                                       requiringSecureCoding:YES
+                                                                       error:&archiveError];
+  XCTAssertNotNil(archivedUserMetadata, @"Should not be nil if archiving succeeded.");
+  XCTAssertNil(archiveError, @"Should be nil if archiving succeeded.");
+
+  NSError *unarchiveError = nil;
+  FIRUserMetadata *unarchivedUserMetadata =
+      (FIRUserMetadata *)[NSKeyedUnarchiver unarchivedObjectOfClass:FIRUserMetadata.class
+                                                           fromData:archivedUserMetadata
+                                                              error:&unarchiveError];
+  XCTAssertTrue([unarchivedUserMetadata isKindOfClass:FIRUserMetadata.class],
+                @"Unarchived object must be of kind FIRUserMetadata class.");
+  XCTAssertNil(unarchiveError);
+
+  XCTAssertTrue([unarchivedUserMetadata isKindOfClass:[FIRUserMetadata class]]);
+  XCTAssertEqualObjects(unarchivedUserMetadata.creationDate, creationDate);
+  XCTAssertEqualObjects(unarchivedUserMetadata.lastSignInDate, lastSignInDate);
 }
 
 @end

FirebaseAuth/Tests/Unit/FIRUserTests.m

@@ -569,17 +569,20 @@ - (void)testUserPropertiesAndNSSecureCoding {
 
                                              // Test NSSecureCoding
                                              XCTAssertTrue([FIRUser supportsSecureCoding]);
-                                             NSMutableData *data = [NSMutableData data];
-                                             NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc]
-                                                 initForWritingWithMutableData:data];
-                                             [archiver encodeObject:user forKey:kUserArchiverKey];
-                                             [archiver finishEncoding];
-
-                                             NSKeyedUnarchiver *unarchiver =
-                                                 [[NSKeyedUnarchiver alloc]
-                                                     initForReadingWithData:data];
-                                             FIRUser *unarchivedUser =
-                                                 [unarchiver decodeObjectForKey:kUserArchiverKey];
+
+                                             NSError *archiveError = nil;
+                                             NSData *archivedUser = [NSKeyedArchiver
+                                                 archivedDataWithRootObject:user
+                                                      requiringSecureCoding:YES
+                                                                      error:&archiveError];
+                                             XCTAssertNil(archiveError);
+
+                                             NSError *unarchiveError = nil;
+                                             FIRUser *unarchivedUser = (FIRUser *)[NSKeyedUnarchiver
+                                                 unarchivedObjectOfClass:FIRUser.class
+                                                                fromData:archivedUser
+                                                                   error:&unarchiveError];
+                                             XCTAssertNil(unarchiveError);
 
                                              // Verify NSSecureCoding for FIRUser
                                              XCTAssertEqualObjects(unarchivedUser.providerID,