Responding to feedback and moving tests to their respective clients

Author: Manny Jimenez

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistribution.java

@@ -237,31 +237,30 @@ public UpdateTask updateApp() {
    * Overloaded updateApp with boolean input showDownloadInNotificationsManager. Set to true for
    * basic configuration and false for advanced configuration.
    */
-  private UpdateTask updateApp(boolean showDownloadInNotificationManager) {
+  public UpdateTask updateApp(boolean showDownloadInNotificationManager) {
     if (!isTesterSignedIn()) {
       UpdateTaskImpl updateTask = new UpdateTaskImpl();
       updateTask.setException(
           new FirebaseAppDistributionException(
               Constants.ErrorMessages.AUTHENTICATION_ERROR, AUTHENTICATION_FAILURE));
       return updateTask;
     }
+    synchronized (cachedNewReleaseLock) {
+      if (cachedNewRelease == null) {
+        LogWrapper.getInstance().v("New release not found.");
+        return getErrorUpdateTask(
+            new FirebaseAppDistributionException(
+                Constants.ErrorMessages.NOT_FOUND_ERROR, UPDATE_NOT_AVAILABLE));
+      }
 
-    if (cachedNewRelease == null) {
-      LogWrapper.getInstance().v("New release not found.");
-      return getErrorUpdateTask(
-          new FirebaseAppDistributionException(
-              Constants.ErrorMessages.NOT_FOUND_ERROR, UPDATE_NOT_AVAILABLE));
-    }
-
-    if (cachedNewRelease.getDownloadUrl() == null) {
-      LogWrapper.getInstance().v("Download failed to execute");
-      return getErrorUpdateTask(
-          new FirebaseAppDistributionException(
-              Constants.ErrorMessages.DOWNLOAD_URL_NOT_FOUND,
-              FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE));
-    }
+      if (cachedNewRelease.getDownloadUrl() == null) {
+        LogWrapper.getInstance().v("Download failed to execute");
+        return getErrorUpdateTask(
+            new FirebaseAppDistributionException(
+                Constants.ErrorMessages.DOWNLOAD_URL_NOT_FOUND,
+                FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE));
+      }
 
-    synchronized (cachedNewReleaseLock) {
       if (cachedNewRelease.getBinaryType() == BinaryType.AAB) {
         return this.updateAabClient.updateAab(cachedNewRelease);
       } else {

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

@@ -437,30 +437,6 @@ public void taskCancelledOnScreenRotation() {
     assertEquals(INSTALLATION_CANCELED, e.getErrorCode());
   }
 
-  @Test
-  public void updateApp_whenCalledMultipleTimesWithAAB_returnsSameUpdateTask() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
-    AppDistributionReleaseInternal newRelease = TEST_RELEASE_NEWER_AAB_INTERNAL.build();
-    firebaseAppDistribution.setCachedNewRelease(newRelease);
-
-    UpdateTask updateTask1 = firebaseAppDistribution.updateApp(true);
-    UpdateTask updateTask2 = firebaseAppDistribution.updateApp(true);
-
-    assertEquals(updateTask1, updateTask2);
-  }
-
-  @Test
-  public void updateApp_whenCalledMultipleTimesWithApk_returnsSameUpdateTask() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
-    AppDistributionReleaseInternal newRelease = TEST_RELEASE_NEWER_APK_INTERNAL.build();
-    firebaseAppDistribution.setCachedNewRelease(newRelease);
-
-    UpdateTask updateTask1 = firebaseAppDistribution.updateApp();
-    UpdateTask updateTask2 = firebaseAppDistribution.updateApp();
-
-    assertEquals(updateTask1, updateTask2);
-  }
-
   @Test
   public void updateAppTask_whenNoReleaseAvailable_throwsError() {
     firebaseAppDistribution.setCachedNewRelease(null);

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

@@ -145,4 +145,14 @@ public void updateAppTask_onAppResume_setsUpdateCancelled()
         assertThrows(FirebaseAppDistributionException.class, onCompleteListener::await);
     assertEquals(ReleaseUtils.convertToAppDistributionRelease(newRelease), exception.getRelease());
   }
+
+  @Test
+  public void updateApp_whenCalledMultipleTimesWithAAB_returnsSameUpdateTask() {
+    AppDistributionReleaseInternal newRelease = TEST_RELEASE_NEWER_AAB_INTERNAL.build();
+
+    UpdateTask updateTask1 = updateAabClient.updateAab(newRelease);
+    UpdateTask updateTask2 = updateAabClient.updateAab(newRelease);
+
+    assertEquals(updateTask1, updateTask2);
+  }
 }

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

@@ -209,4 +209,12 @@ public void postProgressUpdate_whenErrorStatus_updatesNotificationsManagerWithEr
     updateApkClient.postUpdateProgress(1000, 900, UpdateStatus.DOWNLOADING, false);
     assertEquals(0, shadowNotificationManager.size());
   }
+
+  @Test
+  public void updateApp_whenCalledMultipleTimesWithApk_returnsSameUpdateTask() {
+    UpdateTask updateTask1 = updateApkClient.updateApk(TEST_RELEASE, false);
+    UpdateTask updateTask2 = updateApkClient.updateApk(TEST_RELEASE, false);
+
+    assertEquals(updateTask1, updateTask2);
+  }
 }