@@ -409,8 +409,6 @@ TEST_F(FirebaseAppCheckTest, TestInitializeAndTerminate) {
409409 InitializeApp ();
410410}
411411
412- // Android does not yet implement the main app check methods
413- #if !FIREBASE_PLATFORM_ANDROID
414412TEST_F (FirebaseAppCheckTest, TestGetTokenForcingRefresh) {
415413 InitializeAppCheckWithDebug ();
416414 InitializeApp ();
@@ -443,10 +441,7 @@ TEST_F(FirebaseAppCheckTest, TestGetTokenForcingRefresh) {
443441 EXPECT_NE (future.result ()->expire_time_millis ,
444442 future3.result ()->expire_time_millis );
445443}
446- #endif // !FIREBASE_PLATFORM_ANDROID
447444
448- // Android does not yet implement the main app check methods
449- #if !FIREBASE_PLATFORM_ANDROID
450445TEST_F (FirebaseAppCheckTest, TestGetTokenLastResult) {
451446 InitializeAppCheckWithDebug ();
452447 InitializeApp ();
@@ -464,9 +459,8 @@ TEST_F(FirebaseAppCheckTest, TestGetTokenLastResult) {
464459 EXPECT_EQ (future.result ()->expire_time_millis ,
465460 future2.result ()->expire_time_millis );
466461}
467- #endif // !FIREBASE_PLATFORM_ANDROID
468462
469- // Android does not yet implement the main app check methods
463+ // Android does not yet implement token changed listeners
470464#if !FIREBASE_PLATFORM_ANDROID
471465TEST_F (FirebaseAppCheckTest, TestAddTokenChangedListener) {
472466 InitializeAppCheckWithDebug ();
@@ -489,7 +483,7 @@ TEST_F(FirebaseAppCheckTest, TestAddTokenChangedListener) {
489483}
490484#endif // !FIREBASE_PLATFORM_ANDROID
491485
492- // Android does not yet implement the main app check methods
486+ // Android does not yet implement token changed listeners
493487#if !FIREBASE_PLATFORM_ANDROID
494488TEST_F (FirebaseAppCheckTest, TestRemoveTokenChangedListener) {
495489 InitializeAppCheckWithDebug ();
@@ -524,12 +518,6 @@ TEST_F(FirebaseAppCheckTest, TestDebugProviderValidToken) {
524518 ASSERT_NE (factory, nullptr );
525519 InitializeAppCheckWithDebug ();
526520 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 );
533521
534522 firebase::app_check::AppCheckProvider* provider =
535523 factory->CreateProvider (app_);
@@ -611,6 +599,7 @@ TEST_F(FirebaseAppCheckTest, TestPlayIntegrityProvider) {
611599#if FIREBASE_PLATFORM_ANDROID
612600 ASSERT_NE (factory, nullptr );
613601 InitializeApp ();
602+
614603 firebase::app_check::AppCheckProvider* provider =
615604 factory->CreateProvider (app_);
616605 EXPECT_NE (provider, nullptr );
@@ -738,6 +727,9 @@ TEST_F(FirebaseAppCheckTest, TestStorageReadFile) {
738727 LogDebug (" buffer: %s" , buffer);
739728}
740729
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
741733TEST_F (FirebaseAppCheckTest, TestStorageReadFileUnauthenticated) {
742734 // Don't set up AppCheck
743735 InitializeAppAuthStorage ();
@@ -751,5 +743,6 @@ TEST_F(FirebaseAppCheckTest, TestStorageReadFileUnauthenticated) {
751743 firebase::storage::kErrorUnauthenticated );
752744 LogDebug (" buffer: %s" , buffer);
753745}
746+ #endif // !FIREBASE_PLATFORM_ANDROID
754747
755748} // namespace firebase_testapp_automated
0 commit comments