Refactor awaitProgressEvents into awaitCondition

Author: lfkellogg

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ApkUpdaterTest.java

@@ -15,7 +15,7 @@
 package com.google.firebase.appdistribution.impl;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.appdistribution.impl.TestUtils.awaitProgressEvents;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitCondition;
 import static com.google.firebase.appdistribution.impl.TestUtils.awaitTask;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
@@ -180,8 +180,7 @@ public void updateApk_whenCannotReadInputStream_setsDownloadFailure() throws Exc
 
   @Test
   public void updateApk_whenSuccessfullyUpdated_notificationsSetCorrectly()
-      throws FirebaseAppDistributionException, ExecutionException, InterruptedException,
-          IOException {
+      throws FirebaseAppDistributionException, InterruptedException, IOException {
     doReturn(new ByteArrayInputStream(TEST_FILE.getBytes()))
         .when(mockHttpsUrlConnection)
         .getInputStream();
@@ -208,7 +207,7 @@ public void updateApk_whenSuccessfullyUpdated_notificationsSetCorrectly()
     List<UpdateProgress> events = new ArrayList<>();
     updateTask.addOnProgressListener(FirebaseExecutors.directExecutor(), events::add);
     countDownLatch.countDown();
-    awaitProgressEvents(events, 3);
+    awaitCondition(() -> events.size() == 3);
 
     assertThat(events.get(0).getUpdateStatus()).isEqualTo(UpdateStatus.PENDING);
     assertThat(events.get(1).getUpdateStatus()).isEqualTo(UpdateStatus.DOWNLOADING);

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionServiceImplTest.java

@@ -33,7 +33,7 @@
 import static com.google.firebase.appdistribution.impl.FeedbackActivity.RELEASE_NAME_KEY;
 import static com.google.firebase.appdistribution.impl.FeedbackActivity.SCREENSHOT_URI_KEY;
 import static com.google.firebase.appdistribution.impl.TestUtils.awaitAsyncOperations;
-import static com.google.firebase.appdistribution.impl.TestUtils.awaitProgressEvents;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitCondition;
 import static com.google.firebase.appdistribution.impl.TestUtils.awaitTask;
 import static com.google.firebase.appdistribution.impl.TestUtils.awaitTaskFailure;
 import static com.google.firebase.appdistribution.impl.TestUtils.awaitTermination;
@@ -386,7 +386,7 @@ public void updateIfNewReleaseAvailable_whenActivityBackgrounded_updateDialogNot
     List<UpdateProgress> progressEvents = new ArrayList<>();
     task.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents::add);
     countDownLatch.countDown();
-    awaitProgressEvents(progressEvents, 1);
+    awaitCondition(() -> progressEvents.size() == 1);
 
     assertEquals(UpdateStatus.NEW_RELEASE_NOT_AVAILABLE, progressEvents.get(0).getUpdateStatus());
     assertNull(ShadowAlertDialog.getLatestAlertDialog());

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TestUtils.java

@@ -28,22 +28,25 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.UpdateProgress;
 import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.ActivityConsumer;
 import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.ActivityFunction;
-import com.google.firebase.concurrent.TestOnlyExecutors;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collection;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.function.BooleanSupplier;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mockito.stubbing.Answer;
 
 final class TestUtils {
+
+  private static final int AWAIT_TERMINATION_TIMEOUT_MS = 100;
+  private static final int AWAIT_CONDITION_TIMEOUT_MS = 500;
+  private static final int SLEEP_MS = 50;
+
   private TestUtils() {}
 
   static void awaitTaskFailure(Task task, Status status, String messageSubstring) {
@@ -86,7 +89,7 @@ static <T> T awaitTask(Task<T> task)
   }
 
   static void awaitTermination(ExecutorService executorService) throws InterruptedException {
-    executorService.awaitTermination(100, TimeUnit.MILLISECONDS);
+    executorService.awaitTermination(AWAIT_TERMINATION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
   }
 
   static void awaitAsyncOperations(ExecutorService executorService) throws InterruptedException {
@@ -98,22 +101,19 @@ static void awaitAsyncOperations(ExecutorService executorService) throws Interru
     shadowOf(getMainLooper()).idle();
   }
 
-  /** Await a specified number of progress events being added to the given collection. */
-  static void awaitProgressEvents(Collection<UpdateProgress> progressEvents, int count)
-      throws InterruptedException {
-    ExecutorService executor = TestOnlyExecutors.blocking();
-    executor.execute(
-        () -> {
-          while (progressEvents.size() < count) {
-            try {
-              Thread.sleep(50);
-            } catch (InterruptedException e) {
-              throw new RuntimeException("Interrupted while waiting for progress events", e);
-            }
-          }
-        });
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
-    assertThat(progressEvents).hasSize(count);
+  static void awaitCondition(BooleanSupplier condition) throws InterruptedException {
+    long start = System.currentTimeMillis();
+    while (elapsedTime(start) < AWAIT_CONDITION_TIMEOUT_MS) {
+      if (condition.getAsBoolean()) {
+        return;
+      }
+      Thread.sleep(SLEEP_MS);
+    }
+    throw new AssertionError("Timed out waiting for condition");
+  }
+
+  private static long elapsedTime(long start) {
+    return System.currentTimeMillis() - start;
   }
 
   /**