Skip to content

Commit 4351bcd

Browse files
DellaBittaDellaBitta
authored
Auth I/O '23 - update other SDK iTests to use new API (#1268)
Numerous product SDKs have iTests which interact with Auth. In a previous feature branch change these tests were changed to use `Future<User*> Auth::current_user_DEPRECATED()`, for instance, as the new Auth API wasn't yet written. This PR updates the tests to use the new APIs, such as `Future<AuthResult> Auth::current_user()`.
1 parent ac3a965 commit 4351bcd

File tree

8 files changed

+54
-55
lines changed

8 files changed

+54
-55
lines changed

‎app_check/integration_test/src/integration_test.cc‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -491,13 +491,13 @@ void FirebaseAppCheckTest::CleanupFirestore(int expected_error = 0) {
491491
}
492492

493493
void FirebaseAppCheckTest::SignIn() {
494-
if (auth_->current_user_DEPRECATED() != nullptr) {
494+
if (auth_->current_user().is_valid()) {
495495
// Already signed in.
496496
return;
497497
}
498498
LogDebug("Signing in.");
499-
firebase::Future<firebase::auth::User*> sign_in_future =
500-
auth_->SignInAnonymously_DEPRECATED();
499+
firebase::Future<firebase::auth::AuthResult> sign_in_future =
500+
auth_->SignInAnonymously();
501501
WaitForCompletion(sign_in_future, "SignInAnonymously");
502502
if (sign_in_future.error() != 0) {
503503
FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -511,16 +511,15 @@ void FirebaseAppCheckTest::SignOut() {
511511
// Auth is not set up.
512512
return;
513513
}
514-
if (auth_->current_user_DEPRECATED() == nullptr) {
514+
if (!auth_->current_user().is_valid()) {
515515
// Already signed out.
516516
return;
517517
}
518-
if (auth_->current_user_DEPRECATED()->is_anonymous()) {
518+
if (auth_->current_user().is_anonymous()) {
519519
// If signed in anonymously, delete the anonymous user.
520-
WaitForCompletion(auth_->current_user_DEPRECATED()->Delete(),
521-
"DeleteAnonymousUser");
520+
WaitForCompletion(auth_->current_user().Delete(), "DeleteAnonymousUser");
522521
// If there was a problem deleting the user, try to sign out at least.
523-
if (auth_->current_user_DEPRECATED()) {
522+
if (auth_->current_user().is_valid()) {
524523
auth_->SignOut();
525524
}
526525
} else {
@@ -529,11 +528,11 @@ void FirebaseAppCheckTest::SignOut() {
529528
auth_->SignOut();
530529

531530
// Wait for the sign-out to finish.
532-
while (auth_->current_user_DEPRECATED() != nullptr) {
531+
while (auth_->current_user().is_valid()) {
533532
if (ProcessEvents(100)) break;
534533
}
535534
}
536-
EXPECT_EQ(auth_->current_user_DEPRECATED(), nullptr);
535+
EXPECT_FALSE(auth_->current_user().is_valid());
537536
}
538537

539538
firebase::database::DatabaseReference FirebaseAppCheckTest::CreateWorkingPath(
@@ -645,7 +644,7 @@ TEST_F(FirebaseAppCheckTest, TestSignIn) {
645644
InitializeAppCheckWithDebug();
646645
InitializeApp();
647646
InitializeAuth();
648-
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
647+
EXPECT_TRUE(auth_->current_user().is_valid());
649648
}
650649

651650
TEST_F(FirebaseAppCheckTest, TestDebugProviderValidToken) {

‎auth/tests/auth_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class AuthTest : public ::testing::Test {
124124
void MakeAuth() {
125125
firebase_app_ = testing::CreateApp();
126126
firebase_auth_ = Auth::GetAuth(firebase_app_);
127-
if (firebase_auth_->current_user_DEPRECATED()) {
127+
if (firebase_auth_->current_user().is_valid()) {
128128
firebase_auth_->SignOut();
129129
}
130130
}
@@ -510,16 +510,16 @@ TEST_F(AuthTest, TestCurrentUserAndSignOut) {
510510
MakeAuth();
511511

512512
// No user is signed in.
513-
EXPECT_EQ(nullptr, firebase_auth_->current_user_DEPRECATED());
513+
EXPECT_FALSE(firebase_auth_->current_user().is_valid());
514514

515515
// Now sign-in, say anonymously.
516516
Future<User*> result = firebase_auth_->SignInAnonymously_DEPRECATED();
517517
MaybeWaitForFuture(result);
518-
EXPECT_NE(nullptr, firebase_auth_->current_user_DEPRECATED());
518+
EXPECT_TRUE(firebase_auth_->current_user().is_valid());
519519

520520
// Now sign-out.
521521
firebase_auth_->SignOut();
522-
EXPECT_EQ(nullptr, firebase_auth_->current_user_DEPRECATED());
522+
EXPECT_FALSE(firebase_auth_->current_user().is_valid());
523523
}
524524

525525
TEST_F(AuthTest, TestSendPasswordResetEmailSucceeded) {

‎database/integration_test/src/integration_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,13 @@ void FirebaseDatabaseTest::TerminateDatabase() {
315315
}
316316

317317
void FirebaseDatabaseTest::SignIn() {
318-
if (shared_auth_->current_user_DEPRECATED() != nullptr) {
318+
if (shared_auth_->current_user().is_valid()) {
319319
// Already signed in.
320320
return;
321321
}
322322
LogDebug("Signing in.");
323-
firebase::Future<firebase::auth::User*> sign_in_future =
324-
shared_auth_->SignInAnonymously_DEPRECATED();
323+
firebase::Future<firebase::auth::AuthResult> sign_in_future =
324+
shared_auth_->SignInAnonymously();
325325
WaitForCompletion(sign_in_future, "SignInAnonymously");
326326
if (sign_in_future.error() != 0) {
327327
FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -335,25 +335,25 @@ void FirebaseDatabaseTest::SignOut() {
335335
// Auth is not set up.
336336
return;
337337
}
338-
if (shared_auth_->current_user_DEPRECATED() == nullptr) {
338+
if (!shared_auth_->current_user().is_valid()) {
339339
// Already signed out.
340340
return;
341341
}
342-
if (shared_auth_->current_user_DEPRECATED()->is_anonymous()) {
342+
if (shared_auth_->current_user().is_anonymous()) {
343343
// If signed in anonymously, delete the anonymous user.
344-
WaitForCompletion(shared_auth_->current_user_DEPRECATED()->Delete(),
344+
WaitForCompletion(shared_auth_->current_user().Delete(),
345345
"DeleteAnonymousUser");
346346
} else {
347347
// If not signed in anonymously (e.g. if the tests were modified to sign in
348348
// as an actual user), just sign out normally.
349349
shared_auth_->SignOut();
350350

351351
// Wait for the sign-out to finish.
352-
while (shared_auth_->current_user_DEPRECATED() != nullptr) {
352+
while (shared_auth_->current_user().is_valid()) {
353353
if (ProcessEvents(100)) break;
354354
}
355355
}
356-
EXPECT_EQ(shared_auth_->current_user_DEPRECATED(), nullptr);
356+
EXPECT_FALSE(shared_auth_->current_user().is_valid());
357357
}
358358

359359
firebase::database::DatabaseReference FirebaseDatabaseTest::CreateWorkingPath(
@@ -371,7 +371,7 @@ TEST_F(FirebaseDatabaseTest, TestInitializeAndTerminate) {
371371
}
372372

373373
TEST_F(FirebaseDatabaseTest, TestSignIn) {
374-
EXPECT_NE(shared_auth_->current_user_DEPRECATED(), nullptr);
374+
EXPECT_TRUE(shared_auth_->current_user().is_valid());
375375
}
376376

377377
TEST_F(FirebaseDatabaseTest, TestCreateWorkingPath) {

‎firestore/integration_test/src/integration_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,13 @@ void FirebaseFirestoreBasicTest::TerminateFirestore() {
272272
}
273273

274274
void FirebaseFirestoreBasicTest::SignIn() {
275-
if (shared_auth_->current_user_DEPRECATED() != nullptr) {
275+
if (shared_auth_->current_user().is_valid()) {
276276
// Already signed in.
277277
return;
278278
}
279279
LogDebug("Signing in.");
280-
firebase::Future<firebase::auth::User*> sign_in_future =
281-
shared_auth_->SignInAnonymously_DEPRECATED();
280+
firebase::Future<firebase::auth::AuthResult> sign_in_future =
281+
shared_auth_->SignInAnonymously();
282282
WaitForCompletion(sign_in_future, "SignInAnonymously");
283283
if (sign_in_future.error() != 0) {
284284
FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -292,26 +292,26 @@ void FirebaseFirestoreBasicTest::SignOut() {
292292
// Auth is not set up.
293293
return;
294294
}
295-
if (shared_auth_->current_user_DEPRECATED() == nullptr) {
295+
if (!shared_auth_->current_user().is_valid()) {
296296
// Already signed out.
297297
return;
298298
}
299299

300-
if (shared_auth_->current_user_DEPRECATED()->is_anonymous()) {
300+
if (shared_auth_->current_user().is_anonymous()) {
301301
// If signed in anonymously, delete the anonymous user.
302-
WaitForCompletion(shared_auth_->current_user_DEPRECATED()->Delete(),
302+
WaitForCompletion(shared_auth_->current_user().Delete(),
303303
"DeleteAnonymousUser");
304304
} else {
305305
// If not signed in anonymously (e.g. if the tests were modified to sign in
306306
// as an actual user), just sign out normally.
307307
shared_auth_->SignOut();
308308

309309
// Wait for the sign-out to finish.
310-
while (shared_auth_->current_user_DEPRECATED() != nullptr) {
310+
while (shared_auth_->current_user().is_valid()) {
311311
if (ProcessEvents(100)) break;
312312
}
313313
}
314-
EXPECT_EQ(shared_auth_->current_user_DEPRECATED(), nullptr);
314+
EXPECT_FALSE(shared_auth_->current_user().is_valid());
315315
}
316316

317317
firebase::firestore::CollectionReference
@@ -345,7 +345,7 @@ TEST_F(FirebaseFirestoreBasicTest, TestInitializeAndTerminate) {
345345
}
346346

347347
TEST_F(FirebaseFirestoreBasicTest, TestSignIn) {
348-
EXPECT_NE(shared_auth_->current_user_DEPRECATED(), nullptr);
348+
EXPECT_TRUE(shared_auth_->current_user().is_valid());
349349
}
350350

351351
TEST_F(FirebaseFirestoreBasicTest, TestAppAndSettings) {

‎firestore/integration_test_internal/src/firestore_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ TEST_F(FirestoreIntegrationTest, AuthWorks) {
15371537
WriteDocument(doc, MapFieldValue{{"foo", FieldValue::Integer(42)}});
15381538

15391539
// Signing in should trigger an AuthStateListener event.
1540-
auto signin = auth->SignInAnonymously_DEPRECATED();
1540+
auto signin = auth->SignInAnonymously();
15411541
Stopwatch stopwatch;
15421542
Await(signin);
15431543
stopwatch.stop();

‎firestore/integration_test_internal/src/integration_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,13 @@ void FirebaseFirestoreBasicTest::TerminateFirestore() {
275275
}
276276

277277
void FirebaseFirestoreBasicTest::SignIn() {
278-
if (shared_auth_->current_user_DEPRECATED() != nullptr) {
278+
if (shared_auth_->current_user().is_valid()) {
279279
// Already signed in.
280280
return;
281281
}
282282
LogDebug("Signing in.");
283-
firebase::Future<firebase::auth::User*> sign_in_future =
284-
shared_auth_->SignInAnonymously_DEPRECATED();
283+
firebase::Future<firebase::auth::AuthResult> sign_in_future =
284+
shared_auth_->SignInAnonymously();
285285
WaitForCompletion(sign_in_future, "SignInAnonymously");
286286
if (sign_in_future.error() != 0) {
287287
FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -295,26 +295,26 @@ void FirebaseFirestoreBasicTest::SignOut() {
295295
// Auth is not set up.
296296
return;
297297
}
298-
if (shared_auth_->current_user_DEPRECATED() == nullptr) {
298+
if (!shared_auth_->current_user().is_valid()) {
299299
// Already signed out.
300300
return;
301301
}
302302

303-
if (shared_auth_->current_user_DEPRECATED()->is_anonymous()) {
303+
if (shared_auth_->current_user().is_anonymous()) {
304304
// If signed in anonymously, delete the anonymous user.
305-
WaitForCompletion(shared_auth_->current_user_DEPRECATED()->Delete(),
305+
WaitForCompletion(shared_auth_->current_user().Delete(),
306306
"DeleteAnonymousUser");
307307
} else {
308308
// If not signed in anonymously (e.g. if the tests were modified to sign in
309309
// as an actual user), just sign out normally.
310310
shared_auth_->SignOut();
311311

312312
// Wait for the sign-out to finish.
313-
while (shared_auth_->current_user_DEPRECATED() != nullptr) {
313+
while (shared_auth_->current_user().is_valid()) {
314314
if (ProcessEvents(100)) break;
315315
}
316316
}
317-
EXPECT_EQ(shared_auth_->current_user_DEPRECATED(), nullptr);
317+
EXPECT_FALSE(shared_auth_->current_user().is_valid());
318318
}
319319

320320
firebase::firestore::CollectionReference
@@ -349,7 +349,7 @@ TEST_F(FirebaseFirestoreBasicTest, TestInitializeAndTerminate) {
349349

350350
TEST_F(FirebaseFirestoreBasicTest, TestSignIn) {
351351
SKIP_TEST_ON_QUICK_CHECK;
352-
EXPECT_NE(shared_auth_->current_user_DEPRECATED(), nullptr);
352+
EXPECT_TRUE(shared_auth_->current_user().is_valid());
353353
}
354354

355355
TEST_F(FirebaseFirestoreBasicTest, TestAppAndSettings) {

‎functions/integration_test/src/integration_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ void FirebaseFunctionsTest::Terminate() {
184184

185185
void FirebaseFunctionsTest::SignIn() {
186186
LogDebug("Signing in.");
187-
firebase::Future<firebase::auth::User*> sign_in_future =
188-
auth_->SignInAnonymously_DEPRECATED();
187+
firebase::Future<firebase::auth::AuthResult> sign_in_future =
188+
auth_->SignInAnonymously();
189189
WaitForCompletion(sign_in_future, "SignInAnonymously");
190190
if (sign_in_future.error() != 0) {
191191
FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -252,7 +252,7 @@ TEST_F(FirebaseFunctionsTest, TestInitializeAndTerminate) {
252252

253253
TEST_F(FirebaseFunctionsTest, TestSignIn) {
254254
SignIn();
255-
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
255+
EXPECT_TRUE(auth_->current_user().is_valid());
256256
}
257257

258258
TEST_F(FirebaseFunctionsTest, TestFunction) {

‎storage/integration_test/src/integration_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,13 @@ void FirebaseStorageTest::TerminateStorage() {
271271
}
272272

273273
void FirebaseStorageTest::SignIn() {
274-
if (shared_auth_->current_user_DEPRECATED() != nullptr) {
274+
if (shared_auth_->current_user().is_valid()) {
275275
// Already signed in.
276276
return;
277277
}
278278
LogDebug("Signing in.");
279-
firebase::Future<firebase::auth::User*> sign_in_future =
280-
shared_auth_->SignInAnonymously_DEPRECATED();
279+
firebase::Future<firebase::auth::AuthResult> sign_in_future =
280+
shared_auth_->SignInAnonymously();
281281
WaitForCompletion(sign_in_future, "SignInAnonymously");
282282
if (sign_in_future.error() != 0) {
283283
FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -291,25 +291,25 @@ void FirebaseStorageTest::SignOut() {
291291
// Auth is not set up.
292292
return;
293293
}
294-
if (shared_auth_->current_user_DEPRECATED() == nullptr) {
294+
if (!shared_auth_->current_user().is_valid()) {
295295
// Already signed out.
296296
return;
297297
}
298-
if (shared_auth_->current_user_DEPRECATED()->is_anonymous()) {
298+
if (shared_auth_->current_user().is_anonymous()) {
299299
// If signed in anonymously, delete the anonymous user.
300-
WaitForCompletion(shared_auth_->current_user_DEPRECATED()->Delete(),
300+
WaitForCompletion(shared_auth_->current_user().Delete(),
301301
"DeleteAnonymousUser");
302302
} else {
303303
// If not signed in anonymously (e.g. if the tests were modified to sign in
304304
// as an actual user), just sign out normally.
305305
shared_auth_->SignOut();
306306

307307
// Wait for the sign-out to finish.
308-
while (shared_auth_->current_user_DEPRECATED() != nullptr) {
308+
while (shared_auth_->current_user().is_valid()) {
309309
if (ProcessEvents(100)) break;
310310
}
311311
}
312-
EXPECT_EQ(shared_auth_->current_user_DEPRECATED(), nullptr);
312+
EXPECT_FALSE(shared_auth_->current_user().is_valid());
313313
}
314314

315315
firebase::storage::StorageReference FirebaseStorageTest::CreateFolder() {
@@ -330,7 +330,7 @@ TEST_F(FirebaseStorageTest, TestInitializeAndTerminate) {
330330
}
331331

332332
TEST_F(FirebaseStorageTest, TestSignIn) {
333-
EXPECT_NE(shared_auth_->current_user_DEPRECATED(), nullptr);
333+
EXPECT_TRUE(shared_auth_->current_user().is_valid());
334334
}
335335

336336
TEST_F(FirebaseStorageTest, TestCreateWorkingFolder) {

0 commit comments

Comments
 (0)