Changeset 18694 in josm for trunk

Timestamp:

2023-03-16T22:09:01+01:00 (13 months ago)

Author:

taylor.smock

Message:

Fix #22381: Try to automatically install newly required plugins on plugin update

This additionally updates the plugin tests to JUnit 5 (see #16567). Some tests
required fixing (for example, MinimapDialogTest fails if the system of
measurement is metric).

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (modified) (2 diffs)
• test/data/META-INF/services/org.junit.jupiter.api.extension.Extension (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java (modified) (46 diffs)
• test/unit/org/openstreetmap/josm/plugins/PluginHandlerJOSMTooOldTest.java (modified) (14 diffs)
• test/unit/org/openstreetmap/josm/plugins/PluginHandlerMultiVersionTest.java (modified) (8 diffs)
• test/unit/org/openstreetmap/josm/testutils/PluginServer.java (modified) (7 diffs)
• test/unit/org/openstreetmap/josm/testutils/annotations/AssertionsInEDT.java (added)
• test/unit/org/openstreetmap/josm/testutils/annotations/AssumeRevision.java (added)
• test/unit/org/openstreetmap/josm/testutils/annotations/BasicPreferences.java (modified) (6 diffs)
• test/unit/org/openstreetmap/josm/testutils/annotations/FullPreferences.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/testutils/annotations/JosmDefaults.java (added)
• test/unit/org/openstreetmap/josm/testutils/annotations/JosmHome.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/testutils/annotations/Logging.java (added)
• test/unit/org/openstreetmap/josm/testutils/annotations/Main.java (added)
• test/unit/org/openstreetmap/josm/testutils/annotations/ThreadSync.java (added)
• test/unit/org/openstreetmap/josm/testutils/annotations/Timezone.java (added)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -18 +18 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -432 +433 @@
                     return;
                 }
+                int toUpdateSize;
+                boolean refreshRequired = false;
+                do {
+                    toUpdateSize = toUpdate.size();
+                    Set<PluginInformation> enabledPlugins = new HashSet<>(PluginHandler.getPlugins());
+                    enabledPlugins.addAll(toUpdate);
+                    Set<PluginInformation> toAdd = new HashSet<>();
+                    for (PluginInformation pi : toUpdate) {
+                        if (!PluginHandler.checkRequiredPluginsPreconditions(null, enabledPlugins, pi, false)) {
+                            // Time to find the missing plugins...
+                            toAdd.addAll(pi.getRequiredPlugins().stream().filter(plugin -> PluginHandler.getPlugin(plugin) == null)
+                                    .map(plugin -> model.getPluginInformation(plugin))
+                                    .collect(Collectors.toSet()));
+                        }
+                    }
+                    toAdd.forEach(plugin -> model.setPluginSelected(plugin.name, true));
+                    refreshRequired |= !toAdd.isEmpty(); // We need to force refresh the checkboxes if we are adding new plugins
+                    toAdd.removeIf(plugin -> !plugin.isUpdateRequired()); // Avoid downloading plugins that already exist
+                    toUpdate.addAll(toAdd);
+                } while (toUpdateSize != toUpdate.size());
+
                 pluginDownloadTask.setPluginsToDownload(toUpdate);
                 MainApplication.worker.submit(pluginDownloadTask);
                 MainApplication.worker.submit(pluginDownloadContinuation);
+                if (refreshRequired) {
+                    // Needed since we need to recreate the checkboxes to show the enabled dependent plugins that were not previously enabled
+                    pnlPluginPreferences.resetDisplayedComponents();
+                }
+                GuiHelper.runInEDT(pnlPluginPreferences::refreshView);
             };
 

trunk/test/data/META-INF/services/org.junit.jupiter.api.extension.Extension

@@ +1 @@
+# These are the default extensions to run (all tests with JOSMTestRules would have done these by default)
+org.openstreetmap.josm.testutils.annotations.BasicPreferences$BasicPreferencesExtension
 org.openstreetmap.josm.testutils.annotations.HTTP$HTTPExtension
+org.openstreetmap.josm.testutils.annotations.I18n$I18nExtension
+org.openstreetmap.josm.testutils.annotations.JosmDefaults$DefaultsExtension
 org.openstreetmap.josm.testutils.annotations.LayerManager$LayerManagerExtension
+org.openstreetmap.josm.testutils.annotations.Logging$LoggingExtension
+org.openstreetmap.josm.testutils.annotations.Timezone$TimezoneExtension

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

@@ -30 +30 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.awaitility.Awaitility;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -35 +36 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
@@ -63 +65 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules josmTestRules = new JOSMTestRules().main().projection().fakeImagery();
+
+    @Before
+    public void beforeAll() {
+        // Needed since testShowDownloadedAreaLayerSwitching expects the measurement to be imperial
+        SystemOfMeasurement.setSystemOfMeasurement(SystemOfMeasurement.IMPERIAL);
+    }
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java

@@ -19 +19 @@
 import javax.swing.JOptionPane;
 
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import mockit.MockUp;
 import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Preferences;
@@ -32 +36 @@
 import org.openstreetmap.josm.plugins.PluginProxy;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.PluginServer;
+import org.openstreetmap.josm.testutils.annotations.AssertionsInEDT;
+import org.openstreetmap.josm.testutils.annotations.AssumeRevision;
+import org.openstreetmap.josm.testutils.annotations.FullPreferences;
+import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.mockers.HelpAwareOptionPaneMocker;
 import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
-
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import mockit.MockUp;
 
 /**
  * Higher level tests of {@link PluginPreference} class.
  */
-public class PluginPreferenceHighLevelTest {
-    /**
-     * Setup test.
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().assumeRevision(
-        "Revision: 10000\n"
-    ).preferences().main().assertionsInEDT();
-
+@AssumeRevision("Revision: 10000\n")
+@AssertionsInEDT
+@FullPreferences
+@Main
+class PluginPreferenceHighLevelTest {
     /**
      * Plugin server mock.
      */
-    @Rule
-    public WireMockRule pluginServerRule = new WireMockRule(
-        options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())
-    );
+    @RegisterExtension
+    static WireMockExtension pluginServerRule = WireMockExtension.newInstance()
+            .options(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot()))
+            .build();
 
     /**
@@ -68 +64 @@
      * @throws ReflectiveOperationException never
      */
-    @Before
+    @BeforeEach
     public void setUp() throws ReflectiveOperationException {
 
@@ -88 +84 @@
         Config.getPref().put("pluginmanager.lastupdate", "999");
         Config.getPref().putList("pluginmanager.sites",
-            Collections.singletonList(this.pluginServerRule.url("/plugins"))
+            Collections.singletonList(pluginServerRule.url("/plugins"))
         );
 
@@ -107 +103 @@
      * @throws ReflectiveOperationException never
      */
-    @After
+    @AfterEach
     public void tearDown() throws ReflectiveOperationException {
         // restore actual PluginHandler#pluginList
@@ -136 +132 @@
      */
     @Test
-    public void testInstallWithoutUpdate() throws Exception {
+    void testInstallWithoutUpdate(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
         final PluginServer pluginServer = new PluginServer(
             new PluginServer.RemotePlugin(this.referenceDummyJarNew),
@@ -142 +138 @@
             new PluginServer.RemotePlugin(null, Collections.singletonMap("Plugin-Version", "2"), "irrelevant_plugin")
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Collections.singletonList("dummy_plugin"));
 
@@ -169 +165 @@
         Awaitility.await().atMost(2000, MILLISECONDS).until(() -> Config.getPref().getInt("pluginmanager.version", 999) != 999);
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        WireMock.resetAllRequests();
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.resetRequests();
 
         final PluginPreferencesModel model = (PluginPreferencesModel) TestUtils.getPrivateField(
@@ -183 +179 @@
         assertEquals(model.getDisplayedPlugins(), model.getAvailablePlugins());
 
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
-            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertEquals(
-            Collections.singletonList("dummy_plugin"),
-            model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("(null)", "31701", "(null)"),
-            model.getAvailablePlugins().stream().map(
-                (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("6", "31772", "2"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
+                model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList()));
+        assertEquals(Collections.singletonList("dummy_plugin"),
+                model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("(null)", "31701", "(null)"), model.getAvailablePlugins().stream().map(
+            (pi) -> pi.localversion == null ? "(null)" : pi.localversion
+        ).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("6", "31772", "2"),
+                model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList()));
 
         // now we're going to choose to install baz_plugin
         model.setPluginSelected("baz_plugin", true);
 
-        assertEquals(
-            Collections.singletonList("baz_plugin"),
-            model.getNewlyActivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
-        assertEquals(
-            Collections.singletonList("baz_plugin"),
-            model.getPluginsScheduledForUpdateOrDownload().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Collections.singletonList("baz_plugin"),
+                model.getNewlyActivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList()));
+        assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
+        assertEquals(Collections.singletonList("baz_plugin"),
+                model.getPluginsScheduledForUpdateOrDownload().stream().map(PluginInformation::getName).collect(Collectors.toList()));
 
         tabbedPane.savePreferences();
@@ -233 +216 @@
         assertFalse(targetBazJarNew.exists());
 
-        // the advertized version of dummy_plugin shouldn't have been fetched
-        this.pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
+        // the advertised version of dummy_plugin shouldn't have been fetched
+        pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
         // but the advertized version of baz_plugin *should* have
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v6.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v6.jar")));
 
         // pluginmanager.version has been set to the current version
@@ -246 +229 @@
 
         // baz_plugin should have been added to the plugins list
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin"),
-            Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"),
+                Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList()));
     }
 
@@ -257 +238 @@
      */
     @Test
-    public void testDisablePluginWithUpdatesAvailable() throws Exception {
+    void testDisablePluginWithUpdatesAvailable(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
         final PluginServer pluginServer = new PluginServer(
             new PluginServer.RemotePlugin(this.referenceDummyJarNew),
@@ -263 +244 @@
             new PluginServer.RemotePlugin(null, null, "irrelevant_plugin")
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
 
@@ -289 +270 @@
         Awaitility.await().atMost(2000, MILLISECONDS).until(() -> Config.getPref().getInt("pluginmanager.version", 999) != 999);
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        WireMock.resetAllRequests();
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.resetRequests();
 
         final PluginPreferencesModel model = (PluginPreferencesModel) TestUtils.getPrivateField(
@@ -303 +284 @@
         assertEquals(model.getDisplayedPlugins(), model.getAvailablePlugins());
 
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
-            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin"),
-            model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("6", "31701", "(null)"),
-            model.getAvailablePlugins().stream().map(
-                (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("7", "31772", "(null)"),
-            model.getAvailablePlugins().stream().map(
-                (pi) -> pi.version == null ? "(null)" : pi.version
-            ).collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
+                model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"),
+                model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("6", "31701", "(null)"), model.getAvailablePlugins().stream().map(
+            (pi) -> pi.localversion == null ? "(null)" : pi.localversion
+        ).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("7", "31772", "(null)"), model.getAvailablePlugins().stream().map(
+            (pi) -> pi.version == null ? "(null)" : pi.version
+        ).collect(Collectors.toList()));
 
         // now we're going to choose to disable baz_plugin
@@ -328 +299 @@
 
         assertTrue(model.getNewlyActivatedPlugins().isEmpty());
-        assertEquals(
-            Collections.singletonList("baz_plugin"),
-            model.getNewlyDeactivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Collections.singletonList("baz_plugin"),
+                model.getNewlyDeactivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList()));
         // questionably correct
         assertTrue(model.getPluginsScheduledForUpdateOrDownload().isEmpty());
@@ -354 +323 @@
 
         // neither of the new jars have been fetched
-        this.pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
-        this.pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v6.jar")));
+        pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
+        pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v6.jar")));
 
         // pluginmanager.version has been set to the current version
@@ -365 +334 @@
 
         // baz_plugin should have been removed from the installed plugins list
-        assertEquals(
-            Collections.singletonList("dummy_plugin"),
-            Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList())
-        );
+        assertEquals(Collections.singletonList("dummy_plugin"),
+                Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList()));
     }
 
@@ -379 +346 @@
      */
     @Test
-    public void testUpdateOnlySelectedPlugin() throws Exception {
+    void testUpdateOnlySelectedPlugin(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
         TestUtils.assumeWorkingJMockit();
         final PluginServer pluginServer = new PluginServer(
@@ -385 +352 @@
             new PluginServer.RemotePlugin(this.referenceBazJarNew)
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
 
@@ -406 +373 @@
         TestUtils.syncEDTAndWorkerThreads();
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        WireMock.resetAllRequests();
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.resetRequests();
 
         final PluginPreferencesModel model = (PluginPreferencesModel) TestUtils.getPrivateField(
@@ -420 +387 @@
         assertEquals(model.getDisplayedPlugins(), model.getAvailablePlugins());
 
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin"),
-            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin"),
-            model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("6", "31701"),
-            model.getAvailablePlugins().stream().map(
-                (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("7", "31772"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"),
+                model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"),
+                model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("6", "31701"), model.getAvailablePlugins().stream().map(
+            (pi) -> pi.localversion == null ? "(null)" : pi.localversion
+        ).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("7", "31772"), model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList()));
 
         // now we're going to choose not to update baz_plugin
@@ -443 +400 @@
 
         assertTrue(model.getNewlyActivatedPlugins().isEmpty());
-        assertEquals(
-            Collections.singletonList("baz_plugin"),
-            model.getNewlyDeactivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Collections.singletonList("baz_plugin"), model.getNewlyDeactivatedPlugins().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
         // questionably correct
         assertTrue(model.getPluginsScheduledForUpdateOrDownload().isEmpty());
@@ -481 +436 @@
         // the plugin list was rechecked
         // questionably necessary
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
         // dummy_plugin has been fetched
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
         // baz_plugin has not
-        this.pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
-        WireMock.resetAllRequests();
+        pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
+        pluginServerRule.resetRequests();
 
         // pluginmanager.version has been set to the current version
@@ -496 +451 @@
 
         // plugins list shouldn't have been altered, we haven't hit save yet
-        assertEquals(
-                Arrays.asList("baz_plugin", "dummy_plugin"),
-            Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"),
+                Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList()));
 
         // the model's selection state should be largely as before
         assertTrue(model.getNewlyActivatedPlugins().isEmpty());
-        assertEquals(
-            Collections.singletonList("baz_plugin"),
-            model.getNewlyDeactivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Collections.singletonList("baz_plugin"), model.getNewlyDeactivatedPlugins().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
         assertTrue(model.getPluginsScheduledForUpdateOrDownload().isEmpty());
 
@@ -516 +467 @@
         assertTrue(model.getNewlyActivatedPlugins().isEmpty());
         assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
-        assertEquals(
-            Collections.singletonList("baz_plugin"),
-            model.getPluginsScheduledForUpdateOrDownload().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Collections.singletonList("baz_plugin"), model.getPluginsScheduledForUpdateOrDownload().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
 
         // prepare jopsMocker to handle this message
@@ -552 +501 @@
 
         // dummy_plugin was not fetched
-        this.pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
+        pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
         // baz_plugin however was fetched
         // questionably correct
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
 
         assertEquals(10000, Config.getPref().getInt("pluginmanager.version", 111));
@@ -567 +516 @@
      */
     @Test
-    public void testUpdateWithNoAvailableUpdates() throws Exception {
+    void testUpdateWithNoAvailableUpdates(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
         TestUtils.assumeWorkingJMockit();
         final PluginServer pluginServer = new PluginServer(
@@ -574 +523 @@
             new PluginServer.RemotePlugin(null, Collections.singletonMap("Plugin-Version", "123"), "irrelevant_plugin")
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
 
@@ -600 +549 @@
         TestUtils.syncEDTAndWorkerThreads();
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        WireMock.resetAllRequests();
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.resetRequests();
 
         final PluginPreferencesModel model = (PluginPreferencesModel) TestUtils.getPrivateField(
@@ -613 +562 @@
         assertEquals(model.getDisplayedPlugins(), model.getAvailablePlugins());
 
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
-            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin"),
-            model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("6", "31701", "(null)"),
-            model.getAvailablePlugins().stream().map(
-                (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("6", "31701", "123"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"), model.getAvailablePlugins().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"), model.getSelectedPlugins().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("6", "31701", "(null)"), model.getAvailablePlugins().stream().map(
+            (pi) -> pi.localversion == null ? "(null)" : pi.localversion
+        ).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("6", "31701", "123"), model.getAvailablePlugins()
+                .stream().map((pi) -> pi.version).collect(Collectors.toList()));
 
         GuiHelper.runInEDTAndWait(
@@ -654 +594 @@
         // the plugin list was rechecked
         // questionably necessary
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
         // that should have been the only request to our PluginServer
-        assertEquals(1, this.pluginServerRule.getAllServeEvents().size());
-        WireMock.resetAllRequests();
+        assertEquals(1, pluginServerRule.getAllServeEvents().size());
+        pluginServerRule.resetRequests();
 
         // pluginmanager.version has been set to the current version
@@ -666 +606 @@
 
         // plugins list shouldn't have been altered
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin"),
-            Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"), Config.getPref().getList("plugins", null)
+                .stream().sorted().collect(Collectors.toList()));
 
         // the model's selection state should be largely as before
@@ -692 +630 @@
 
         // none of PluginServer's URLs should have been touched
-        assertEquals(0, this.pluginServerRule.getAllServeEvents().size());
+        assertEquals(0, pluginServerRule.getAllServeEvents().size());
 
         // pluginmanager.version has been set to the current version
@@ -706 +644 @@
      */
     @Test
-    public void testInstallWithoutRestartRequired() throws Exception {
+    void testInstallWithoutRestartRequired(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
         TestUtils.assumeWorkingJMockit();
         final boolean[] loadPluginsCalled = new boolean[] {false};
@@ -727 +665 @@
             new PluginServer.RemotePlugin(this.referenceBazJarNew)
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Collections.emptyList());
 
@@ -749 +687 @@
         TestUtils.syncEDTAndWorkerThreads();
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        WireMock.resetAllRequests();
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.resetRequests();
 
         final PluginPreferencesModel model = (PluginPreferencesModel) TestUtils.getPrivateField(
@@ -762 +700 @@
         assertEquals(model.getDisplayedPlugins(), model.getAvailablePlugins());
 
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin"),
-            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"), model.getAvailablePlugins().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
         assertTrue(model.getSelectedPlugins().isEmpty());
-        assertEquals(
-            Arrays.asList("(null)", "(null)"),
-            model.getAvailablePlugins().stream().map(
-                (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("7", "31772"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("(null)", "(null)"), model.getAvailablePlugins().stream().map(
+            (pi) -> pi.localversion == null ? "(null)" : pi.localversion
+        ).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("7", "31772"), model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList()));
 
         // now we select dummy_plugin
@@ -782 +712 @@
 
         // model should now reflect this
-        assertEquals(
-            Collections.singletonList("dummy_plugin"),
-            model.getNewlyActivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Collections.singletonList("dummy_plugin"), model.getNewlyActivatedPlugins().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
         assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
 
@@ -804 +732 @@
 
         // dummy_plugin was fetched
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
 
         // the dummy_plugin jar has been installed
@@ -826 +754 @@
      * @throws Exception on failure
      */
-    @JOSMTestRules.OverrideAssumeRevision("Revision: 7000\n")
+    @AssumeRevision("Revision: 7000\n")
     @Test
-    public void testInstallMultiVersion() throws Exception {
+    void testInstallMultiVersion(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
         TestUtils.assumeWorkingJMockit();
 
@@ -835 +763 @@
             new PluginServer.RemotePlugin(this.referenceDummyJarNew),
             new PluginServer.RemotePlugin(this.referenceBazJarNew, Collections.singletonMap(
-                "6800_Plugin-Url", "6;" + this.pluginServerRule.url(bazOldServePath)
+                "6800_Plugin-Url", "6;" + pluginServerRule.url(bazOldServePath)
             ))
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         // need to actually serve this older jar from somewhere
-        this.pluginServerRule.stubFor(
+        pluginServerRule.stubFor(
             WireMock.get(WireMock.urlEqualTo(bazOldServePath)).willReturn(
                 WireMock.aResponse().withStatus(200).withHeader("Content-Type", "application/java-archive").withBodyFile(
@@ -870 +798 @@
         TestUtils.syncEDTAndWorkerThreads();
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        WireMock.resetAllRequests();
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.resetRequests();
 
         final PluginPreferencesModel model = (PluginPreferencesModel) TestUtils.getPrivateField(
@@ -883 +811 @@
         assertEquals(model.getDisplayedPlugins(), model.getAvailablePlugins());
 
-        assertEquals(
-            Arrays.asList("baz_plugin", "dummy_plugin"),
-            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("baz_plugin", "dummy_plugin"), model.getAvailablePlugins().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
         assertTrue(model.getSelectedPlugins().isEmpty());
-        assertEquals(
-            Arrays.asList("(null)", "(null)"),
-            model.getAvailablePlugins().stream().map(
-                (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(Collectors.toList())
-        );
-        assertEquals(
-            Arrays.asList("6", "31772"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
-        );
+        assertEquals(Arrays.asList("(null)", "(null)"), model.getAvailablePlugins().stream().map(
+            (pi) -> pi.localversion == null ? "(null)" : pi.localversion
+        ).collect(Collectors.toList()));
+        assertEquals(Arrays.asList("6", "31772"), model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList()));
 
         // now we select dummy_plugin
@@ -903 +823 @@
 
         // model should now reflect this
-        assertEquals(
-            Collections.singletonList("baz_plugin"),
-            model.getNewlyActivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
-        );
+        assertEquals(Collections.singletonList("baz_plugin"), model.getNewlyActivatedPlugins().stream()
+                .map(PluginInformation::getName).collect(Collectors.toList()));
         assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
 
@@ -925 +843 @@
 
         // dummy_plugin was fetched
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo(bazOldServePath)));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo(bazOldServePath)));
 
         // the "old" baz_plugin jar has been installed

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

@@ -18 +18 @@
 import java.util.stream.Collectors;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Preferences;
@@ -27 +31 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.PluginServer;
+import org.openstreetmap.josm.testutils.annotations.AssumeRevision;
+import org.openstreetmap.josm.testutils.annotations.FullPreferences;
 import org.openstreetmap.josm.testutils.mockers.ExtendedDialogMocker;
 import org.openstreetmap.josm.testutils.mockers.HelpAwareOptionPaneMocker;
-
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Test parts of {@link PluginHandler} class when the reported JOSM version is too old for the plugin.
  */
-public class PluginHandlerJOSMTooOldTest {
+@AssumeRevision("Revision: 6000\n")
+@FullPreferences
+class PluginHandlerJOSMTooOldTest {
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().main().assumeRevision(
-        "Revision: 6000\n"
-    );
+    static JOSMTestRules test = new JOSMTestRules().main();
 
     /**
      * Plugin server mock.
      */
-    @Rule
-    public WireMockRule pluginServerRule = new WireMockRule(
+    @RegisterExtension
+    static WireMockExtension pluginServerRule = WireMockExtension.newInstance().options(
         options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())
-    );
+    ).build();
 
     /**
      * Setup test.
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         Config.getPref().putInt("pluginmanager.version", 999);
         Config.getPref().put("pluginmanager.lastupdate", "999");
         Config.getPref().putList("pluginmanager.sites",
-                Collections.singletonList(this.pluginServerRule.url("/plugins"))
+                Collections.singletonList(pluginServerRule.url("/plugins"))
         );
 
@@ -115 +116 @@
      */
     @Test
-    public void testUpdatePluginsDownloadBoth() throws IOException {
+    void testUpdatePluginsDownloadBoth(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
         TestUtils.assumeWorkingJMockit();
         final PluginServer pluginServer = new PluginServer(
@@ -121 +122 @@
             new PluginServer.RemotePlugin(this.referenceBazJarNew)
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Arrays.asList("dummy_plugin", "baz_plugin"));
 
@@ -162 +163 @@
         TestUtils.assertFileContentsEqual(this.referenceBazJarNew, this.targetBazJar);
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
 
         assertEquals(Config.getPref().getInt("pluginmanager.version", 111), 6000);
@@ -177 +178 @@
      */
     @Test
-    public void testUpdatePluginsSkipOne() throws IOException {
+    void testUpdatePluginsSkipOne(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
         TestUtils.assumeWorkingJMockit();
         final PluginServer pluginServer = new PluginServer(
@@ -183 +184 @@
             new PluginServer.RemotePlugin(this.referenceBazJarNew)
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Arrays.asList("dummy_plugin", "baz_plugin"));
 
@@ -232 +233 @@
         TestUtils.assertFileContentsEqual(this.referenceBazJarNew, this.targetBazJar);
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        this.pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
 
         // shouldn't have been updated
@@ -249 +250 @@
      */
     @Test
-    public void testUpdatePluginsUnexpectedlyJOSMTooOld() throws IOException {
+    void testUpdatePluginsUnexpectedlyJOSMTooOld(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
         TestUtils.assumeWorkingJMockit();
         final PluginServer pluginServer = new PluginServer(
@@ -255 +256 @@
             new PluginServer.RemotePlugin(this.referenceBazJarNew, Collections.singletonMap("Plugin-Mainversion", "5500"))
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Collections.singletonList("baz_plugin"));
 
@@ -283 +284 @@
         TestUtils.assertFileContentsEqual(this.referenceBazJarNew, this.targetBazJar);
 
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        // questionably correct
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        // questionably correct
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar")));
 
         // should have been updated
@@ -303 +304 @@
      */
     @Test
-    @JOSMTestRules.OverrideAssumeRevision("Revision: 7200\n")
-    public void testUpdatePluginsMultiVersionInsufficient() throws IOException {
+    @AssumeRevision("Revision: 7200\n")
+    void testUpdatePluginsMultiVersionInsufficient(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
         TestUtils.assumeWorkingJMockit();
 
@@ -310 +311 @@
             new PluginServer.RemotePlugin(this.referenceBazJarOld),
             new PluginServer.RemotePlugin(this.referenceQuxJarNewer, Collections.singletonMap(
-                "7499_Plugin-Url", "346;" + this.pluginServerRule.url("/dont/bother.jar")
+                "7499_Plugin-Url", "346;" + pluginServerRule.url("/dont/bother.jar")
             ))
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Arrays.asList("qux_plugin", "baz_plugin"));
 
@@ -343 +344 @@
         TestUtils.assertFileContentsEqual(this.referenceQuxJarNewer, this.targetQuxJar);
 
-        assertEquals(2, WireMock.getAllServeEvents().size());
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        // questionably correct
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/qux_plugin.v432.jar")));
+        assertEquals(2, pluginServerRule.getAllServeEvents().size());
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        // questionably correct
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/qux_plugin.v432.jar")));
 
         assertEquals(7200, Config.getPref().getInt("pluginmanager.version", 111));

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

@@ -17 +17 @@
 import java.util.stream.Collectors;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Preferences;
@@ -26 +30 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.PluginServer;
+import org.openstreetmap.josm.testutils.annotations.AssumeRevision;
+import org.openstreetmap.josm.testutils.annotations.FullPreferences;
 import org.openstreetmap.josm.testutils.mockers.ExtendedDialogMocker;
-
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Test parts of {@link PluginHandler} class with plugins that advertise multiple versions for compatibility.
  */
-public class PluginHandlerMultiVersionTest {
+@FullPreferences
+class PluginHandlerMultiVersionTest {
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().main();
+    static JOSMTestRules test = new JOSMTestRules().main();
 
     /**
      * Plugin server mock.
      */
-    @Rule
-    public WireMockRule pluginServerRule = new WireMockRule(
-        options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())
-    );
+    @RegisterExtension
+    static WireMockExtension pluginServerRule = WireMockExtension.newInstance()
+            .options(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())).build();
 
     /**
      * Setup test.
      */
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         Config.getPref().putInt("pluginmanager.version", 999);
         Config.getPref().put("pluginmanager.lastupdate", "999");
         Config.getPref().putList("pluginmanager.sites",
-                Collections.singletonList(this.pluginServerRule.url("/plugins"))
+                Collections.singletonList(pluginServerRule.url("/plugins"))
         );
 
@@ -94 +95 @@
      * @throws Exception on failure
      */
-    @JOSMTestRules.OverrideAssumeRevision("Revision: 7501\n")
+    @AssumeRevision("Revision: 7501\n")
     @Test
-    public void testUpdatePluginsOneMultiVersion() throws Exception {
+    void testUpdatePluginsOneMultiVersion(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
         TestUtils.assumeWorkingJMockit();
 
@@ -109 +110 @@
             new PluginServer.RemotePlugin(this.referenceQuxJarNewest, attrOverrides)
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         // need to actually serve this older jar from somewhere
-        this.pluginServerRule.stubFor(
+        wireMockRuntimeInfo.getWireMock().register(
             WireMock.get(WireMock.urlEqualTo(quxNewerServePath)).willReturn(
                 WireMock.aResponse().withStatus(200).withHeader("Content-Type", "application/java-archive").withBodyFile(
@@ -147 +148 @@
         TestUtils.assertFileContentsEqual(this.referenceQuxJarNewer, this.targetQuxJar);
 
-        assertEquals(2, WireMock.getAllServeEvents().size());
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo(quxNewerServePath)));
+        assertEquals(2, pluginServerRule.getAllServeEvents().size());
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo(quxNewerServePath)));
 
         assertEquals(7501, Config.getPref().getInt("pluginmanager.version", 111));
@@ -161 +162 @@
      * @throws Exception on failure
      */
-    @JOSMTestRules.OverrideAssumeRevision("Revision: 7000\n")
+    @AssumeRevision("Revision: 7000\n")
     @Test
-    public void testUpdatePluginsExistingVersionLatestPossible() throws Exception {
+    void testUpdatePluginsExistingVersionLatestPossible(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
         TestUtils.assumeWorkingJMockit();
 
@@ -175 +176 @@
             new PluginServer.RemotePlugin(this.referenceQuxJarNewest, attrOverrides)
         );
-        pluginServer.applyToWireMockServer(this.pluginServerRule);
+        pluginServer.applyToWireMockServer(wireMockRuntimeInfo);
         Config.getPref().putList("plugins", Arrays.asList("qux_plugin", "baz_plugin"));
 
@@ -207 +208 @@
 
         // only the plugins list should have been downloaded
-        assertEquals(1, WireMock.getAllServeEvents().size());
-        this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
+        assertEquals(1, pluginServerRule.getAllServeEvents().size());
+        pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins")));
 
         assertEquals(7000, Config.getPref().getInt("pluginmanager.version", 111));

trunk/test/unit/org/openstreetmap/josm/testutils/PluginServer.java

@@ -16 +16 @@
 import java.util.stream.StreamSupport;
 
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.tools.Logging;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.MappingBuilder;
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.Options;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.tools.Logging;
 
 public class PluginServer {
@@ -138 +135 @@
         }
 
-        public String getPluginURL(WireMockServer wireMockServer) {
+        public String getPluginURL(WireMockRuntimeInfo wireMock) {
             if (this.pluginURL != null) {
                 return this.pluginURL;
-            } else if (wireMockServer != null && this.getJarPathBeneathFilesDir() != null) {
-                return wireMockServer.url(this.getPluginURLPath());
+            } else if (wireMock != null && this.getJarPathBeneathFilesDir() != null) {
+                return wireMock.getHttpBaseUrl() + this.getPluginURLPath();
             }
             return "http://example.com" + this.getPluginURLPath();
@@ -156 +153 @@
         }
 
-        public String getRemotePluginsListSection(WireMockServer wireMockServer) {
+        public String getRemotePluginsListSection(WireMockRuntimeInfo wireMock) {
             return String.format(
                 "%s.jar;%s\n%s",
                 this.getName(),
-                this.getPluginURL(wireMockServer),
+                this.getPluginURL(wireMock),
                 this.getRemotePluginsListManifestSection()
             );
@@ -192 +189 @@
     }
 
-    public void applyToWireMockServer(WireMockServer wireMockServer) {
+    public void applyToWireMockServer(WireMockRuntimeInfo wireMock) {
+        final WireMock wireMockServer = wireMock.getWireMock();
         // first add the plugins list
-        wireMockServer.stubFor(
+        wireMockServer.register(
             WireMock.get(WireMock.urlEqualTo("/plugins")).willReturn(
                 WireMock.aResponse().withStatus(200).withHeader("Content-Type", "text/plain").withBody(
                     this.pluginList.stream().map(
-                        remotePlugin -> remotePlugin.getRemotePluginsListSection(wireMockServer)
+                        remotePlugin -> remotePlugin.getRemotePluginsListSection(wireMock)
                     ).collect(Collectors.joining())
                 )
@@ -210 +208 @@
 
             if (mappingBuilder != null && responseDefinitionBuilder != null) {
-                wireMockServer.stubFor(
+                wireMockServer.register(
                     remotePlugin.getMappingBuilder().willReturn(remotePlugin.getResponseDefinitionBuilder())
                 );
@@ -228 +226 @@
     }
 
-    public class PluginServerRule extends WireMockRule {
+    public class PluginServerRule extends WireMockExtension {
         public PluginServerRule(Options ruleOptions, boolean failOnUnmatchedRequests) {
-            super(ruleOptions, failOnUnmatchedRequests);
+            super(extensionOptions().options(ruleOptions).failOnUnmatchedRequests(failOnUnmatchedRequests));
         }
 
@@ -238 +236 @@
 
         @Override
-        public Statement apply(Statement base, Description description) {
-            return super.apply(new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    PluginServer.this.applyToWireMockServer(PluginServerRule.this);
-                    base.evaluate();
-                }
-            }, description);
+        protected void onBeforeEach(WireMockRuntimeInfo wireMockRuntimeInfo) {
+            PluginServer.this.applyToWireMockServer(wireMockRuntimeInfo);
         }
     }

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/BasicPreferences.java

@@ -4 +4 @@
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.Map;
 
 import org.junit.jupiter.api.extension.AfterAllCallback;
@@ -15 +17 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.platform.commons.support.AnnotationSupport;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.data.preferences.JosmUrls;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -32 +37 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
+@Inherited
 @ExtendWith(BasicPreferences.BasicPreferencesExtension.class)
 public @interface BasicPreferences {
@@ -47 +53 @@
         @Override
         public void afterEach(ExtensionContext context) throws Exception {
-            if (context.getElement().isPresent() && context.getElement().get().isAnnotationPresent(BasicPreferences.class)) {
+            if (AnnotationSupport.isAnnotated(context.getElement(), BasicPreferences.class)) {
                 this.afterAll(context);
             }
@@ -57 +63 @@
             // Disable saving on put, just to avoid overwriting pref files
             pref.enableSaveOnPut(false);
-            pref.resetToDefault();
+            pref.resetToInitialState();
+            pref.enableSaveOnPut(false);
+            @SuppressWarnings("unchecked")
+            final Map<String, Setting<?>> defaultsMap = (Map<String, Setting<?>>) TestUtils.getPrivateField(pref, "defaultsMap");
+            defaultsMap.clear();
             Config.setPreferencesInstance(pref);
             Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
@@ -70 +80 @@
         @Override
         public void beforeEach(ExtensionContext context) throws Exception {
-            if (AnnotationUtils.elementIsAnnotated(context.getElement(), BasicPreferences.class) || Config.getPref() == null) {
+            if (AnnotationSupport.isAnnotated(context.getElement(), BasicPreferences.class) || Config.getPref() == null) {
                 this.beforeAll(context);
             }

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/FullPreferences.java

@@ -7 +7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.Map;
 
-import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
-import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences.BasicPreferencesExtension;
@@ -37 +34 @@
      * Initialize preferences.
      */
-    class UsePreferencesExtension implements BeforeAllCallback, BeforeEachCallback {
+    class UsePreferencesExtension implements BeforeEachCallback {
         @Override
-        public void beforeAll(ExtensionContext context) throws Exception {
+        public void beforeEach(ExtensionContext context) throws Exception {
             Preferences pref = context.getStore(Namespace.create(BasicPreferencesExtension.class)).get("preferences", Preferences.class);
-            @SuppressWarnings("unchecked")
-            final Map<String, Setting<?>> defaultsMap = (Map<String, Setting<?>>) TestUtils.getPrivateField(pref, "defaultsMap");
-            defaultsMap.clear();
+            if (pref.getDirs() instanceof JosmBaseDirectories) {
+                ((JosmBaseDirectories) pref.getDirs()).clearMemos();
+            }
+            pref.enableSaveOnPut(false);
             pref.resetToInitialState();
             pref.enableSaveOnPut(false);
@@ -50 +48 @@
             Config.getPref().put("osm-server.url", "http://invalid");
         }
-
-        @Override
-        public void beforeEach(ExtensionContext context) throws Exception {
-            if (AnnotationUtils.elementIsAnnotated(context.getElement(), FullPreferences.class)) {
-                this.beforeAll(context);
-            }
-        }
     }
 }

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java

@@ -7 +7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.Locale;
 
 import org.junit.jupiter.api.extension.AfterEachCallback;
@@ -13 +14 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.support.AnnotationSupport;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 /**
@@ -41 +43 @@
         public void beforeEach(ExtensionContext context) {
             String language = AnnotationSupport.findAnnotation(context.getElement(), I18n.class).map(I18n::value).orElse("en");
-            org.openstreetmap.josm.tools.I18n.set(language);
+            if (!Locale.getDefault().equals(LanguageInfo.getLocale(language, false))) {
+                org.openstreetmap.josm.tools.I18n.set(language);
+            }
         }
 
         @Override
         public void afterEach(ExtensionContext context) {
-            org.openstreetmap.josm.tools.I18n.set("en");
-            org.openstreetmap.josm.tools.I18n.set(org.openstreetmap.josm.tools.I18n.getOriginalLocale().getLanguage());
+            if (!Locale.ENGLISH.equals(Locale.getDefault())) {
+                org.openstreetmap.josm.tools.I18n.set("en");
+                org.openstreetmap.josm.tools.I18n.set(org.openstreetmap.josm.tools.I18n.getOriginalLocale().getLanguage());
+                Locale.setDefault(Locale.ENGLISH);
+            }
         }
     }

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/JosmHome.java

@@ -16 +16 @@
 import java.util.UUID;
 
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -40 +40 @@
      * @author Taylor Smock
      */
-    class JosmHomeExtension implements BeforeAllCallback, AfterAllCallback {
+    class JosmHomeExtension implements BeforeEachCallback, AfterEachCallback {
         @Override
-        public void afterAll(ExtensionContext context) throws Exception {
+        public void afterEach(ExtensionContext context) throws Exception {
             Path tempDir = context.getStore(Namespace.create(JosmHome.class)).get("home", Path.class);
             Files.walkFileTree(tempDir, new SimpleFileVisitor<Path>() {
@@ -57 +57 @@
                 }
             });
+            System.clearProperty("josm.home");
         }
 
         @Override
-        public void beforeAll(ExtensionContext context) throws Exception {
+        public void beforeEach(ExtensionContext context) throws Exception {
             Path tempDir = Files.createTempDirectory(UUID.randomUUID().toString());
             context.getStore(Namespace.create(JosmHome.class)).put("home", tempDir);