Changeset 19227 in josm for trunk/test/unit

Timestamp:

2024-09-19T15:38:39+02:00 (3 months ago)

Author:

taylor.smock

Message:

Fix #20908: IllegalStateException: JOSM expected to find primitive in dataset after undoing a Parallel mode action

The test acts (roughly) like a user would, and performs click and drags via a new
utility class (MapModeUtils) which has various methods for performing mouse
actions on the map view.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/mapmode/ParallelWayActionTest.java (modified) (3 diffs)
• testutils/MapModeUtils.java (added)
• tools/ExceptionUtilTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.mapmode.ParallelWayAction.Mode;
 import org.openstreetmap.josm.actions.mapmode.ParallelWayAction.Modifier;
+import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.MapModeUtils;
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.Projection;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -22 +27 @@
 @Projection
 class ParallelWayActionTest {
+    private MapFrame map;
+    private ParallelWayAction mapMode;
+    private DataSet dataSet;
+
+    @BeforeEach
+    void setup() {
+        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "ParallelWayActionTest", null);
+        MainApplication.getLayerManager().addLayer(layer);
+        this.map = MainApplication.getMap();
+        this.mapMode = new ParallelWayAction(this.map);
+        this.dataSet = layer.getDataSet();
+    }
+
     /**
      * Unit test of {@link ParallelWayAction#enterMode} and {@link ParallelWayAction#exitMode}.
@@ -27 +45 @@
     @Test
     void testMode() {
-        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
-        try {
-            MainApplication.getLayerManager().addLayer(layer);
-            MapFrame map = MainApplication.getMap();
-            ParallelWayAction mapMode = new ParallelWayAction(map);
-            MapMode oldMapMode = map.mapMode;
-            assertTrue(map.selectMapMode(mapMode));
-            assertEquals(mapMode, map.mapMode);
-            assertTrue(map.selectMapMode(oldMapMode));
-        } finally {
-            MainApplication.getLayerManager().removeLayer(layer);
-        }
+        final MapMode oldMapMode = this.map.mapMode;
+        assertTrue(this.map.selectMapMode(mapMode));
+        assertEquals(this.mapMode, this.map.mapMode);
+        assertTrue(this.map.selectMapMode(oldMapMode));
+    }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/20908">#20908</a>
+     */
+    @Test
+    void testNonRegression20908() {
+        Logging.clearLastErrorAndWarnings();
+        this.map.selectMapMode(this.map.mapModeDraw);
+        MapModeUtils.clickAt(LatLon.ZERO);
+        MapModeUtils.clickAt(2, new LatLon(0.0001, 0));
+        assertEquals(3, this.dataSet.allPrimitives().size());
+        this.map.selectMapMode(mapMode);
+        MapModeUtils.dragFromTo(new LatLon(0.00005, 0), new LatLon(0.00005, 0.0001));
+        assertEquals(6, this.dataSet.allPrimitives().size());
+        UndoRedoHandler.getInstance().undo();
+        assertEquals(3, this.dataSet.allPrimitives().size());
+        this.map.mapMode.mousePressed(MapModeUtils.mouseClickAt(new LatLon(0.00005, 0.0001)));
+        assertTrue(Logging.getLastErrorAndWarnings().isEmpty(), String.join("\n", Logging.getLastErrorAndWarnings()));
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java

@@ -87 +87 @@
         );
     }
+
     /**
      * Test of {@link ExceptionUtil#explainBadRequest} method.
@@ -94 +95 @@
     @SuppressWarnings("unchecked")
     void testExplainBadRequest(Supplier<String> message, Object exception) {
-        assertEquals(message.get(), ExceptionUtil.explainBadRequest(exception instanceof Supplier ? ((Supplier<OsmApiException>) exception).get() : (OsmApiException) exception));
+        assertEquals(message.get(), ExceptionUtil.explainBadRequest(
+                exception instanceof Supplier ? ((Supplier<OsmApiException>) exception).get() : (OsmApiException) exception
+        ));
     }