Index: trunk/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java	(revision 17120)
+++ trunk/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java	(revision 17121)
@@ -2,6 +2,6 @@
 package org.openstreetmap.josm.gui.help;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Collections;
@@ -9,6 +9,6 @@
 import javax.swing.JOptionPane;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -21,9 +21,10 @@
 import mockit.Expectations;
 import mockit.Injectable;
+import mockit.Mocked;
 
 /**
  * Unit tests of {@link HelpBrowser} class.
  */
-public class HelpBrowserTest {
+class HelpBrowserTest {
 
     static final String URL_1 = "https://josm.openstreetmap.de/wiki/Help";
@@ -34,7 +35,7 @@
      * Setup tests
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().https();
+    static JOSMTestRules test = new JOSMTestRules().preferences().https();
 
     static IHelpBrowser newHelpBrowser() {
@@ -76,5 +77,5 @@
      */
     @Test
-    public void testBackAndForwardActions() {
+    void testBackAndForwardActions() {
         IHelpBrowser browser = newHelpBrowser();
         browser.openUrl(URL_1);
@@ -92,5 +93,5 @@
      */
     @Test
-    public void testHomeAction() {
+    void testHomeAction() {
         IHelpBrowser browser = newHelpBrowser();
         assertNull(browser.getUrl());
@@ -102,13 +103,12 @@
      * Unit test of {@link HelpBrowser.EditAction} class handling a null url.
      * @param mockPlatformHook platform hook mock
-     * @throws Exception  in case of error
-     */
-    @Test
-    public void testEditActionNull(@Injectable final PlatformHook mockPlatformHook) throws Exception {
-        TestUtils.assumeWorkingJMockit();
-        new Expectations(PlatformManager.class) {{
+     * @param platformManager {@link PlatformManager} mock
+     * @throws Exception  in case of error
+     */
+    @Test
+    void testEditActionNull(@Injectable final PlatformHook mockPlatformHook, @Mocked final PlatformManager platformManager) throws Exception {
+        TestUtils.assumeWorkingJMockit();
+        new Expectations() {{
             PlatformManager.getPlatform(); result = mockPlatformHook; minTimes = 0;
-        }};
-        new Expectations() {{
             // should not be called
             mockPlatformHook.openUrl((String) any); times = 0;
@@ -123,13 +123,13 @@
      * Unit test of {@link HelpBrowser.EditAction} class handling an "internal" url.
      * @param mockPlatformHook platform hook mock
-     * @throws Exception  in case of error
-     */
-    @Test
-    public void testEditActionInternal(@Injectable final PlatformHook mockPlatformHook) throws Exception {
-        TestUtils.assumeWorkingJMockit();
-        new Expectations(PlatformManager.class) {{
+     * @param platformManager {@link PlatformManager} mock
+     * @throws Exception  in case of error
+     */
+    @Test
+    void testEditActionInternal(@Injectable final PlatformHook mockPlatformHook,
+                                @Mocked final PlatformManager platformManager) throws Exception {
+        TestUtils.assumeWorkingJMockit();
+        new Expectations() {{
             PlatformManager.getPlatform(); result = mockPlatformHook;
-        }};
-        new Expectations() {{
             mockPlatformHook.openUrl(URL_2 + "?action=edit"); result = null; times = 1;
         }};
@@ -144,13 +144,13 @@
      * Unit test of {@link HelpBrowser.EditAction} class handling an "external" url.
      * @param mockPlatformHook platform hook mock
-     * @throws Exception  in case of error
-     */
-    @Test
-    public void testEditActionExternal(@Injectable final PlatformHook mockPlatformHook) throws Exception {
-        TestUtils.assumeWorkingJMockit();
-        new Expectations(PlatformManager.class) {{
+     * @param platformManager {@link PlatformManager} mock
+     * @throws Exception  in case of error
+     */
+    @Test
+    void testEditActionExternal(@Injectable final PlatformHook mockPlatformHook,
+                                @Mocked final PlatformManager platformManager) throws Exception {
+        TestUtils.assumeWorkingJMockit();
+        new Expectations() {{
             PlatformManager.getPlatform(); result = mockPlatformHook; minTimes = 0;
-        }};
-        new Expectations() {{
             // should not be called
             mockPlatformHook.openUrl((String) any); times = 0;
@@ -178,14 +178,14 @@
     /**
      * Unit test of {@link HelpBrowser.OpenInBrowserAction} class.
-     * @param mockPlatformHook platform hook mock
-     * @throws Exception  in case of error
-     */
-    @Test
-    public void testOpenInBrowserAction(@Injectable final PlatformHook mockPlatformHook) throws Exception {
-        TestUtils.assumeWorkingJMockit();
-        new Expectations(PlatformManager.class) {{
+     * @param mockPlatformHook platform hook moc
+     * @param platformManager {@link PlatformManager} mock
+     * @throws Exception  in case of error
+     */
+    @Test
+    void testOpenInBrowserAction(@Injectable final PlatformHook mockPlatformHook,
+                                 @Mocked final PlatformManager platformManager) throws Exception {
+        TestUtils.assumeWorkingJMockit();
+        new Expectations() {{
             PlatformManager.getPlatform(); result = mockPlatformHook;
-        }};
-        new Expectations() {{
             mockPlatformHook.openUrl(URL_1); result = null; times = 1;
         }};
@@ -201,5 +201,5 @@
      */
     @Test
-    public void testReloadAction() {
+    void testReloadAction() {
         IHelpBrowser browser = newHelpBrowser();
         browser.openUrl(URL_1);