update tests

Author: camden-king

GoogleSignIn/Sources/GIDAuthStateMigration.m

@@ -76,7 +76,7 @@ - (void)migrateIfNeededWithTokenURL:(NSURL *)tokenURL
     [defaults setBool:YES forKey:kDataProtectedMigrationCheckPerformedKey];
 #elif TARGET_OS_IOS
     [defaults setBool:YES forKey:kGTMAppAuthMigrationCheckPerformedKey];
-#endif
+#endif // TARGET_OS_OSX || TARGET_OS_MACCATALYST
     return;
   }
 
@@ -85,8 +85,8 @@ - (void)migrateIfNeededWithTokenURL:(NSURL *)tokenURL
 #elif TARGET_OS_IOS
   [self performGIDMigrationIfNeededWithTokenURL:tokenURL
                                    callbackPath:callbackPath
-                                   keychainName:keychainName]
-#endif
+                                   keychainName:keychainName];
+#endif // TARGET_OS_OSX || TARGET_OS_MACCATALYST
 }
 
 #if TARGET_OS_OSX || TARGET_OS_MACCATALYST
@@ -116,7 +116,7 @@ - (void)performDataProtectedMigrationIfNeeded {
   }
 
   // Mark the migration check as having been performed.
-  [defaults setBool:YES forKey:kDataProtectgedMigrationCheckPerformedKey];
+  [defaults setBool:YES forKey:kDataProtectedMigrationCheckPerformedKey];
 }
 
 #elif TARGET_OS_IOS
@@ -247,7 +247,7 @@ + (nullable NSString *)passwordForService:(NSString *)service {
   NSString *password = [[NSString alloc] initWithData:passwordData encoding:NSUTF8StringEncoding];
   return password;
 }
-#endif
+#endif // TARGET_OS_OSX || TARGET_OS_MACCATALYST
 
 @end
 

GoogleSignIn/Tests/Unit/GIDAuthStateMigrationTest.m

@@ -105,7 +105,7 @@ - (void)setUp {
   NSSet *attributes = [NSSet setWithArray:@[fileBasedKeychain]];
   _realLegacyGTMKeychainStore = [[GTMKeychainStore alloc] initWithItemName:kKeychainName
                                                         keychainAttributes:attributes];
-#endif
+#endif // TARGET_OS_OSX || TARGET_OS_MACCATALYST
 }
 
 - (void)tearDown {
@@ -127,7 +127,7 @@ - (void)tearDown {
   [_mockGTMOAuth2Compatibility stopMocking];
 #if TARGET_OS_OSX || TARGET_OS_MACCATALYST
   [_realLegacyGTMKeychainStore removeAuthSessionWithError:nil];
-#endif
+#endif // TARGET_OS_OSX || TARGET_OS_MACCATALYST
 
   [super tearDown];
 }
@@ -188,11 +188,13 @@ - (void)testMigrateIfNeeded_KeychainFailure_DataProtectedMigration {
 
 - (void)testMigrateIfNeeded_NoPreviousMigration_GTMAppAuthMigration {
   [[[_mockUserDefaults stub] andReturn:_mockUserDefaults] standardUserDefaults];
-  [[[_mockUserDefaults expect] andReturnValue:@NO] boolForKey:kMigrationCheckPerformedKey];
-  [[_mockUserDefaults expect] setBool:YES forKey:kMigrationCheckPerformedKey];
+  [[[_mockUserDefaults expect] andReturnValue:@NO] boolForKey:kGTMAppAuthMigrationCheckPerformedKey];
+  [[_mockUserDefaults expect] setBool:YES forKey:kGTMAppAuthMigrationCheckPerformedKey];
 
   [[_mockGTMKeychainStore expect] saveAuthSession:OCMOCK_ANY error:OCMArg.anyObjectRef];
 
+  [self setUpCommonExtractAuthorizationMocksWithFingerPrint:kSavedFingerprint];
+
   GIDAuthStateMigration *migration =
       [[GIDAuthStateMigration alloc] initWithKeychainStore:_mockGTMKeychainStore];
   [migration migrateIfNeededWithTokenURL:[NSURL URLWithString:kTokenURL]
@@ -203,7 +205,7 @@ - (void)testMigrateIfNeeded_NoPreviousMigration_GTMAppAuthMigration {
 
 - (void)testMigrateIfNeeded_KeychainFailure_GTMAppAuthMigration {
   [[[_mockUserDefaults stub] andReturn:_mockUserDefaults] standardUserDefaults];
-  [[[_mockUserDefaults expect] andReturnValue:@NO] boolForKey:kMigrationCheckPerformedKey];
+  [[[_mockUserDefaults expect] andReturnValue:@NO] boolForKey:kGTMAppAuthMigrationCheckPerformedKey];
 
   NSError *keychainSaveError = [NSError new];
   OCMStub([_mockGTMKeychainStore saveAuthSession:OCMOCK_ANY error:[OCMArg setTo:keychainSaveError]]);
@@ -218,9 +220,30 @@ - (void)testMigrateIfNeeded_KeychainFailure_GTMAppAuthMigration {
                           isFreshInstall:NO];
 }
 
-#endif
+- (void)testExtractAuthorization {
+  [self setUpCommonExtractAuthorizationMocksWithFingerPrint:kSavedFingerprint];
+
+  GIDAuthStateMigration *migration =
+      [[GIDAuthStateMigration alloc] initWithKeychainStore:_mockGTMKeychainStore];
+  GTMAuthSession *authorization =
+      [migration extractAuthSessionWithTokenURL:[NSURL URLWithString:kTokenURL]
+                                   callbackPath:kCallbackPath];
 
+  XCTAssertNotNil(authorization);
+}
 
+- (void)testExtractAuthorization_HostedDomain {
+  [self setUpCommonExtractAuthorizationMocksWithFingerPrint:kSavedFingerprint_HostedDomain];
+
+  GIDAuthStateMigration *migration =
+      [[GIDAuthStateMigration alloc] initWithKeychainStore:_mockGTMKeychainStore];
+  GTMAuthSession *authorization =
+      [migration extractAuthSessionWithTokenURL:[NSURL URLWithString:kTokenURL]
+                                   callbackPath:kCallbackPath];
+
+  XCTAssertNotNil(authorization);
+}
+#endif
 
 - (void)testMigrateIfNeeded_HasPreviousMigration {
   [[[_mockUserDefaults stub] andReturn:_mockUserDefaults] standardUserDefaults];
@@ -242,9 +265,11 @@ - (void)testMigrateIfNeeded_HasPreviousMigration {
 
 - (void)testMigrateIfNeeded_isFreshInstall {
   [[[_mockUserDefaults stub] andReturn:_mockUserDefaults] standardUserDefaults];
-  [[[_mockUserDefaults expect] andReturnValue:@NO]
-      boolForKey:kMigrationCheckPerformedKey];
-  [[_mockUserDefaults expect] setBool:YES forKey:kMigrationCheckPerformedKey];
+#if TARGET_OS_OSX || TARGET_OS_MACCATALYST
+  [[_mockUserDefaults expect] setBool:YES forKey:kDataProtectedMigrationCheckPerformedKey];
+#else
+  [[_mockUserDefaults expect] setBool:YES forKey:kGTMAppAuthMigrationCheckPerformedKey];
+#endif // TARGET_OS_OSX || TARGET_OS_MACCATALYST
 
   GIDAuthStateMigration *migration =
       [[GIDAuthStateMigration alloc] initWithKeychainStore:_mockGTMKeychainStore];
@@ -254,29 +279,7 @@ - (void)testMigrateIfNeeded_isFreshInstall {
                           isFreshInstall:YES];
 }
 
-- (void)testExtractAuthorization {
-  [self setUpCommonExtractAuthorizationMocksWithFingerPrint:kSavedFingerprint];
-
-  GIDAuthStateMigration *migration =
-      [[GIDAuthStateMigration alloc] initWithKeychainStore:_mockGTMKeychainStore];
-  GTMAuthSession *authorization =
-      [migration extractAuthSessionWithTokenURL:[NSURL URLWithString:kTokenURL]
-                                   callbackPath:kCallbackPath];
-
-  XCTAssertNotNil(authorization);
-}
-
-- (void)testExtractAuthorization_HostedDomain {
-  [self setUpCommonExtractAuthorizationMocksWithFingerPrint:kSavedFingerprint_HostedDomain];
 
-  GIDAuthStateMigration *migration =
-      [[GIDAuthStateMigration alloc] initWithKeychainStore:_mockGTMKeychainStore];
-  GTMAuthSession *authorization =
-      [migration extractAuthSessionWithTokenURL:[NSURL URLWithString:kTokenURL]
-                                   callbackPath:kCallbackPath];
-
-  XCTAssertNotNil(authorization);
-}
 
 #pragma mark - Helpers