Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit fce5910

Browse files
jmagmanjmagman
committed
private header
1 parent 4d90826 commit fce5910

File tree

4 files changed

+90
-65
lines changed

4 files changed

+90
-65
lines changed

‎packages/google_sign_in/google_sign_in/example/ios/RunnerTests/GoogleSignInTests.m

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
@import Flutter;
5+
#import "FLTGoogleSignInPlugin_Private.h"
66

7+
@import Flutter;
78
@import XCTest;
89
@import google_sign_in;
910
@import GoogleSignIn;
@@ -16,7 +17,7 @@ @interface FLTGoogleSignInPluginTest : XCTestCase
1617
@property(strong, nonatomic) NSObject<FlutterBinaryMessenger> *mockBinaryMessenger;
1718
@property(strong, nonatomic) NSObject<FlutterPluginRegistrar> *mockPluginRegistrar;
1819
@property(strong, nonatomic) FLTGoogleSignInPlugin *plugin;
19-
@property(strong, nonatomic) id mockSharedInstance;
20+
@property(strong, nonatomic) id mockSignIn;
2021

2122
@end
2223

@@ -27,17 +28,16 @@ - (void)setUp {
2728
self.mockBinaryMessenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
2829
self.mockPluginRegistrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));
2930

30-
id mockSharedInstance = OCMClassMock([GIDSignIn class]);
31-
OCMStub([mockSharedInstance sharedInstance]).andReturn(mockSharedInstance);
32-
self.mockSharedInstance = mockSharedInstance;
31+
id mockSignIn = OCMClassMock([GIDSignIn class]);
32+
self.mockSignIn = mockSignIn;
3333

3434
OCMStub(self.mockPluginRegistrar.messenger).andReturn(self.mockBinaryMessenger);
35-
self.plugin = [[FLTGoogleSignInPlugin alloc] init];
35+
self.plugin = [[FLTGoogleSignInPlugin alloc] initW];
3636
[FLTGoogleSignInPlugin registerWithRegistrar:self.mockPluginRegistrar];
3737
}
3838

3939
- (void)tearDown {
40-
[self.mockSharedInstance stopMocking];
40+
[self.mockSignIn stopMocking];
4141
[super tearDown];
4242
}
4343

@@ -65,7 +65,7 @@ - (void)testSignOut {
6565
[expectation fulfill];
6666
}];
6767
[self waitForExpectationsWithTimeout:5.0 handler:nil];
68-
OCMVerify([self.mockSharedInstance signOut]);
68+
OCMVerify([self.mockSignIn signOut]);
6969
}
7070

7171
- (void)testDisconnect {
@@ -75,7 +75,7 @@ - (void)testDisconnect {
7575
[self.plugin handleMethodCall:methodCall
7676
result:^(id result){
7777
}];
78-
OCMVerify([self.mockSharedInstance disconnect]);
78+
OCMVerify([self.mockSignIn disconnect]);
7979
}
8080

8181
- (void)testClearAuthCache {
@@ -120,14 +120,14 @@ - (void)testInitGoogleServiceInfoPlist {
120120
}];
121121
[self waitForExpectationsWithTimeout:5.0 handler:nil];
122122

123-
id mockSharedInstance = self.mockSharedInstance;
124-
OCMVerify([mockSharedInstance setScopes:@[ @"mockScope1" ]]);
125-
OCMVerify([mockSharedInstance setHostedDomain:@"example.com"]);
123+
id mockSignIn = self.mockSignIn;
124+
OCMVerify([mockSignIn setScopes:@[ @"mockScope1" ]]);
125+
OCMVerify([mockSignIn setHostedDomain:@"example.com"]);
126126

127127
// Set in example app GoogleService-Info.plist.
128-
OCMVerify([mockSharedInstance
128+
OCMVerify([mockSignIn
129129
setClientID:@"479882132969-9i9aqik3jfjd7qhci1nqf0bm2g71rm1u.apps.googleusercontent.com"]);
130-
OCMVerify([mockSharedInstance setServerClientID:@"YOUR_SERVER_CLIENT_ID"]);
130+
OCMVerify([mockSignIn setServerClientID:@"YOUR_SERVER_CLIENT_ID"]);
131131
}
132132

133133
- (void)testInitNullDomain {
@@ -141,7 +141,7 @@ - (void)testInitNullDomain {
141141
[expectation fulfill];
142142
}];
143143
[self waitForExpectationsWithTimeout:5.0 handler:nil];
144-
OCMVerify([self.mockSharedInstance setHostedDomain:nil]);
144+
OCMVerify([self.mockSignIn setHostedDomain:nil]);
145145
}
146146

147147
- (void)testInitDynamicClientId {
@@ -155,13 +155,13 @@ - (void)testInitDynamicClientId {
155155
[expectation fulfill];
156156
}];
157157
[self waitForExpectationsWithTimeout:5.0 handler:nil];
158-
OCMVerify([self.mockSharedInstance setClientID:@"mockClientId"]);
158+
OCMVerify([self.mockSignIn setClientID:@"mockClientId"]);
159159
}
160160

161161
#pragma mark - Is signed in
162162

163163
- (void)testIsNotSignedIn {
164-
OCMStub([self.mockSharedInstance hasPreviousSignIn]).andReturn(NO);
164+
OCMStub([self.mockSignIn hasPreviousSignIn]).andReturn(NO);
165165

166166
FlutterMethodCall *methodCall = [FlutterMethodCall methodCallWithMethodName:@"isSignedIn"
167167
arguments:nil];
@@ -176,7 +176,7 @@ - (void)testIsNotSignedIn {
176176
}
177177

178178
- (void)testIsSignedIn {
179-
OCMStub([self.mockSharedInstance hasPreviousSignIn]).andReturn(YES);
179+
OCMStub([self.mockSignIn hasPreviousSignIn]).andReturn(YES);
180180

181181
FlutterMethodCall *methodCall = [FlutterMethodCall methodCallWithMethodName:@"isSignedIn"
182182
arguments:nil];
@@ -193,15 +193,15 @@ - (void)testIsSignedIn {
193193
#pragma mark - Sign in silently
194194

195195
- (void)testSignInSilently {
196-
OCMExpect([self.mockSharedInstance restorePreviousSignIn]);
196+
OCMExpect([self.mockSignIn restorePreviousSignIn]);
197197

198198
FlutterMethodCall *methodCall = [FlutterMethodCall methodCallWithMethodName:@"signInSilently"
199199
arguments:nil];
200200

201201
[self.plugin handleMethodCall:methodCall
202202
result:^(id result){
203203
}];
204-
OCMVerifyAll(self.mockSharedInstance);
204+
OCMVerifyAll(self.mockSignIn);
205205
}
206206

207207
- (void)testSignInSilentlyFailsConcurrently {
@@ -210,7 +210,7 @@ - (void)testSignInSilentlyFailsConcurrently {
210210

211211
XCTestExpectation *expectation = [self expectationWithDescription:@"expect result returns true"];
212212

213-
OCMExpect([self.mockSharedInstance restorePreviousSignIn]).andDo(^(NSInvocation *invocation) {
213+
OCMExpect([self.mockSignIn restorePreviousSignIn]).andDo(^(NSInvocation *invocation) {
214214
// Simulate calling the same method while the previous one is in flight.
215215
[self.plugin handleMethodCall:methodCall
216216
result:^(FlutterError *result) {
@@ -236,16 +236,16 @@ - (void)testSignIn {
236236
result:^(NSNumber *result){
237237
}];
238238

239-
id mockSharedInstance = self.mockSharedInstance;
240-
OCMVerify([mockSharedInstance
239+
id mockSignIn = self.mockSignIn;
240+
OCMVerify([mockSignIn
241241
setPresentingViewController:[OCMArg isKindOfClass:[FlutterViewController class]]]);
242-
OCMVerify([mockSharedInstance signIn]);
242+
OCMVerify([mockSignIn signIn]);
243243
}
244244

245245
- (void)testSignInExecption {
246246
FlutterMethodCall *methodCall = [FlutterMethodCall methodCallWithMethodName:@"signIn"
247247
arguments:nil];
248-
OCMExpect([self.mockSharedInstance signIn])
248+
OCMExpect([self.mockSignIn signIn])
249249
.andThrow([NSException exceptionWithName:@"MockName" reason:@"MockReason" userInfo:nil]);
250250

251251
__block FlutterError *error;
@@ -263,7 +263,7 @@ - (void)testSignInExecption {
263263

264264
- (void)testGetTokens {
265265
id mockUser = OCMClassMock([GIDGoogleUser class]);
266-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
266+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
267267

268268
id mockAuthentication = OCMClassMock([GIDAuthentication class]);
269269
OCMStub([mockAuthentication idToken]).andReturn(@"mockIdToken");
@@ -287,7 +287,7 @@ - (void)testGetTokens {
287287

288288
- (void)testGetTokensNoAuthKeychainError {
289289
id mockUser = OCMClassMock([GIDGoogleUser class]);
290-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
290+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
291291

292292
id mockAuthentication = OCMClassMock([GIDAuthentication class]);
293293
NSError *error = [NSError errorWithDomain:kGIDSignInErrorDomain
@@ -312,7 +312,7 @@ - (void)testGetTokensNoAuthKeychainError {
312312

313313
- (void)testGetTokensCancelledError {
314314
id mockUser = OCMClassMock([GIDGoogleUser class]);
315-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
315+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
316316

317317
id mockAuthentication = OCMClassMock([GIDAuthentication class]);
318318
NSError *error = [NSError errorWithDomain:kGIDSignInErrorDomain
@@ -337,7 +337,7 @@ - (void)testGetTokensCancelledError {
337337

338338
- (void)testGetTokensURLError {
339339
id mockUser = OCMClassMock([GIDGoogleUser class]);
340-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
340+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
341341

342342
id mockAuthentication = OCMClassMock([GIDAuthentication class]);
343343
NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorTimedOut userInfo:nil];
@@ -360,7 +360,7 @@ - (void)testGetTokensURLError {
360360

361361
- (void)testGetTokensUnknownError {
362362
id mockUser = OCMClassMock([GIDGoogleUser class]);
363-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
363+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
364364

365365
id mockAuthentication = OCMClassMock([GIDAuthentication class]);
366366
NSError *error = [NSError errorWithDomain:@"BogusDomain" code:42 userInfo:nil];
@@ -384,7 +384,7 @@ - (void)testGetTokensUnknownError {
384384
#pragma mark - Request scopes
385385

386386
- (void)testRequestScopesResultErrorIfNotSignedIn {
387-
OCMStub([self.mockSharedInstance currentUser]).andReturn(nil);
387+
OCMStub([self.mockSignIn currentUser]).andReturn(nil);
388388

389389
FlutterMethodCall *methodCall =
390390
[FlutterMethodCall methodCallWithMethodName:@"requestScopes"
@@ -402,7 +402,7 @@ - (void)testRequestScopesResultErrorIfNotSignedIn {
402402
- (void)testRequestScopesIfNoMissingScope {
403403
// Mock Google Signin internal calls
404404
GIDGoogleUser *mockUser = OCMClassMock([GIDGoogleUser class]);
405-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
405+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
406406
NSArray *requestedScopes = @[ @"mockScope1" ];
407407
OCMStub(mockUser.grantedScopes).andReturn(requestedScopes);
408408
FlutterMethodCall *methodCall =
@@ -421,11 +421,11 @@ - (void)testRequestScopesIfNoMissingScope {
421421
- (void)testRequestScopesRequestsIfNotGranted {
422422
// Mock Google Signin internal calls
423423
GIDGoogleUser *mockUser = OCMClassMock([GIDGoogleUser class]);
424-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
424+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
425425
NSArray *requestedScopes = @[ @"mockScope1" ];
426426
OCMStub(mockUser.grantedScopes).andReturn(@[]);
427-
id mockSharedInstance = self.mockSharedInstance;
428-
OCMStub([mockSharedInstance scopes]).andReturn(@[]);
427+
id mockSignIn = self.mockSignIn;
428+
OCMStub([mockSignIn scopes]).andReturn(@[]);
429429

430430
FlutterMethodCall *methodCall =
431431
[FlutterMethodCall methodCallWithMethodName:@"requestScopes"
@@ -435,19 +435,19 @@ - (void)testRequestScopesRequestsIfNotGranted {
435435
result:^(id r){
436436
}];
437437

438-
OCMVerify([mockSharedInstance setScopes:@[ @"mockScope1" ]]);
439-
OCMVerify([mockSharedInstance signIn]);
438+
OCMVerify([mockSignIn setScopes:@[ @"mockScope1" ]]);
439+
OCMVerify([mockSignIn signIn]);
440440
}
441441

442442
- (void)testRequestScopesReturnsFalseIfNotGranted {
443443
// Mock Google Signin internal calls
444444
GIDGoogleUser *mockUser = OCMClassMock([GIDGoogleUser class]);
445-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
445+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
446446
NSArray *requestedScopes = @[ @"mockScope1" ];
447447
OCMStub(mockUser.grantedScopes).andReturn(@[]);
448448

449-
OCMStub([self.mockSharedInstance signIn]).andDo(^(NSInvocation *invocation) {
450-
[((NSObject<GIDSignInDelegate> *)self.plugin) signIn:self.mockSharedInstance
449+
OCMStub([self.mockSignIn signIn]).andDo(^(NSInvocation *invocation) {
450+
[((NSObject<GIDSignInDelegate> *)self.plugin) signIn:self.mockSignIn
451451
didSignInForUser:mockUser
452452
withError:nil];
453453
});
@@ -468,14 +468,14 @@ - (void)testRequestScopesReturnsFalseIfNotGranted {
468468
- (void)testRequestScopesReturnsTrueIfGranted {
469469
// Mock Google Signin internal calls
470470
GIDGoogleUser *mockUser = OCMClassMock([GIDGoogleUser class]);
471-
OCMStub([self.mockSharedInstance currentUser]).andReturn(mockUser);
471+
OCMStub([self.mockSignIn currentUser]).andReturn(mockUser);
472472
NSArray *requestedScopes = @[ @"mockScope1" ];
473473
NSMutableArray *availableScopes = [NSMutableArray new];
474474
OCMStub(mockUser.grantedScopes).andReturn(availableScopes);
475475

476-
OCMStub([self.mockSharedInstance signIn]).andDo(^(NSInvocation *invocation) {
476+
OCMStub([self.mockSignIn signIn]).andDo(^(NSInvocation *invocation) {
477477
[availableScopes addObject:@"mockScope1"];
478-
[((NSObject<GIDSignInDelegate> *)self.plugin) signIn:self.mockSharedInstance
478+
[((NSObject<GIDSignInDelegate> *)self.plugin) signIn:self.mockSignIn
479479
didSignInForUser:mockUser
480480
withError:nil];
481481
});

0 commit comments

Comments
 (0)