Changeset 15134 in josm

Timestamp:

2019-05-28T22:03:17+02:00 (5 years ago)

Author:

GerdP

Message:

see #17765: fix / add unit tests

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Files:

• MultipolygonTestTest.java (modified) (2 diffs)
• UnclosedWaysTest.java (added)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -37 +26 @@
     public JOSMTestRules test = new JOSMTestRules().projection().mapStyles().presets().main();
 
-    private static Way createUnclosedWay(String tags) {
-        List<Node> nodes = new ArrayList<>();
-        nodes.add(new Node(new LatLon(0, 1)));
-        nodes.add(new Node(new LatLon(0, 2)));
-
-        Way w = (Way) OsmUtils.createPrimitive("way "+tags);
-        w.setNodes(nodes);
-        return w;
-    }
-
-    /**
-     * Non-regression test for bug #10469.
-     * @throws Exception if an exception occurs
-     */
-    @Test
-    public void testTicket10469() throws Exception {
-        MULTIPOLYGON_TEST.initialize();
-        MULTIPOLYGON_TEST.startTest(null);
-
-        // Erroneous tag
-        Way w = createUnclosedWay("amenity=parking");
-        MULTIPOLYGON_TEST.visit(w);
-        assertTrue(ElemStyles.hasAreaElemStyle(w, false));
-        assertEquals(1, MULTIPOLYGON_TEST.getErrors().size());
-
-        // Erroneous tag, but managed by another test
-        w = createUnclosedWay("building=yes");
-        MULTIPOLYGON_TEST.visit(w);
-        assertTrue(ElemStyles.hasAreaElemStyle(w, false));
-        assertEquals(1, MULTIPOLYGON_TEST.getErrors().size());
-
-        // Correct tag, without area style since #10601 (r7603)
-        w = createUnclosedWay("aeroway=taxiway");
-        MULTIPOLYGON_TEST.visit(w);
-        assertFalse(ElemStyles.hasAreaElemStyle(w, false));
-        assertEquals(1, MULTIPOLYGON_TEST.getErrors().size());
-
-        MULTIPOLYGON_TEST.endTest();
-    }
-
     /**
      * Test all error cases manually created in multipolygon.osm.