Changeset 17222 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2020-10-17T11:38:34+02:00 (4 years ago)

Author:

GerdP

Message:

Add unit test for validator test DuplicateWay to improve test coverage

(prepares change to usage of ChangeMembersCommnad)

File:

• trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateWayTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateWayTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -12 +18 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -88 +95 @@
         doTest(DuplicateWay.SAME_WAY, "highway=motorway", "highway=trunk", false);
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14891">Bug #14891</a>.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testFixError() throws Exception {
+        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "duplicate-ways.osm")), null);
+        TEST.startTest(NullProgressMonitor.INSTANCE);
+        TEST.visit(ds.allPrimitives());
+        TEST.endTest();
+
+        assertEquals(2, TEST.getErrors().size());
+        for (TestError error: TEST.getErrors()) {
+            error = TEST.getErrors().iterator().next();
+            assertTrue(error.isFixable());
+            Command fix = error.getFix();
+            assertNotNull(fix);
+        }
+        for (TestError error: TEST.getErrors()) {
+            error.getFix().executeCommand();
+        }
+        TEST.startTest(NullProgressMonitor.INSTANCE);
+        TEST.visit(ds.allPrimitives());
+        TEST.endTest();
+        assertTrue(TEST.getErrors().isEmpty());
+
+    }
+
 }