Changeset 15852 in josm for trunk/test

Timestamp:

2020-02-15T11:15:05+01:00 (4 years ago)

Author:

GerdP

Message:

fix #10511: Joining complex areas produces exception

• detect case where a single closed way contains the same segment twice or more and fix the "inside" flag
• enable and correct unit test (it "destroyed" preferences.xml)
• init cmdsCount to prevent corrupted undo/redo stacks after a "Join areas internal error."
• make sure that a single command is placed on the undo/redo stack in case of successfull execution. The old code sometimes created two, the latter one "Move tags from ways to relations". I found no good reason for that.
• Try to clean up undo/redo stack if user cancelled operation in 2nd popup asking about relations. Still a dirty hack but a less dangerous one.

File:

• trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (modified) (4 diffs)

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

@@ -15 +15 @@
 import java.util.Set;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -50 +49 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().projection();
+    public JOSMTestRules test = new JOSMTestRules().main().projection().preferences();
 
     /**
@@ -58 +57 @@
      */
     @Test
-    @Ignore("disable this test, needs further working") // XXX
     public void testTicket10511() throws IOException, IllegalDataException {
         try (InputStream is = TestUtils.getRegressionDataStream(10511, "10511_mini.osm")) {
@@ -66 +64 @@
             try {
                 new JoinAreasAction(false).join(ds.getWays());
+                Collection<IPrimitive> found = SearchAction.searchAndReturn("type:way", SearchMode.replace);
+                assertEquals(1, found.size());
             } finally {
                 // Ensure we clean the place before leaving, even if test fails.