Add tests for dialog cancellation and dismissal

Author: Rachel Prince

firebase-app-distribution/src/test/java/com/google/firebase/app/distribution/FirebaseAppDistributionTest.java

@@ -234,48 +234,28 @@ public void updateApp_whenNotSignedIn_throwsError() {
 
   @Test
   public void updateToNewRelease_whenNewAabReleaseAvailable_showsUpdateDialog() {
-    // mockSignInStorage returns false then true to simulate logging in during first signIn check in
-    // updateIfNewReleaseAvailable
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false).thenReturn(true);
-    AppDistributionReleaseInternal newRelease = TEST_RELEASE_NEWER_AAB_INTERNAL.build();
-    when(mockCheckForNewReleaseClient.checkForNewRelease()).thenReturn(Tasks.forResult(newRelease));
-    firebaseAppDistribution.setCachedNewRelease(newRelease);
-    doReturn(new UpdateTaskImpl()).when(mockUpdateAabClient).updateAab(newRelease);
+    updateToNewRelease(TEST_RELEASE_NEWER_AAB_INTERNAL.build());
 
-    firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    // Update flow
-    verify(mockTesterSignInClient, times(1)).signInTester();
-    assertTrue(ShadowAlertDialog.getLatestDialog() instanceof AlertDialog);
-    AlertDialog updateDialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
+    AlertDialog dialog = verifyUpdateAlertDialog();
     assertEquals(
         String.format(
             "Version %s (%s) is available.\n\nRelease notes: %s",
             TEST_RELEASE_NEWER_AAB.getDisplayVersion(),
             TEST_RELEASE_NEWER_AAB.getVersionCode(),
             TEST_RELEASE_NEWER_AAB.getReleaseNotes()),
-        shadowOf(updateDialog).getMessage().toString());
-    assertTrue(updateDialog.isShowing());
+        shadowOf(dialog).getMessage().toString());
   }
 
   @Test
   public void updateToNewRelease_whenReleaseNotesEmpty_doesNotShowReleaseNotes() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
-    AppDistributionReleaseInternal newRelease =
-        TEST_RELEASE_NEWER_AAB_INTERNAL.setReleaseNotes("").build();
-    when(mockCheckForNewReleaseClient.checkForNewRelease()).thenReturn(Tasks.forResult(newRelease));
-    firebaseAppDistribution.setCachedNewRelease(newRelease);
+    updateToNewRelease(TEST_RELEASE_NEWER_AAB_INTERNAL.setReleaseNotes("").build());
 
-    firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    // Update flow
-    assertTrue(ShadowAlertDialog.getLatestDialog() instanceof AlertDialog);
-    AlertDialog updateDialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
+    AlertDialog dialog = verifyUpdateAlertDialog();
     assertEquals(
         String.format(
             "Version %s (%s) is available.",
             TEST_RELEASE_NEWER_AAB.getDisplayVersion(), TEST_RELEASE_NEWER_AAB.getVersionCode()),
-        shadowOf(updateDialog).getMessage().toString());
+        shadowOf(dialog).getMessage().toString());
   }
 
   @Test
@@ -352,6 +332,34 @@ public void updateToNewRelease_whenSignInFailed_checkForUpdateNotCalled() {
     assertEquals(AUTHENTICATION_FAILURE, e.getErrorCode());
   }
 
+  @Test
+  public void updateToNewRelease_whenDialogDismissed_taskFails() {
+    UpdateTask updateTask = updateToNewRelease(TEST_RELEASE_NEWER_AAB_INTERNAL.build());
+    AlertDialog updateDialog = verifyUpdateAlertDialog();
+    updateDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); // dismiss dialog
+
+    assertFalse(updateDialog.isShowing());
+    assertFalse(updateTask.isSuccessful());
+    Exception e = updateTask.getException();
+    assertTrue(e instanceof FirebaseAppDistributionException);
+    assertEquals(INSTALLATION_CANCELED, ((FirebaseAppDistributionException) e).getErrorCode());
+    assertEquals(ErrorMessages.UPDATE_CANCELED, e.getMessage());
+  }
+
+  @Test
+  public void updateToNewRelease_whenDialogCanceled_taskFails() {
+    UpdateTask updateTask = updateToNewRelease(TEST_RELEASE_NEWER_AAB_INTERNAL.build());
+    AlertDialog updateDialog = verifyUpdateAlertDialog();
+    updateDialog.onBackPressed(); // cancels the dialog
+
+    assertFalse(updateDialog.isShowing());
+    assertFalse(updateTask.isSuccessful());
+    Exception e = updateTask.getException();
+    assertTrue(e instanceof FirebaseAppDistributionException);
+    assertEquals(INSTALLATION_CANCELED, ((FirebaseAppDistributionException) e).getErrorCode());
+    assertEquals(ErrorMessages.UPDATE_CANCELED, e.getMessage());
+  }
+
   @Test
   public void updateToNewRelease_whenCheckForUpdateFails_updateAppNotCalled() {
     when(mockCheckForNewReleaseClient.checkForNewRelease())
@@ -374,14 +382,6 @@ public void updateToNewRelease_whenCheckForUpdateFails_updateAppNotCalled() {
     assertEquals(FirebaseAppDistributionException.Status.NETWORK_FAILURE, e.getErrorCode());
   }
 
-  @Test
-  public void updateToNewRelease_callsSignInTester() {
-    when(mockCheckForNewReleaseClient.checkForNewRelease())
-        .thenReturn(Tasks.forResult(TEST_RELEASE_NEWER_AAB_INTERNAL.build()));
-    firebaseAppDistribution.updateIfNewReleaseAvailable();
-    verify(mockTesterSignInClient, times(1)).signInTester();
-  }
-
   @Test
   public void signOutTester_setsSignInStatusFalse() {
     firebaseAppDistribution.signOutTester();
@@ -475,4 +475,20 @@ public void updateApp_withApkReleaseAvailable_returnsSameApkTask() {
 
     assertEquals(updateTask, updateTaskToReturn);
   }
+
+  private UpdateTask updateToNewRelease(AppDistributionReleaseInternal newRelease) {
+    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
+    when(mockCheckForNewReleaseClient.checkForNewRelease()).thenReturn(Tasks.forResult(newRelease));
+    firebaseAppDistribution.setCachedNewRelease(newRelease);
+
+    return firebaseAppDistribution.updateIfNewReleaseAvailable();
+  }
+
+  private AlertDialog verifyUpdateAlertDialog() {
+    assertTrue(ShadowAlertDialog.getLatestDialog() instanceof AlertDialog);
+    AlertDialog dialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
+    assertTrue(dialog.isShowing());
+
+    return dialog;
+  }
 }

firebase-app-distribution/src/test/java/com/google/firebase/app/distribution/TesterSignInClientTest.java

@@ -141,11 +141,8 @@ public void signInTester_whenDialogConfirmedAndChromeAvailable_opensCustomTab()
 
     testerSignInClient.signInTester();
 
-    if (ShadowAlertDialog.getLatestDialog() instanceof AlertDialog) {
-      AlertDialog dialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
-      assertTrue(dialog.isShowing());
-      dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
-    }
+    AlertDialog dialog = verifySignInAlertDialog();
+    dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
 
     verify(mockFirebaseInstallations, times(1)).getId();
     assertThat(shadowActivity.getNextStartedActivity().getData()).isEqualTo(Uri.parse(TEST_URL));
@@ -161,11 +158,8 @@ public void signInTester_whenDialogConfirmedAndChromeNotAvailable_opensBrowserIn
 
     testerSignInClient.signInTester();
 
-    if (ShadowAlertDialog.getLatestDialog() instanceof AlertDialog) {
-      AlertDialog dialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
-      assertTrue(dialog.isShowing());
-      dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
-    }
+    AlertDialog dialog = verifySignInAlertDialog();
+    dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
 
     verify(mockFirebaseInstallations, times(1)).getId();
     assertThat(shadowActivity.getNextStartedActivity().getData()).isEqualTo(Uri.parse(TEST_URL));
@@ -191,11 +185,8 @@ public void signInTester_whenTesterIsSignedIn_doesNotOpenDialog() {
   @Test
   public void signInTester_whenReturnFromSignIn_taskSucceeds() {
     Task signInTask = testerSignInClient.signInTester();
-    if (ShadowAlertDialog.getLatestDialog() instanceof AlertDialog) {
-      AlertDialog dialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
-      assertTrue(dialog.isShowing());
-      dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
-    }
+    AlertDialog dialog = verifySignInAlertDialog();
+    dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
 
     // Simulate re-entering app
     testerSignInClient.onActivityCreated(mockSignInResultActivity);
@@ -217,4 +208,40 @@ public void signInTester_whenAppReenteredDuringSignIn_taskFails() {
     assertEquals(AUTHENTICATION_CANCELED, ((FirebaseAppDistributionException) e).getErrorCode());
     assertEquals(ErrorMessages.AUTHENTICATION_CANCELED, e.getMessage());
   }
+
+  @Test
+  public void signInTester_whenDialogDismissed_taskFails() {
+    Task signInTask = testerSignInClient.signInTester();
+
+    AlertDialog dialog = verifySignInAlertDialog();
+    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); // dismiss dialog
+
+    assertFalse(signInTask.isSuccessful());
+    Exception e = signInTask.getException();
+    assertTrue(e instanceof FirebaseAppDistributionException);
+    assertEquals(AUTHENTICATION_CANCELED, ((FirebaseAppDistributionException) e).getErrorCode());
+    assertEquals(ErrorMessages.AUTHENTICATION_CANCELED, e.getMessage());
+  }
+
+  @Test
+  public void signInTester_whenDialogCanceled_taskFails() {
+    Task signInTask = testerSignInClient.signInTester();
+
+    AlertDialog dialog = verifySignInAlertDialog();
+    dialog.onBackPressed(); // cancel dialog
+
+    assertFalse(signInTask.isSuccessful());
+    Exception e = signInTask.getException();
+    assertTrue(e instanceof FirebaseAppDistributionException);
+    assertEquals(AUTHENTICATION_CANCELED, ((FirebaseAppDistributionException) e).getErrorCode());
+    assertEquals(ErrorMessages.AUTHENTICATION_CANCELED, e.getMessage());
+  }
+
+  private AlertDialog verifySignInAlertDialog() {
+    assertTrue(ShadowAlertDialog.getLatestDialog() instanceof AlertDialog);
+    AlertDialog dialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
+    assertTrue(dialog.isShowing());
+
+    return dialog;
+  }
 }