Changeset 3025 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

Timestamp:

19.02.2010 21:43:42 (2 years ago)

Author:

jttt

Message:

Fix tests

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

@@ -151 +151 @@
     public void test_OneRelation_ExistingMembersSelected() {
         DataSet source = new DataSet();
-        Relation r1 = new Relation(1);
+        Relation r1 = new Relation(1, 1);
         Node n20 = new Node(20, 1);
+        n20.setCoor(new LatLon(0, 0));
         r1.addMember(new RelationMember("node-20",n20));
         Way w30 = new Way(30, 1);
-        Node n21;
-        w30.addNode(n21 = new Node(21));
-        Node n22;
-        w30.addNode(n22 = new Node(22));
+        Node n21  = new Node(21);
+        w30.addNode(n21);
+        Node n22 = new Node(22);
+        w30.addNode(n22);
         r1.addMember(new RelationMember("way-30",w30));
         Relation r40 = new Relation(40);
@@ -166 +167 @@
         source.addPrimitive(n22);
         source.addPrimitive(w30);
-        source.addPrimitive(r1);
         source.addPrimitive(r40);
+        source.addPrimitive(r1);
         source.setSelected(r1,n20,w30,r40);
 
@@ -209 +210 @@
     public void test_OneRelation_ExistingMembersNotSelected() {
         DataSet source = new DataSet();
-        Relation r1 = new Relation(1);
+        Relation r1 = new Relation(1, 1);
         Node n20 = new Node(20);
         r1.addMember(new RelationMember("node-20",n20));
@@ -224 +225 @@
         source.addPrimitive(n22);
         source.addPrimitive(w30);
-        source.addPrimitive(r1);
         source.addPrimitive(r40);
+        source.addPrimitive(r1);
         source.setSelected(r1);
 
@@ -291 +292 @@
         source.addPrimitive(n22);
         source.addPrimitive(w30);
-        source.addPrimitive(r1);
         source.addPrimitive(r40);
+        source.addPrimitive(r1);
         source.setSelected(r1);
 
@@ -335 +336 @@
     public void test_OneRelation_Existing_Recursive() {
         DataSet source = new DataSet();
-        Relation r1 = new Relation(1);
+        Relation r1 = new Relation(1, 1);
         r1.addMember(new RelationMember("relation-1",r1));
         source.addPrimitive(r1);
@@ -374 +375 @@
     public void test_TwoRelation_Existing_Circular() {
         DataSet source = new DataSet();
-        Relation r1 = new Relation(1);
-        Relation r2 = new Relation(2);
+        Relation r1 = new Relation(1, 1);
+        source.addPrimitive(r1);
+        Relation r2 = new Relation(2, 3);
+        source.addPrimitive(r2);
         r1.addMember(new RelationMember("relation-2",r2));
         r2.addMember(new RelationMember("relation-1",r1));
-        source.addPrimitive(r1);
-        source.addPrimitive(r2);
         source.setSelected(r1,r2);