Index: trunk/test/data/create_multipolygon.osm
===================================================================
--- trunk/test/data/create_multipolygon.osm (revision 6564)
+++ trunk/test/data/create_multipolygon.osm (revision 6564)
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy (revision 6564)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy (revision 6564)
@@ -0,0 +1,63 @@
+package org.openstreetmap.josm.actions
+
+import org.openstreetmap.TestUtils
+import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.actions.search.SearchCompiler
+import org.openstreetmap.josm.data.osm.Relation
+import org.openstreetmap.josm.data.osm.Way
+import org.openstreetmap.josm.data.projection.Projections
+import org.openstreetmap.josm.io.OsmReader
+import org.openstreetmap.josm.tools.Utils
+
+class CreateMultipolygonActionTest extends GroovyTestCase {
+
+ @Override
+ void setUp() {
+ Main.initApplicationPreferences()
+ Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+ }
+
+ def getRefToRoleMap(Relation relation) {
+ def refToRole = new TreeMap()
+ for (i in relation.getMembers()) {
+ refToRole.put(i.member.get("ref"), i.role);
+ }
+ return refToRole;
+ }
+
+ void testCreate1() {
+ def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+ def mp = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), Collections.emptyList())
+ assert mp.a.getDescriptionText() == "Sequence: Create multipolygon"
+ assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer, 1.1.2:outer, 1.2:inner]"
+ }
+
+ void testCreate2() {
+ def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+ def ways = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1.", false, false))
+ def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection, Collections.emptyList())
+ assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1.1:inner, 1.1.2:inner]"
+ }
+
+ void testUpdate1() {
+ def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+ def ways = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=\".*1\$\"", false, true))
+ def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection, Collections.emptyList())
+ assert mp.b.getMembersCount() == 3
+ assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer]"
+ def ways2 = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=1.2", false, true))
+ def mp2 = CreateMultipolygonAction.createMultipolygonCommand(ways2 as Collection, Collections.singleton(mp.b))
+ assert mp2.b.getMembersCount() == 4
+ assert getRefToRoleMap(mp2.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer, 1.2:inner]"
+ }
+
+ void testUpdate2() {
+ def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
+ def ways = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1.1", false, false))
+ def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection, Collections.emptyList())
+ assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1.1:inner]"
+ def ways2 = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=1.1 OR ref=1.2 OR ref=1.1.2", false, true))
+ def mp2 = CreateMultipolygonAction.createMultipolygonCommand(ways2 as Collection, Collections.singleton(mp.b))
+ assert getRefToRoleMap(mp2.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer, 1.1.2:outer, 1.2:inner]"
+ }
+}