@@ -663,8 +663,7 @@ public void startFeedback_signsInTesterAndStartsActivity() throws InterruptedExc
663
663
assertThat (actualIntent .getStringExtra (RELEASE_NAME_KEY )).isEqualTo ("release-name" );
664
664
assertThat (actualIntent .getStringExtra (SCREENSHOT_URI_KEY ))
665
665
.isEqualTo (TEST_SCREENSHOT_URI .toString ());
666
- assertThat (actualIntent .getStringExtra (INFO_TEXT_KEY ))
667
- .isEqualTo ("Some terms and conditions" );
666
+ assertThat (actualIntent .getStringExtra (INFO_TEXT_KEY )).isEqualTo ("Some terms and conditions" );
668
667
assertThat (firebaseAppDistribution .isFeedbackInProgress ()).isTrue ();
669
668
}
670
669
@@ -692,10 +691,8 @@ public void startFeedback_withUri_doesNotTakeScreenshot() throws InterruptedExce
692
691
Intent actualIntent = shadowOf (RuntimeEnvironment .getApplication ()).getNextStartedActivity ();
693
692
assertEquals (expectedIntent .getComponent (), actualIntent .getComponent ());
694
693
assertThat (actualIntent .getStringExtra (RELEASE_NAME_KEY )).isEqualTo ("release-name" );
695
- assertThat (actualIntent .getStringExtra (SCREENSHOT_URI_KEY ))
696
- .isEqualTo (providedUri .toString ());
697
- assertThat (actualIntent .getStringExtra (INFO_TEXT_KEY ))
698
- .isEqualTo ("Some terms and conditions" );
694
+ assertThat (actualIntent .getStringExtra (SCREENSHOT_URI_KEY )).isEqualTo (providedUri .toString ());
695
+ assertThat (actualIntent .getStringExtra (INFO_TEXT_KEY )).isEqualTo ("Some terms and conditions" );
699
696
assertThat (firebaseAppDistribution .isFeedbackInProgress ()).isTrue ();
700
697
}
701
698
@@ -717,7 +714,13 @@ public void startFeedback_closingActivity_setsInProgressToFalse() throws Interru
717
714
firebaseAppDistribution .startFeedback ("Some terms and conditions" );
718
715
TestUtils .awaitAsyncOperations (taskExecutor );
719
716
// Simulate destroying the feedback activity
720
- firebaseAppDistribution .onActivityDestroyed (new FeedbackActivity ());
717
+ firebaseAppDistribution .onActivityDestroyed (
718
+ new FeedbackActivity () {
719
+ @ Override
720
+ public boolean isFinishing () {
721
+ return true ;
722
+ }
723
+ });
721
724
722
725
assertThat (firebaseAppDistribution .isFeedbackInProgress ()).isFalse ();
723
726
}
@@ -739,8 +742,7 @@ public void startFeedback_screenshotFails_startActivityWithNoScreenshot()
739
742
assertEquals (expectedIntent .getComponent (), actualIntent .getComponent ());
740
743
assertThat (actualIntent .getStringExtra (RELEASE_NAME_KEY )).isEqualTo ("release-name" );
741
744
assertThat (actualIntent .getStringExtra (SCREENSHOT_URI_KEY )).isNull ();
742
- assertThat (actualIntent .getStringExtra (INFO_TEXT_KEY ))
743
- .isEqualTo ("Some terms and conditions" );
745
+ assertThat (actualIntent .getStringExtra (INFO_TEXT_KEY )).isEqualTo ("Some terms and conditions" );
744
746
assertThat (firebaseAppDistribution .isFeedbackInProgress ()).isTrue ();
745
747
}
746
748
0 commit comments