Changeset 15064 in josm for trunk/test

Timestamp:

2019-05-09T10:13:10+02:00 (5 years ago)

Author:

GerdP

Message:

fix #12627,#14287,#14289,#17695

• let CrossingFinder and ContainsFinder find all objects instead of stopping at first match
• if objects are selected, make sure that ContainsFinder is called for enclosing objects which are not in the selection
• enable corresponding unit tests

Draw back: MapCSSTagChecker is a bit slower.

File:

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

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

@@ -16 +16 @@
 import java.util.Set;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -87 +86 @@
         new DataSet(n1, n2);
         assertTrue(check.test(n1));
-        assertEquals("deprecated", check.getErrorForPrimitive(n1).getMessage());
-        assertEquals("natural=marsh is deprecated", check.getErrorForPrimitive(n1).getDescription());
-        assertEquals(Severity.WARNING, check.getErrorForPrimitive(n1).getSeverity());
+
+        final Collection<TestError> errors = check.getErrorsForPrimitive(n1);
+        assertEquals(1, errors.size());
+        TestError err = errors.iterator().next();
+        assertEquals("deprecated", err.getMessage());
+        assertEquals("natural=marsh is deprecated", err.getDescription());
+        assertEquals(Severity.WARNING, err.getSeverity());
         assertEquals("Sequence: Fix of natural=marsh is deprecated", check.fixPrimitive(n1).getDescriptionText());
         assertEquals("{natural=}", ((ChangePropertyCommand) check.fixPrimitive(n1).getChildren().iterator().next()).getTags().toString());
@@ -240 +243 @@
      */
     @Test
-    @Ignore("not fixed yet")
     public void testTicket14287() throws Exception {
         final MapCSSTagChecker test = buildTagChecker(
@@ -300 +302 @@
      */
     @Test
-    @Ignore("not fixed yet")
     public void testTicket12627() throws Exception {
         doTestNaturalWood(12627, "overlapping.osm", 1, 1);
@@ -310 +311 @@
      */
     @Test
-    @Ignore("not fixed yet")
     public void testTicket14289() throws Exception {
         doTestNaturalWood(14289, "example2.osm", 3, 3);