Changeset 17393 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2020-12-07T11:52:15+01:00 (3 years ago)

Author:

GerdP

Message:

see #10205: Strange align nodes in circle behavior

• allow to define center node also when a single unclosed way is selected
• add robustness and more unit tests for evaluation of valid selections
• if only nodes and no way are selected, order the nodes using the angle to the agv. east-north position. This should produce a predictable result
• if way(s) are selected the order the nodes is determined by the occurence in the way(s). Self-Intersecting polygons are rejected if no center node is given
• don't throw InvalidSelection when selection is valid but no point was moved, let buildCommand() return null instead

With a selection that gives a center point and way(s) which are not even close to a circular shape the result might still be surprising. Sometimes the way nodes are arranged around the center node, sometimes they are moved so that a circle arc with nearly the same length is produced. The result changes significantly when the way nodes are also selected. Subject to further improvements.

File:

• trunk/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.file.Files;
@@ -14 +16 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.AlignInCircleAction.InvalidSelection;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.opentest4j.AssertionFailedError;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -71 +76 @@
     /**
      * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/20041">Bug #20041</a>.
-     * Don't create move commands when no node is visibly moved
+     * Don't create move commands when no node is visibly moved.
      * @throws Exception if an error occurs
      */
@@ -88 +93 @@
         if (roundabout != null) {
             ds.setSelected(roundabout);
-            assertThrows(AlignInCircleAction.InvalidSelection.class, () -> AlignInCircleAction.buildCommand(ds));
+            assertNull(AlignInCircleAction.buildCommand(ds));
         }
     }
@@ -150 +155 @@
     }
 
+    /**
+     * Various cases of selections in file
+     * @throws Exception if an error occurs
+     */
+    @Test
+    void testSelectionEvaluation() throws Exception {
+        DataSet ds = OsmReader.parseDataSet(
+                Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleCases.osm")), null);
+
+        for (int i = 0; i < 80; i++) {
+            final String selVal = Integer.toString(i);
+            Set<OsmPrimitive> sel = ds.allPrimitives().stream().filter(p -> p.hasTag("sel", selVal))
+                    .collect(Collectors.toSet());
+            if (sel.isEmpty())
+                continue;
+            ds.setSelected(sel);
+            boolean selValid = sel.stream().noneMatch(p -> p.hasKey("invalid-selection"));
+            try {
+                AlignInCircleAction.buildCommand(ds);
+                assertTrue(selValid, "sel=" + selVal + " is not valid?");
+            } catch (InvalidSelection e) {
+                assertFalse(selValid, "sel=" + selVal + " is not invalid?");
+            } catch (Exception e) {
+                throw new AssertionFailedError("test failed: sel=" + selVal,e);
+            }
+        }
+    }
 }