Merge branch 'main' into dl/map-expressions

Author: dlarocque

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

@@ -1994,30 +1994,20 @@ public void testNestedFields() {
     Map<String, Object> hitchhikerResult;
     Map<String, Object> duneResult;
 
-    switch (IntegrationTestUtil.getTargetBackend()) {
-      case NIGHTLY:
-        hitchhikerResult =
-            mapOfEntries(
-                entry("title", "The Hitchhiker's Guide to the Galaxy"),
-                entry("awards", ImmutableMap.of("hugo", true)));
-        duneResult =
-            mapOfEntries(entry("title", "Dune"), entry("awards", ImmutableMap.of("hugo", true)));
-        break;
-      default:
-        hitchhikerResult =
-            mapOfEntries(
-                entry("title", "The Hitchhiker's Guide to the Galaxy"), entry("awards.hugo", true));
-        duneResult = mapOfEntries(entry("title", "Dune"), entry("awards.hugo", true));
-        break;
-    }
+    hitchhikerResult =
+        mapOfEntries(
+            entry("title", "The Hitchhiker's Guide to the Galaxy"),
+            entry("awards", ImmutableMap.of("hugo", true)));
+    duneResult =
+        mapOfEntries(entry("title", "Dune"), entry("awards", ImmutableMap.of("hugo", true)));
 
     assertThat(waitFor(execute).getResults())
         .comparingElementsUsing(DATA_CORRESPONDENCE)
         .containsExactly(hitchhikerResult, duneResult);
   }
 
   @Test
-  public void testMapGetWithFieldNameIncludingNotation() {
+  public void testMapGetWithFieldNameIncludingDotNotation() {
     Task<Pipeline.Snapshot> execute =
         firestore
             .pipeline()
@@ -2032,27 +2022,16 @@ public void testMapGetWithFieldNameIncludingNotation() {
 
     Map<String, Object> hitchhikerResult;
     Map<String, Object> duneResult;
-
-    switch (IntegrationTestUtil.getTargetBackend()) {
-      case NIGHTLY:
-        hitchhikerResult =
-            mapOfEntries(
-                entry("title", "The Hitchhiker's Guide to the Galaxy"),
-                entry("nestedField", ImmutableMap.of("level", ImmutableMap.of())),
-                entry("nested", true));
-        duneResult =
-            mapOfEntries(
-                entry("title", "Dune"),
-                entry("nestedField", ImmutableMap.of("level", ImmutableMap.of())),
-                entry("nested", null));
-        break;
-      default:
-        hitchhikerResult =
-            mapOfEntries(
-                entry("title", "The Hitchhiker's Guide to the Galaxy"), entry("nested", true));
-        duneResult = mapOfEntries(entry("title", "Dune"));
-        break;
-    }
+    hitchhikerResult =
+        mapOfEntries(
+            entry("title", "The Hitchhiker's Guide to the Galaxy"),
+            entry("nestedField", ImmutableMap.of("level", ImmutableMap.of())),
+            entry("nested", true));
+    duneResult =
+        mapOfEntries(
+            entry("title", "Dune"),
+            entry("nestedField", ImmutableMap.of("level", ImmutableMap.of())),
+            entry("nested", null));
 
     assertThat(waitFor(execute).getResults())
         .comparingElementsUsing(DATA_CORRESPONDENCE)