Changeset 16160 in josm for trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java

Timestamp:

2020-03-17T20:09:41+01:00 (6 years ago)

Author:

simon04

Message:

see #18948 - Get rid of remaining ImmutableMap.of

File:

• trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java

@@ -17 +17 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -49 +50 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import com.google.common.collect.ImmutableMap;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -530 +529 @@
         this.paintSlippyMap();
 
-        Map<Integer, String> paletteMap = ImmutableMap.<Integer, String>builder()
-            .put(0xffffffff, "w")  // white
-            .put(0xff000000, "b")  // black
-            .put(0xfff0d1d1, "p")  // pink
-            .build();
+        Map<Integer, String> paletteMap = new HashMap<Integer, String>() {{
+            put(0xffffffff, "w");  // white
+            put(0xff000000, "b");  // black
+            put(0xfff0d1d1, "p");  // pink
+        }};
 
         Matcher rowMatcher = ImagePatternMatching.rowMatch(
@@ -680 +679 @@
         this.paintSlippyMap();
 
-        Map<Integer, String> paletteMap = ImmutableMap.<Integer, String>builder()
-            .put(0xff00ff00, "g")  // green
-            .put(0xff000000, "b")  // black
-            .put(0xff8ad16b, "v")  // viewport marker inner (pink+green mix)
-            .put(0xff00df00, "d")  // (shaded green)
-            .put(0xff8ac46b, "q")  // (shaded pink+green mix)
-            .build();
+        Map<Integer, String> paletteMap = new HashMap<Integer, String>() {{
+            put(0xff00ff00, "g");  // green
+            put(0xff000000, "b");  // black
+            put(0xff8ad16b, "v");  // viewport marker inner (pink+green mix)
+            put(0xff00df00, "d");  // (shaded green)
+            put(0xff8ac46b, "q");  // (shaded pink+green mix)
+        }};
 
         // assert downloaded areas are not drawn
@@ -852 +851 @@
         this.paintSlippyMap();
 
-        Map<Integer, String> paletteMap = ImmutableMap.<Integer, String>builder()
-            .put(0xff00ff00, "g")  // green
-            .put(0xff000000, "b")  // black
-            .put(0xff8ad16b, "v")  // viewport marker inner (pink+green mix)
-            .put(0xff00df00, "d")  // (shaded green)
-            .put(0xff8ac46b, "q")  // (shaded pink+green mix)
-            .build();
+        Map<Integer, String> paletteMap = new HashMap<Integer, String>() {{
+            put(0xff00ff00, "g");  // green
+            put(0xff000000, "b");  // black
+            put(0xff8ad16b, "v");  // viewport marker inner (pink+green mix)
+            put(0xff00df00, "d");  // (shaded green)
+            put(0xff8ac46b, "q");  // (shaded pink+green mix)
+        }};
 
         // the middle row should be entirely unshaded