Changeset 9933 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2016-03-05T18:33:11+01:00 (9 years ago)

Author:

simon04

Message:

see #8460 - Validate that public transport routes (version 2) do not contain a gap

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (2 diffs)
• data/validation/tests/PublicTransportRouteTestTest.java (added)

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

@@ -36 +36 @@
 import java.util.Map;
 
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.progress.AbstractProgressMonitor;
 import org.openstreetmap.josm.gui.progress.CancelHandler;
@@ -545 +550 @@
     // CHECKSTYLE.ON: MethodLength
     // CHECKSTYLE.ON: AnonInnerLength
+
+    /**
+     * Creates a new way with the given tags (see {@link OsmUtils#createPrimitive(java.lang.String)}) and the nodes added
+     *
+     * @param tags  the tags to set
+     * @param nodes the nodes to add
+     * @return a new way
+     */
+    public static Way newWay(String tags, Node... nodes) {
+        final Way way = (Way) OsmUtils.createPrimitive("way " + tags);
+        for (Node node : nodes) {
+            way.addNode(node);
+        }
+        return way;
+    }
+
+    /**
+     * Creates a new relation with the given tags (see {@link OsmUtils#createPrimitive(java.lang.String)}) and the members added
+     *
+     * @param tags  the tags to set
+     * @param members the members to add
+     * @return a new relation
+     */
+    public static Relation newRelation(String tags, RelationMember... members) {
+        final Relation relation = (Relation) OsmUtils.createPrimitive("relation " + tags);
+        for (RelationMember member : members) {
+            relation.addMember(member);
+        }
+        return relation;
+    }
 }