Changeset 17125 in josm for trunk

Timestamp:

2020-10-08T22:32:52+02:00 (4 years ago)

Author:

simon04

Message:

see #18200 - Fix WebMarkerTest after JMockit update

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.markerlayer;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URL;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.PlatformHook;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 import mockit.Expectations;
 import mockit.Injectable;
+import mockit.Mocked;
 
 /**
@@ -28 +30 @@
      * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @RegisterExtension
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().https();
 
     /**
      * Unit test of {@link WebMarker#WebMarker}.
      * @param mockPlatformHook platform hook mock
+     * @param platformManager {@link PlatformManager} mock
      * @throws Exception  in case of error
      */
     @Test
-    public void testWebMarker(@Injectable final PlatformHook mockPlatformHook) throws Exception {
+    public void testWebMarker(@Injectable final PlatformHook mockPlatformHook,
+                              @Mocked final PlatformManager platformManager) throws Exception {
         TestUtils.assumeWorkingJMockit();
-        new Expectations(PlatformManager.class) {{
+        new Expectations() {{
             PlatformManager.getPlatform(); result = mockPlatformHook;
-        }};
-        new Expectations() {{
             mockPlatformHook.openUrl("http://example.com"); result = null; times = 1;
         }};