lint

Author: Brian Chen

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java

@@ -313,6 +313,7 @@ public void testIncrementTransactionally() {
     AtomicInteger started = new AtomicInteger(0);
 
     FirebaseFirestore firestore = testFirestore();
+    firestore.removeTransactionBackoffs();
     DocumentReference doc = firestore.collection("counters").document();
     waitFor(doc.set(map("count", 5.0)));
 
@@ -378,6 +379,7 @@ public void testUpdateTransactionally() {
     AtomicInteger counter = new AtomicInteger(0);
 
     FirebaseFirestore firestore = testFirestore();
+    firestore.removeTransactionBackoffs();
     DocumentReference doc = firestore.collection("counters").document();
     waitFor(doc.set(map("count", 5.0, "other", "yes")));
 
@@ -472,6 +474,7 @@ public void testUpdatePOJOTransactionally() {
     AtomicInteger started = new AtomicInteger(0);
 
     FirebaseFirestore firestore = testFirestore();
+    firestore.removeTransactionBackoffs();
     DocumentReference doc = firestore.collection("counters").document();
     waitFor(doc.set(new POJO(5.0, "no", "clean")));
 

firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java

@@ -387,9 +387,7 @@ AsyncQueue getAsyncQueue() {
     return asyncQueue;
   }
 
-  /**
-   * For tests: Skip all transaction backoffs to make integration tests complete faster.
-   */
+  /** For tests: Skip all transaction backoffs to make integration tests complete faster. */
   @VisibleForTesting
   void removeTransactionBackoffs() {
     this.skipTransactionBackoffs = true;

firebase-firestore/src/main/java/com/google/firebase/firestore/core/SyncEngine.java

@@ -23,7 +23,6 @@
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.android.gms.tasks.Tasks;
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.google.firebase.database.collection.ImmutableSortedMap;

firebase-firestore/src/main/java/com/google/firebase/firestore/util/AsyncQueue.java

@@ -473,13 +473,6 @@ public void enqueueAndForget(Runnable task) {
    * @return A DelayedTask instance that can be used for cancellation.
    */
   public DelayedTask enqueueAfterDelay(TimerId timerId, long delayMs, Runnable task) {
-    // While not necessarily harmful, we currently don't expect to have multiple tasks with the same
-    // timer id in the queue, so defensively reject them.
-    hardAssert(
-        !containsDelayedTask(timerId),
-        "Attempted to schedule multiple operations with timer id %s.",
-        timerId);
-
     DelayedTask delayedTask = createAndScheduleDelayedTask(timerId, delayMs, task);
     delayedTasks.add(delayedTask);