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