From 02dc1aa8228ca50058c04473be5fa1730b167ca5 Mon Sep 17 00:00:00 2001
From: ashwinraghav <ashwinraghav@google.com>
Date: Fri, 7 Sep 2018 12:02:05 -0700
Subject: [PATCH 1/5] Retrying firestore integration tests

---
 .../ArrayTransformsServerApplicationTest.java |  4 ++
 .../firestore/ArrayTransformsTest.java        |  3 ++
 .../google/firebase/firestore/CursorTest.java |  2 +
 .../google/firebase/firestore/FieldsTest.java |  2 +
 .../firebase/firestore/FirestoreTest.java     |  2 +
 .../firestore/ListenerRegistrationTest.java   |  2 +
 .../google/firebase/firestore/POJOTest.java   |  2 +
 .../google/firebase/firestore/QueryTest.java  |  2 +
 .../google/firebase/firestore/RetryRule.java  | 48 +++++++++++++++++++
 .../firestore/ServerTimestampTest.java        |  2 +
 .../google/firebase/firestore/SmokeTest.java  |  2 +
 .../google/firebase/firestore/SourceTest.java |  2 +
 .../firebase/firestore/TransactionTest.java   |  2 +
 .../google/firebase/firestore/TypeTest.java   |  2 +
 .../firebase/firestore/ValidationTest.java    |  2 +
 .../firebase/firestore/WriteBatchTest.java    |  2 +
 16 files changed, 81 insertions(+)
 create mode 100644 firebase-firestore/src/androidTest/java/com/google/firebase/firestore/RetryRule.java

diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
index 436dc5946b3..fb0c1c5df23 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
@@ -24,7 +24,9 @@
 
 import android.support.test.runner.AndroidJUnit4;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
+import java.util.Random;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -36,6 +38,8 @@
  */
 @RunWith(AndroidJUnit4.class)
 public class ArrayTransformsServerApplicationTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
+
   // A document reference to read and write to.
   DocumentReference docRef;
 
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
index 172dc1cdf01..0f2df15962b 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
@@ -27,6 +27,7 @@
 import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -37,6 +38,8 @@
  */
 @RunWith(AndroidJUnit4.class)
 public class ArrayTransformsTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
+
   // A document reference to read and write to.
   private DocumentReference docRef;
 
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
index 803b668f1ba..3069ed9d2d4 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
@@ -34,11 +34,13 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class CursorTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
index 4c7c394f009..77ded1eeb52 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
@@ -37,11 +37,13 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class FieldsTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
index 5512a838a61..81e382145b0 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
@@ -47,12 +47,14 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 // TODO: Add the skipped tests from typescript.
 @RunWith(AndroidJUnit4.class)
 public class FirestoreTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
index b7de4f7d7b1..707a765d2cf 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
@@ -24,11 +24,13 @@
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.concurrent.Semaphore;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class ListenerRegistrationTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java
index c75bc84f5ef..4c487293a19 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java
@@ -24,11 +24,13 @@
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.Date;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class POJOTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   public static class POJO {
 
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
index 9500d2255a4..490a7b11415 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
@@ -37,11 +37,13 @@
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class QueryTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/RetryRule.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/RetryRule.java
new file mode 100644
index 00000000000..031c0680793
--- /dev/null
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/RetryRule.java
@@ -0,0 +1,48 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.firestore;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+public class RetryRule implements TestRule {
+  private int retryCount;
+
+  public RetryRule(int retryCount) {
+    this.retryCount = retryCount;
+  }
+
+  public Statement apply(final Statement base, Description description) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        Throwable caughtThrowable = null;
+
+        for (int i = 0; i < retryCount; i++) {
+          System.out.println("Trying...." +  i);
+          try {
+            base.evaluate();
+            return;
+          } catch (Throwable t) {
+            caughtThrowable = t;
+          }
+        }
+
+        throw caughtThrowable;
+      }
+    };
+  }
+}
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
index 9b71486e3bb..1698ec2debb 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
@@ -37,11 +37,13 @@
 import javax.annotation.Nullable;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class ServerTimestampTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   // Data written in tests via set.
   private static final Map<String, Object> setData =
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
index 2e77c338aff..9f359953a53 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
@@ -32,11 +32,13 @@
 import java.util.Map;
 import org.junit.After;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class SmokeTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
index d3e8d727802..c2596d479cb 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
@@ -34,11 +34,13 @@
 import java.util.Map;
 import org.junit.After;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public final class SourceTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
index 580f864c82a..8fa57e9158c 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
@@ -34,11 +34,13 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class TransactionTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
index b86f25be66d..73d366ec600 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
@@ -31,11 +31,13 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class TypeTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
index 705496de073..0fb6537d739 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
@@ -40,12 +40,14 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 // NOTE: The SDK has exhaustive nullability checks, but we don't exhaustively test them. :-)
 @RunWith(AndroidJUnit4.class)
 public class ValidationTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
index 6dc62a3b8ba..17a3e7383c9 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
@@ -34,11 +34,13 @@
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.Arrays;
 import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class WriteBatchTest {
+  @Rule public RetryRule retryRule = new RetryRule(3);
 
   @After
   public void tearDown() {

From e70a532b2a605b05165592022a59bdaef7944a71 Mon Sep 17 00:00:00 2001
From: ashwinraghav <ashwinraghav@google.com>
Date: Fri, 7 Sep 2018 13:25:48 -0700
Subject: [PATCH 2/5] Formatting

---
 .../firestore/ArrayTransformsServerApplicationTest.java         | 1 -
 .../java/com/google/firebase/firestore/RetryRule.java           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
index fb0c1c5df23..519f7e15ed4 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
@@ -24,7 +24,6 @@
 
 import android.support.test.runner.AndroidJUnit4;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
-import java.util.Random;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/RetryRule.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/RetryRule.java
index 031c0680793..c72801e74a3 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/RetryRule.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/RetryRule.java
@@ -32,7 +32,7 @@ public void evaluate() throws Throwable {
         Throwable caughtThrowable = null;
 
         for (int i = 0; i < retryCount; i++) {
-          System.out.println("Trying...." +  i);
+          System.out.println("Trying...." + i);
           try {
             base.evaluate();
             return;

From 811ce29d1afd78167ccbb6a8408ed8e662f49012 Mon Sep 17 00:00:00 2001
From: ashwinraghav <ashwinraghav@google.com>
Date: Mon, 10 Sep 2018 10:31:50 -0700
Subject: [PATCH 3/5] Applying rule to only one test

---
 .../firestore/ArrayTransformsServerApplicationTest.java        | 2 --
 .../java/com/google/firebase/firestore/CursorTest.java         | 3 ---
 .../java/com/google/firebase/firestore/FieldsTest.java         | 3 ---
 .../java/com/google/firebase/firestore/FirestoreTest.java      | 3 ---
 .../google/firebase/firestore/ListenerRegistrationTest.java    | 3 ---
 .../java/com/google/firebase/firestore/POJOTest.java           | 3 ---
 .../java/com/google/firebase/firestore/QueryTest.java          | 3 ---
 .../com/google/firebase/firestore/ServerTimestampTest.java     | 3 ---
 .../java/com/google/firebase/firestore/SmokeTest.java          | 3 ---
 .../java/com/google/firebase/firestore/SourceTest.java         | 3 ---
 .../java/com/google/firebase/firestore/TransactionTest.java    | 3 ---
 .../java/com/google/firebase/firestore/TypeTest.java           | 3 ---
 .../java/com/google/firebase/firestore/ValidationTest.java     | 3 ---
 .../java/com/google/firebase/firestore/WriteBatchTest.java     | 3 ---
 14 files changed, 41 deletions(-)

diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
index 519f7e15ed4..0671a78612d 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
@@ -25,7 +25,6 @@
 import android.support.test.runner.AndroidJUnit4;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -37,7 +36,6 @@
  */
 @RunWith(AndroidJUnit4.class)
 public class ArrayTransformsServerApplicationTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
 
   // A document reference to read and write to.
   DocumentReference docRef;
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
index 3069ed9d2d4..5903fc7fb32 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
@@ -34,14 +34,11 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class CursorTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
index 77ded1eeb52..2583215050b 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
@@ -37,14 +37,11 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class FieldsTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
index 81e382145b0..ba944bccbf5 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
@@ -47,15 +47,12 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 // TODO: Add the skipped tests from typescript.
 @RunWith(AndroidJUnit4.class)
 public class FirestoreTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
index 707a765d2cf..41e930a92ed 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
@@ -24,14 +24,11 @@
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.concurrent.Semaphore;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class ListenerRegistrationTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java
index 4c487293a19..5e8c941f89f 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java
@@ -24,14 +24,11 @@
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.Date;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class POJOTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   public static class POJO {
 
     double number;
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
index 490a7b11415..f6b02a6c07b 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
@@ -37,14 +37,11 @@
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class QueryTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
index 1698ec2debb..d1d096b31fd 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
@@ -37,14 +37,11 @@
 import javax.annotation.Nullable;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class ServerTimestampTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   // Data written in tests via set.
   private static final Map<String, Object> setData =
       map(
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
index 9f359953a53..fafb5cdd77f 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
@@ -32,14 +32,11 @@
 import java.util.Map;
 import org.junit.After;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class SmokeTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
index c2596d479cb..26d62cae70e 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
@@ -34,14 +34,11 @@
 import java.util.Map;
 import org.junit.After;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public final class SourceTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
index 8fa57e9158c..8a0fc796a5f 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
@@ -34,14 +34,11 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class TransactionTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
index 73d366ec600..743cb49776e 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
@@ -31,14 +31,11 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class TypeTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
index 0fb6537d739..7b2e1d86937 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
@@ -40,15 +40,12 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 // NOTE: The SDK has exhaustive nullability checks, but we don't exhaustively test them. :-)
 @RunWith(AndroidJUnit4.class)
 public class ValidationTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
index 17a3e7383c9..b299411c606 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
@@ -34,14 +34,11 @@
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.Arrays;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class WriteBatchTest {
-  @Rule public RetryRule retryRule = new RetryRule(3);
-
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();

From 9ba936c370c02b4f65c97f3cba4081abb8ed61ea Mon Sep 17 00:00:00 2001
From: ashwinraghav <ashwinraghav@google.com>
Date: Mon, 10 Sep 2018 10:56:53 -0700
Subject: [PATCH 4/5] Re adding new lines

---
 .../java/com/google/firebase/firestore/ArrayTransformsTest.java  | 1 +
 .../java/com/google/firebase/firestore/CursorTest.java           | 1 +
 .../java/com/google/firebase/firestore/FieldsTest.java           | 1 +
 .../java/com/google/firebase/firestore/FirestoreTest.java        | 1 +
 .../com/google/firebase/firestore/ListenerRegistrationTest.java  | 1 +
 .../java/com/google/firebase/firestore/QueryTest.java            | 1 +
 .../java/com/google/firebase/firestore/ServerTimestampTest.java  | 1 +
 .../java/com/google/firebase/firestore/SmokeTest.java            | 1 +
 .../java/com/google/firebase/firestore/SourceTest.java           | 1 +
 .../java/com/google/firebase/firestore/TransactionTest.java      | 1 +
 .../androidTest/java/com/google/firebase/firestore/TypeTest.java | 1 +
 .../java/com/google/firebase/firestore/ValidationTest.java       | 1 +
 .../java/com/google/firebase/firestore/WriteBatchTest.java       | 1 +
 13 files changed, 13 insertions(+)

diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
index 0f2df15962b..887cff5ebdb 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
@@ -38,6 +38,7 @@
  */
 @RunWith(AndroidJUnit4.class)
 public class ArrayTransformsTest {
+
   @Rule public RetryRule retryRule = new RetryRule(3);
 
   // A document reference to read and write to.
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
index 5903fc7fb32..803b668f1ba 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java
@@ -39,6 +39,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class CursorTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
index 2583215050b..4c7c394f009 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java
@@ -42,6 +42,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class FieldsTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
index ba944bccbf5..5512a838a61 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
@@ -53,6 +53,7 @@
 // TODO: Add the skipped tests from typescript.
 @RunWith(AndroidJUnit4.class)
 public class FirestoreTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
index 41e930a92ed..b7de4f7d7b1 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java
@@ -29,6 +29,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class ListenerRegistrationTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
index f6b02a6c07b..9500d2255a4 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
@@ -42,6 +42,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class QueryTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
index d1d096b31fd..9b71486e3bb 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java
@@ -42,6 +42,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class ServerTimestampTest {
+
   // Data written in tests via set.
   private static final Map<String, Object> setData =
       map(
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
index fafb5cdd77f..2e77c338aff 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java
@@ -37,6 +37,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class SmokeTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
index 26d62cae70e..d3e8d727802 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java
@@ -39,6 +39,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public final class SourceTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
index 8a0fc796a5f..580f864c82a 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
@@ -39,6 +39,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class TransactionTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
index 743cb49776e..b86f25be66d 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java
@@ -36,6 +36,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class TypeTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
index 7b2e1d86937..705496de073 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
@@ -46,6 +46,7 @@
 // NOTE: The SDK has exhaustive nullability checks, but we don't exhaustively test them. :-)
 @RunWith(AndroidJUnit4.class)
 public class ValidationTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
index b299411c606..6dc62a3b8ba 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java
@@ -39,6 +39,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class WriteBatchTest {
+
   @After
   public void tearDown() {
     IntegrationTestUtil.tearDown();

From 1f87f1a7f868c64f2897ffeab1abf33d93177faf Mon Sep 17 00:00:00 2001
From: ashwinraghav <ashwinraghav@google.com>
Date: Mon, 10 Sep 2018 13:56:15 -0700
Subject: [PATCH 5/5] Added todo

---
 .../firestore/ArrayTransformsServerApplicationTest.java         | 1 -
 .../java/com/google/firebase/firestore/ArrayTransformsTest.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
index 0671a78612d..436dc5946b3 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java
@@ -36,7 +36,6 @@
  */
 @RunWith(AndroidJUnit4.class)
 public class ArrayTransformsServerApplicationTest {
-
   // A document reference to read and write to.
   DocumentReference docRef;
 
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
index 887cff5ebdb..09c59139214 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java
@@ -38,7 +38,7 @@
  */
 @RunWith(AndroidJUnit4.class)
 public class ArrayTransformsTest {
-
+  // TODO(b/114769487): These tests have been flaky in CI so temporarily retrying.
   @Rule public RetryRule retryRule = new RetryRule(3);
 
   // A document reference to read and write to.