firestore: fixing bug in QuerySnapshot (#3195)

googleapis · Apr 26, 2018 · c001e14 · c001e14
1 parent e7d5250
commit c001e14
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QuerySnapshot.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QuerySnapshot.java
@@ -59,7 +59,7 @@ public List<DocumentChange> getDocumentChanges() {
             if (documentChanges == null) {
               documentChanges = new ArrayList<>();
               for (int i = 0; i < documents.size(); ++i) {
-                documentChanges.add(new DocumentChange(documents.get(0), Type.ADDED, -1, i));
+                documentChanges.add(new DocumentChange(documents.get(i), Type.ADDED, -1, i));
               }
             }
           }

diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java
@@ -528,10 +528,26 @@ public void getResult() throws Exception {
     assertEquals(2, result.size());
     assertEquals(2, result.getDocuments().size());
 
-    Iterator<QueryDocumentSnapshot> iterator = result.iterator();
-    assertEquals("doc1", iterator.next().getId());
-    assertEquals("doc2", iterator.next().getId());
-    assertFalse(iterator.hasNext());
+    Iterator<QueryDocumentSnapshot> docIterator = result.iterator();
+    assertEquals("doc1", docIterator.next().getId());
+    assertEquals("doc2", docIterator.next().getId());
+    assertFalse(docIterator.hasNext());
+
+    Iterator<DocumentChange> changeIterator = result.getDocumentChanges().iterator();
+
+    DocumentChange documentChange = changeIterator.next();
+    assertEquals("doc1",documentChange.getDocument().getId());
+    assertEquals(DocumentChange.Type.ADDED,documentChange.getType());
+    assertEquals(-1,documentChange.getOldIndex());
+    assertEquals(0,documentChange.getNewIndex());
+
+    documentChange = changeIterator.next();
+    assertEquals("doc2",documentChange.getDocument().getId());
+    assertEquals(DocumentChange.Type.ADDED,documentChange.getType());
+    assertEquals(-1,documentChange.getOldIndex());
+    assertEquals(1,documentChange.getNewIndex());
+
+    assertFalse(changeIterator.hasNext());
 
     assertEquals(Instant.ofEpochSecond(1, 2), result.getReadTime());