@@ -409,8 +409,6 @@ TEST_F(FirebaseAppCheckTest, TestInitializeAndTerminate) {
409
409
InitializeApp ();
410
410
}
411
411
412
- // Android does not yet implement the main app check methods
413
- #if !FIREBASE_PLATFORM_ANDROID
414
412
TEST_F (FirebaseAppCheckTest, TestGetTokenForcingRefresh) {
415
413
InitializeAppCheckWithDebug ();
416
414
InitializeApp ();
@@ -443,10 +441,7 @@ TEST_F(FirebaseAppCheckTest, TestGetTokenForcingRefresh) {
443
441
EXPECT_NE (future.result ()->expire_time_millis ,
444
442
future3.result ()->expire_time_millis );
445
443
}
446
- #endif // !FIREBASE_PLATFORM_ANDROID
447
444
448
- // Android does not yet implement the main app check methods
449
- #if !FIREBASE_PLATFORM_ANDROID
450
445
TEST_F (FirebaseAppCheckTest, TestGetTokenLastResult) {
451
446
InitializeAppCheckWithDebug ();
452
447
InitializeApp ();
@@ -464,9 +459,8 @@ TEST_F(FirebaseAppCheckTest, TestGetTokenLastResult) {
464
459
EXPECT_EQ (future.result ()->expire_time_millis ,
465
460
future2.result ()->expire_time_millis );
466
461
}
467
- #endif // !FIREBASE_PLATFORM_ANDROID
468
462
469
- // Android does not yet implement the main app check methods
463
+ // Android does not yet implement token changed listeners
470
464
#if !FIREBASE_PLATFORM_ANDROID
471
465
TEST_F (FirebaseAppCheckTest, TestAddTokenChangedListener) {
472
466
InitializeAppCheckWithDebug ();
@@ -489,7 +483,7 @@ TEST_F(FirebaseAppCheckTest, TestAddTokenChangedListener) {
489
483
}
490
484
#endif // !FIREBASE_PLATFORM_ANDROID
491
485
492
- // Android does not yet implement the main app check methods
486
+ // Android does not yet implement token changed listeners
493
487
#if !FIREBASE_PLATFORM_ANDROID
494
488
TEST_F (FirebaseAppCheckTest, TestRemoveTokenChangedListener) {
495
489
InitializeAppCheckWithDebug ();
@@ -524,12 +518,6 @@ TEST_F(FirebaseAppCheckTest, TestDebugProviderValidToken) {
524
518
ASSERT_NE (factory, nullptr );
525
519
InitializeAppCheckWithDebug ();
526
520
InitializeApp ();
527
- // TODO(almostmatt): Once app initialization automatically initializes
528
- // AppCheck, this test will no longer need to explicitly get an instance of
529
- // AppCheck.
530
- ::firebase::app_check::AppCheck* app_check =
531
- ::firebase::app_check::AppCheck::GetInstance (app_);
532
- ASSERT_NE (app_check, nullptr );
533
521
534
522
firebase::app_check::AppCheckProvider* provider =
535
523
factory->CreateProvider (app_);
@@ -611,6 +599,7 @@ TEST_F(FirebaseAppCheckTest, TestPlayIntegrityProvider) {
611
599
#if FIREBASE_PLATFORM_ANDROID
612
600
ASSERT_NE (factory, nullptr );
613
601
InitializeApp ();
602
+
614
603
firebase::app_check::AppCheckProvider* provider =
615
604
factory->CreateProvider (app_);
616
605
EXPECT_NE (provider, nullptr );
@@ -738,6 +727,9 @@ TEST_F(FirebaseAppCheckTest, TestStorageReadFile) {
738
727
LogDebug (" buffer: %s" , buffer);
739
728
}
740
729
730
+ // Android doesn't yet work correctly when AppCheck provider factory is null
731
+ // TODO(almostmatt): Investigate and fix this test for android
732
+ #if !FIREBASE_PLATFORM_ANDROID
741
733
TEST_F (FirebaseAppCheckTest, TestStorageReadFileUnauthenticated) {
742
734
// Don't set up AppCheck
743
735
InitializeAppAuthStorage ();
@@ -751,5 +743,6 @@ TEST_F(FirebaseAppCheckTest, TestStorageReadFileUnauthenticated) {
751
743
firebase::storage::kErrorUnauthenticated );
752
744
LogDebug (" buffer: %s" , buffer);
753
745
}
746
+ #endif // !FIREBASE_PLATFORM_ANDROID
754
747
755
748
} // namespace firebase_testapp_automated
0 commit comments