Unify naming of keychain services and user defaults (#3473)

Author: renkelvin

Example/Auth/Tests/FIRAuthAppCredentialManagerTests.m

@@ -18,7 +18,7 @@
 
 #import "FIRAuthAppCredential.h"
 #import "FIRAuthAppCredentialManager.h"
-#import "FIRAuthKeychain.h"
+#import "FIRAuthKeychainServices.h"
 #import <OCMock/OCMock.h>
 
 #define ANY_ERROR_POINTER ((NSError *__autoreleasing *_Nullable)[OCMArg anyPointer])
@@ -70,7 +70,7 @@ @implementation FIRAuthAppCredentialManagerTests {
 }
 
 - (void)setUp {
-  _mockKeychain = OCMClassMock([FIRAuthKeychain class]);
+  _mockKeychain = OCMClassMock([FIRAuthKeychainServices class]);
 }
 
 /** @fn testCompletion

Example/Auth/Tests/FIRAuthKeychainTests.m renamed to Example/Auth/Tests/FIRAuthKeychainServicesTests.m

@@ -17,7 +17,7 @@
 #import <Security/Security.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRAuthKeychain.h"
+#import "FIRAuthKeychainServices.h"
 
 /** @var kAccountPrefix
     @brief The keychain account prefix assumed by the tests.
@@ -98,7 +98,7 @@ @implementation FIRAuthKeychainTests
 - (void)testReadNonexisting {
   [self setPassword:nil account:accountFromKey(kKey) service:kService];
   [self setPassword:nil account:kKey service:nil];  // legacy form
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   NSError *error = fakeError();
   XCTAssertNil([keychain dataForKey:kKey error:&error]);
   XCTAssertNil(error);
@@ -109,7 +109,7 @@ - (void)testReadNonexisting {
  */
 - (void)testReadExisting {
   [self setPassword:kData account:accountFromKey(kKey) service:kService];
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   NSError *error = fakeError();
   XCTAssertEqualObjects([keychain dataForKey:kKey error:&error], dataFromString(kData));
   XCTAssertNil(error);
@@ -122,7 +122,7 @@ - (void)testReadExisting {
 - (void)testNotReadOtherService {
   [self setPassword:nil account:accountFromKey(kKey) service:kService];
   [self setPassword:kData account:accountFromKey(kKey) service:kOtherService];
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   NSError *error = fakeError();
   XCTAssertNil([keychain dataForKey:kKey error:&error]);
   XCTAssertNil(error);
@@ -134,7 +134,7 @@ - (void)testNotReadOtherService {
  */
 - (void)testWriteNonexisting {
   [self setPassword:nil account:accountFromKey(kKey) service:kService];
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   XCTAssertTrue([keychain setData:dataFromString(kData) forKey:kKey error:NULL]);
   XCTAssertEqualObjects([self passwordWithAccount:accountFromKey(kKey) service:kService], kData);
   [self deletePasswordWithAccount:accountFromKey(kKey) service:kService];
@@ -145,7 +145,7 @@ - (void)testWriteNonexisting {
  */
 - (void)testWriteExisting {
   [self setPassword:kData account:accountFromKey(kKey) service:kService];
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   XCTAssertTrue([keychain setData:dataFromString(kOtherData) forKey:kKey error:NULL]);
   XCTAssertEqualObjects([self passwordWithAccount:accountFromKey(kKey) service:kService],
                         kOtherData);
@@ -157,7 +157,7 @@ - (void)testWriteExisting {
  */
 - (void)testDeleteNonexisting {
   [self setPassword:nil account:accountFromKey(kKey) service:kService];
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   XCTAssertTrue([keychain removeDataForKey:kKey error:NULL]);
   XCTAssertNil([self passwordWithAccount:accountFromKey(kKey) service:kService]);
 }
@@ -167,7 +167,7 @@ - (void)testDeleteNonexisting {
  */
 - (void)testDeleteExisting {
   [self setPassword:kData account:accountFromKey(kKey) service:kService];
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   XCTAssertTrue([keychain removeDataForKey:kKey error:NULL]);
   XCTAssertNil([self passwordWithAccount:accountFromKey(kKey) service:kService]);
 }
@@ -178,7 +178,7 @@ - (void)testDeleteExisting {
 - (void)testReadLegacy {
   [self setPassword:nil account:accountFromKey(kKey) service:kService];
   [self setPassword:kData account:kKey service:nil];  // legacy form
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   NSError *error = fakeError();
   XCTAssertEqualObjects([keychain dataForKey:kKey error:&error], dataFromString(kData));
   XCTAssertNil(error);
@@ -194,7 +194,7 @@ - (void)testReadLegacy {
 - (void)testNotReadLegacy {
   [self setPassword:kData account:accountFromKey(kKey) service:kService];
   [self setPassword:kOtherData account:kKey service:nil];  // legacy form
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   NSError *error = fakeError();
   XCTAssertEqualObjects([keychain dataForKey:kKey error:&error], dataFromString(kData));
   XCTAssertNil(error);
@@ -211,7 +211,7 @@ - (void)testNotReadLegacy {
 - (void)testRemoveLegacy {
   [self setPassword:kData account:accountFromKey(kKey) service:kService];
   [self setPassword:kOtherData account:kKey service:nil];  // legacy form
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   XCTAssertTrue([keychain removeDataForKey:kKey error:NULL]);
   XCTAssertNil([self passwordWithAccount:accountFromKey(kKey) service:kService]);
   XCTAssertNil([self passwordWithAccount:kKey service:nil]);
@@ -221,7 +221,7 @@ - (void)testRemoveLegacy {
     @brief Tests that 'NULL' can be safely passed in.
  */
 - (void)testNullErrorParameter {
-  FIRAuthKeychain *keychain = [[FIRAuthKeychain alloc] initWithService:kService];
+  FIRAuthKeychainServices *keychain = [[FIRAuthKeychainServices alloc] initWithService:kService];
   [keychain dataForKey:kKey error:NULL];
   [keychain setData:dataFromString(kData) forKey:kKey error:NULL];
   [keychain removeDataForKey:kKey error:NULL];

Example/Auth/Tests/FIRAuthUserDefaultsStorageTests.m renamed to Example/Auth/Tests/FIRAuthUserDefaultsTests.m

@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FIRAuthUserDefaultsStorage.h"
+#import "FIRAuthUserDefaults.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -62,22 +62,22 @@
   return [NSError errorWithDomain:@"ERROR" code:-1 userInfo:nil];
 }
 
-/** @class FIRAuthUserDefaultsStorageTests
-    @brief Tests for @c FIRAuthUserDefaultsStorage .
+/** @class FIRAuthUserDefaultsTests
+    @brief Tests for @c FIRAuthUserDefaults.
  */
-@interface FIRAuthUserDefaultsStorageTests : XCTestCase
+@interface FIRAuthUserDefaultsTests : XCTestCase
 @end
 
-@implementation FIRAuthUserDefaultsStorageTests {
+@implementation FIRAuthUserDefaultsTests {
   /** @var _storage
-      @brief The @c FIRAuthUserDefaultsStorage object under test.
+      @brief The @c FIRAuthUserDefaults object under test.
    */
-  FIRAuthUserDefaultsStorage *_storage;
+  FIRAuthUserDefaults *_storage;
 }
 
 - (void)setUp {
   [super setUp];
-  _storage = [[FIRAuthUserDefaultsStorage alloc] initWithService:kService];
+  _storage = [[FIRAuthUserDefaults alloc] initWithService:kService];
   [_storage clear];
 }
 
@@ -127,14 +127,14 @@ - (void)testRemove {
  */
 - (void)testServices {
   XCTAssertTrue([_storage setData:dataFromString(kData) forKey:kKey error:NULL]);
-  _storage = [[FIRAuthUserDefaultsStorage alloc] initWithService:kOtherService];
+  _storage = [[FIRAuthUserDefaults alloc] initWithService:kOtherService];
   NSError *error = fakeError();
   XCTAssertNil([_storage dataForKey:kKey error:&error]);
   XCTAssertNil(error);
 }
 
 /** @fn testStandardUserDefaults
-    @brief Tests standard user defaults are not affected by FIRAuthUserDefaultsStorage operations,
+    @brief Tests standard user defaults are not affected by FIRAuthUserDefaults operations,
  */
 - (void)testStandardUserDefaults {
   NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];