Merge

googleapis · Apr 2, 2018 · dc4708b · dc4708b
1 parent 9b4cbf8
commit dc4708b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
@@ -80,15 +80,13 @@ public class ITSystemTest {
 
   @Rule public TestName testName = new TestName();
 
- static private Firestore firestore;
+  private Firestore firestore;
   private CollectionReference randomColl;
   private DocumentReference randomDoc;
 
   @Before
   public void before() {
-    if (firestore == null) {
-      firestore = FirestoreOptions.getDefaultInstance().getService();
-    }
+    firestore = FirestoreOptions.getDefaultInstance().getService();
     randomColl =
         firestore.collection(
             String.format("java-%s-%s", testName.getMethodName(), LocalFirestoreHelper.autoId()));

diff --git a/google-cloud-firestore/src/test/resources/test-suite.binproto b/google-cloud-firestore/src/test/resources/test-suite.binproto