Index: trunk/test/data/regress/12627/overlapping.osm
===================================================================
--- trunk/test/data/regress/12627/overlapping.osm (revision 11493)
+++ trunk/test/data/regress/12627/overlapping.osm (revision 11493)
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/test/data/regress/14289/example2.osm
===================================================================
--- trunk/test/data/regress/14289/example2.osm (revision 11493)
+++ trunk/test/data/regress/14289/example2.osm (revision 11493)
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (revision 11492)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (revision 11493)
@@ -10,4 +10,5 @@
import java.io.StringReader;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -32,4 +33,6 @@
import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.ParseResult;
import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
import org.openstreetmap.josm.io.OsmReader;
@@ -48,5 +51,5 @@
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules().projection();
+ public JOSMTestRules test = new JOSMTestRules().projection().platform();
static MapCSSTagChecker buildTagChecker(String css) throws ParseException {
@@ -216,3 +219,47 @@
}
}
+
+ private void doTestNaturalWood(int ticket, String filename, int errorsCount, int setsCount) throws Exception {
+ final MapCSSTagChecker test = buildTagChecker(
+ "area:closed:areaStyle[tag(\"natural\") = parent_tag(\"natural\")] ⧉ area:closed:areaStyle[natural] {" +
+ " throwWarning: tr(\"Overlapping Identical Natural Areas\");" +
+ "}");
+ final MapCSSStyleSource style = new MapCSSStyleSource(
+ "area[natural=wood] {" +
+ " fill-color: woodarea#008000;" +
+ "}");
+ MapPaintStyles.addStyle(style);
+ try (InputStream is = TestUtils.getRegressionDataStream(ticket, filename)) {
+ test.visit(OsmReader.parseDataSet(is, null).allPrimitives());
+ List errors = test.getErrors();
+ assertEquals(errorsCount, errors.size());
+ Set> primitives = new HashSet<>();
+ for (TestError e : errors) {
+ primitives.add(new HashSet<>(e.getPrimitives()));
+ }
+ assertEquals(setsCount, primitives.size());
+ } finally {
+ MapPaintStyles.removeStyle(style);
+ }
+ }
+
+ /**
+ * Non-regression test for Bug #12627.
+ * @throws Exception if an error occurs
+ */
+ @Test
+ @Ignore("not fixed yet")
+ public void testTicket12627() throws Exception {
+ doTestNaturalWood(12627, "overlapping.osm", 1, 1);
+ }
+
+ /**
+ * Non-regression test for Bug #14289.
+ * @throws Exception if an error occurs
+ */
+ @Test
+ @Ignore("not fixed yet")
+ public void testTicket14289() throws Exception {
+ doTestNaturalWood(14289, "example2.osm", 3, 3);
+ }
}