Changeset 19050 in josm for trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerMultiVersionTest.java

Timestamp:

2024-04-22T20:59:26+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerMultiVersionTest.java (modified) (4 diffs)

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

@@ -91 +91 @@
     @AssumeRevision("Revision: 7501\n")
     @Test
-    void testUpdatePluginsOneMultiVersion(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
+    void testUpdatePluginsOneMultiVersion() throws Exception {
         TestUtils.assumeWorkingJMockit();
 
         final String quxNewerServePath = "/qux/newer.jar";
-        final Map<String, String> attrOverrides = new HashMap<String, String>() {{
+        final Map<String, String> attrOverrides = new HashMap<>() {{
             put("7500_Plugin-Url", "432;" + pluginServerRule.url(quxNewerServePath));
             put("7499_Plugin-Url", "346;" + pluginServerRule.url("/not/served.jar"));
@@ -104 +104 @@
             new PluginServer.RemotePlugin(this.referenceQuxJarNewest, attrOverrides)
         );
+        final WireMockRuntimeInfo wireMockRuntimeInfo = pluginServerRule.getRuntimeInfo();
         pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         // need to actually serve this older jar from somewhere
@@ -158 +159 @@
     @AssumeRevision("Revision: 7000\n")
     @Test
-    void testUpdatePluginsExistingVersionLatestPossible(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
+    void testUpdatePluginsExistingVersionLatestPossible() throws Exception {
         TestUtils.assumeWorkingJMockit();
 
-        final Map<String, String> attrOverrides = new HashMap<String, String>() {{
+        final Map<String, String> attrOverrides = new HashMap<>() {{
             put("7500_Plugin-Url", "432;" + pluginServerRule.url("/dont.jar"));
             put("7499_Plugin-Url", "346;" + pluginServerRule.url("/even.jar"));
@@ -170 +171 @@
             new PluginServer.RemotePlugin(this.referenceQuxJarNewest, attrOverrides)
         );
-        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
+        pluginServer.applyToWireMockServer(pluginServerRule.getRuntimeInfo());
         Config.getPref().putList("plugins", Arrays.asList("qux_plugin", "baz_plugin"));