Skip to content

Commit 35be9ec

Browse files
committed
Improve testing class GIDGoogleUserOldFormat
1 parent 6ee3073 commit 35be9ec

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

GoogleSignIn/Sources/GIDAuthentication.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ @implementation GIDAuthentication
3131
- (instancetype)initWithAuthState:(OIDAuthState *)authState {
3232
self = [super init];
3333
if (self) {
34-
self.authState = authState;
34+
_authState = authState;
3535
}
3636
return self;
3737
}
@@ -45,7 +45,7 @@ + (BOOL)supportsSecureCoding {
4545
- (nullable instancetype)initWithCoder:(NSCoder *)decoder {
4646
self = [super init];
4747
if (self) {
48-
self.authState = [decoder decodeObjectOfClass:[OIDAuthState class] forKey:kAuthStateKey];
48+
_authState = [decoder decodeObjectOfClass:[OIDAuthState class] forKey:kAuthStateKey];
4949
}
5050
return self;
5151
}

GoogleSignIn/Sources/GIDGoogleUser.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ - (void)updateWithTokenResponse:(OIDTokenResponse *)tokenResponse
222222

223223
// We don't want to trigger the delegate before we update authState completely. So we unset the
224224
// delegate before the first update. Also the order of updates is important because
225-
// `updateWithAuthorizationResponse` would clears the last token reponse and refresh token.
225+
// `updateWithAuthorizationResponse` would clear the last token reponse and refresh token.
226226
self.authState.stateChangeDelegate = nil;
227227
[self.authState updateWithAuthorizationResponse:authorizationResponse error:nil];
228228
self.authState.stateChangeDelegate = self;

GoogleSignIn/Tests/Unit/GIDGoogleUser+Testing.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
@end
2626

27-
// The old format GIDGoogleUser containing a GIDAuthentication.
27+
// The old format GIDGoogleUser contains a GIDAuthentication.
2828
// Note: remove this class when GIDGoogleUser no longer support old encoding.
2929
@interface GIDGoogleUserOldFormat : GIDGoogleUser
3030

31-
- (instancetype)initOldGIDGoogleUserWithAuthState:(OIDAuthState *)authState
32-
profileData:(GIDProfileData *)profileData;
31+
- (instancetype)initWithAuthState:(OIDAuthState *)authState
32+
profileData:(GIDProfileData *)profileData;
3333

3434
@end

GoogleSignIn/Tests/Unit/GIDGoogleUser+Testing.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ @implementation GIDGoogleUserOldFormat {
6161
GIDProfileData *_profile;
6262
}
6363

64-
- (instancetype)initOldGIDGoogleUserWithAuthState:(OIDAuthState *)authState
65-
profileData:(GIDProfileData *)profileData {
64+
- (instancetype)initWithAuthState:(OIDAuthState *)authState
65+
profileData:(GIDProfileData *)profileData {
6666
self = [super initWithAuthState:authState profileData:profileData];
6767
if (self) {
6868
_authentication = [[GIDAuthentication alloc] initWithAuthState:authState];

GoogleSignIn/Tests/Unit/GIDGoogleUserTest.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,8 @@ - (void)testOldFormatCoding {
138138
if (@available(iOS 11, macOS 10.13, *)) {
139139
OIDAuthState *authState = [OIDAuthState testInstance];
140140
GIDProfileData *profileDate = [GIDProfileData testInstance];
141-
GIDGoogleUserOldFormat *user =
142-
[[GIDGoogleUserOldFormat alloc] initOldGIDGoogleUserWithAuthState:authState
143-
profileData:profileDate];
141+
GIDGoogleUserOldFormat *user = [[GIDGoogleUserOldFormat alloc] initWithAuthState:authState
142+
profileData:profileDate];
144143
NSData *data = [NSKeyedArchiver archivedDataWithRootObject:user
145144
requiringSecureCoding:YES
146145
error:nil];

0 commit comments

Comments
 (0)