Changeset 16160 in josm for trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerMultiVersionTest.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/plugins/PluginHandlerMultiVersionTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerMultiVersionTest.java

@@ -9 +9 @@
 import java.io.File;
 import java.nio.file.Files;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.Before;
@@ -25 +27 @@
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -96 +97 @@
 
         final String quxNewerServePath = "/qux/newer.jar";
+        final Map<String, String> attrOverrides = new HashMap<String, String>() {{
+            put("7500_Plugin-Url", "432;http://localhost:" + pluginServerRule.port() + quxNewerServePath);
+            put("7499_Plugin-Url", "346;http://localhost:" + pluginServerRule.port() + "/not/served.jar");
+            put("6999_Plugin-Url", "345;http://localhost:" + pluginServerRule.port() + "/not/served/eithejar");
+        }};
         final PluginServer pluginServer = new PluginServer(
             new PluginServer.RemotePlugin(this.referenceBazJarOld),
-            new PluginServer.RemotePlugin(this.referenceQuxJarNewest, ImmutableMap.of(
-                "7500_Plugin-Url", "432;http://localhost:" + this.pluginServerRule.port() + quxNewerServePath,
-                "7499_Plugin-Url", "346;http://localhost:" + this.pluginServerRule.port() + "/not/served.jar",
-                "6999_Plugin-Url", "345;http://localhost:" + this.pluginServerRule.port() + "/not/served/either.jar"
-            ))
+            new PluginServer.RemotePlugin(this.referenceQuxJarNewest, attrOverrides)
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
@@ -161 +163 @@
         TestUtils.assumeWorkingJMockit();
 
+        final Map<String, String> attrOverrides = new HashMap<String, String>() {{
+            put("7500_Plugin-Url", "432;http://localhost:" + pluginServerRule.port() + "/dont.jar");
+            put("7499_Plugin-Url", "346;http://localhost:" + pluginServerRule.port() + "/even.jar");
+            put("6999_Plugin-Url", "345;http://localhost:" + pluginServerRule.port() + "/bother.jar");
+        }};
         final PluginServer pluginServer = new PluginServer(
             new PluginServer.RemotePlugin(this.referenceBazJarOld),
-            new PluginServer.RemotePlugin(this.referenceQuxJarNewest, ImmutableMap.of(
-                "7500_Plugin-Url", "432;http://localhost:" + this.pluginServerRule.port() + "/dont.jar",
-                "7499_Plugin-Url", "346;http://localhost:" + this.pluginServerRule.port() + "/even.jar",
-                "6999_Plugin-Url", "345;http://localhost:" + this.pluginServerRule.port() + "/bother.jar"
-            ))
+            new PluginServer.RemotePlugin(this.referenceQuxJarNewest, attrOverrides)
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);