Merge

schmidt-sebastian · schmidt-sebastian · commit 97faab1fbdc6 · 2022-01-19T14:46:49.000-07:00
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/DocumentOverlayCacheTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/DocumentOverlayCacheTestCase.java
@@ -153,6 +153,7 @@ public void testGetAllOverlaysSinceBatchId() {
     verifyOverlayContains(overlays, "coll/doc3", "coll/doc4");
   }
 
+<<<<<<< HEAD
   @Test
   public void testGetAllOverlaysFromCollectionGroupEnforcesCollectionGroup() {
     saveOverlays(2, "coll1/doc1", "coll2/doc1");
@@ -191,6 +192,8 @@ public void testGetAllOverlaysFromCollectionGroupWithLimitIncludesFullBatches()
     verifyOverlayContains(overlays, "coll/doc1", "coll/doc2", "coll/doc3");
   }
 
+=======
+>>>>>>> @{-1}
   void verifyOverlayContains(Map<DocumentKey, Overlay> overlays, String... keys) {
     Set<DocumentKey> expected = Arrays.stream(keys).map(TestUtil::key).collect(Collectors.toSet());
     assertThat(overlays.keySet()).containsExactlyElementsIn(expected);

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ public void testGetAllOverlaysSinceBatchId() {`
`153`	`153`	`verifyOverlayContains(overlays, "coll/doc3", "coll/doc4");`
`154`	`154`	`}`
`155`	`155`
	`156`	`+<<<<<<< HEAD`
`156`	`157`	`@Test`
`157`	`158`	`public void testGetAllOverlaysFromCollectionGroupEnforcesCollectionGroup() {`
`158`	`159`	`saveOverlays(2, "coll1/doc1", "coll2/doc1");`
`@@ -191,6 +192,8 @@ public void testGetAllOverlaysFromCollectionGroupWithLimitIncludesFullBatches()`
`191`	`192`	`verifyOverlayContains(overlays, "coll/doc1", "coll/doc2", "coll/doc3");`
`192`	`193`	`}`
`193`	`194`
	`195`	`+=======`
	`196`	`+>>>>>>> @{-1}`
`194`	`197`	`void verifyOverlayContains(Map<DocumentKey, Overlay> overlays, String... keys) {`
`195`	`198`	`Set<DocumentKey> expected = Arrays.stream(keys).map(TestUtil::key).collect(Collectors.toSet());`
`196`	`199`	`assertThat(overlays.keySet()).containsExactlyElementsIn(expected);`