Changeset 18593 in josm for trunk

Timestamp:

2022-11-10T15:15:47+01:00 (2 years ago)

Author:

taylor.smock

Message:

See #22337: Make window for attached GPX waypoint images resizable

This fixes broken tests.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarkerTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java

@@ -107 +107 @@
 
     private Supplier<RemoteEntry> getLastImage() {
-        int index = this.parentLayer.data.indexOf(this);
+        int index = Math.max(0, this.parentLayer.data.indexOf(this));
         for (int i = this.parentLayer.data.size() - 1; i >= index; i--) {
             Marker marker = this.parentLayer.data.get(i);

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

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.io.File;
 import java.net.MalformedURLException;
-import java.net.URL;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.JOSMFixture;
+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.testutils.annotations.BasicPreferences;
 
 /**
  * Unit tests of {@link ImageMarker} class.
  */
+@BasicPreferences
 class ImageMarkerTest {
-
-    /**
-     * Setup tests
-     */
-    @BeforeAll
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @RegisterExtension
+    static JOSMTestRules josmTestRules = new JOSMTestRules().main();
 
     /**
@@ -35 +32 @@
         ImageMarker marker = new ImageMarker(
                 LatLon.ZERO,
-                new URL("file://something.jpg"),
+                new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG")).toURI().toURL(),
                 new MarkerLayer(new GpxData(), null, null, null),
                 1d, 2d);