Changeset 8257 in josm for trunk

Timestamp:

2015-04-25T09:12:12+02:00 (10 years ago)

Author:

simon04

Message:

fix #11370 - "area" is not supported in validator asserts

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/OsmUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/TestUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java (added)

trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java

@@ -67 +67 @@
         final OsmPrimitive p = "n".equals(x[0]) || "node".equals(x[0])
                 ? new Node(LatLon.ZERO)
-                : "w".equals(x[0]) || "way".equals(x[0])
+                : "w".equals(x[0]) || "way".equals(x[0]) || /*for MapCSS related usage*/ "area".equals(x[0])
                 ? new Way()
                 : "r".equals(x[0]) || "relation".equals(x[0])
@@ -73 +73 @@
                 : null;
         if (p == null) {
-            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation, but got " + x[0]);
+            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation/area, but got '" + x[0] + "'");
         }
         for (final Map.Entry<String, String> i : TextTagParser.readTagsFromText(x[1]).entrySet()) {

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -2 +2 @@
 package org.openstreetmap.josm;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 import java.util.Comparator;
-
-import org.junit.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.data.osm.Way;
 
 /**
@@ -50 +42 @@
     public static String getRegressionDataFile(int ticketid, String filename) {
         return getRegressionDataDir(ticketid) + '/' + filename;
-    }
-
-    @Test
-    public void testCreatePrimitive() throws Exception {
-        final OsmPrimitive p = OsmUtils.createPrimitive("way name=Foo railway=rail");
-        assertTrue(p instanceof Way);
-        assertThat(p.keySet().size(), is(2));
-        assertThat(p.get("name"), is("Foo"));
-        assertThat(p.get("railway"), is("rail"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testCreatePrimitiveFail() throws Exception {
-        OsmUtils.createPrimitive("noway name=Foo");
     }