Changeset 9716 in josm for trunk/test

Timestamp:

2016-02-02T23:01:02+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12467, see #12412 - presets no longer fit correct for boundary relations (regression from r9574)

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Assert;
@@ -104 +106 @@
         Assert.assertEquals(new BBox(w1), r1.getBBox());
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12467">Bug #12467</a>.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testTicket12467() throws Exception {
+        Relation r = new Relation();
+        r.put("type", "boundary");
+        assertTrue(r.isBoundary());
+        assertTrue(r.isMultipolygon());
+        assertEquals(OsmPrimitiveType.RELATION, r.getDisplayType());
+
+        r.put("type", "multipolygon");
+        assertFalse(r.isBoundary());
+        assertTrue(r.isMultipolygon());
+        assertEquals(OsmPrimitiveType.MULTIPOLYGON, r.getDisplayType());
+
+        r.put("type", "something_else");
+        assertFalse(r.isBoundary());
+        assertFalse(r.isMultipolygon());
+        assertEquals(OsmPrimitiveType.RELATION, r.getDisplayType());
+    }
 }