Changeset 2620 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2009-12-12T17:10:01+01:00 (14 years ago)

Author:

jttt

Message:

Remove OsmPrimitive.setIncomplete()

Location:

trunk/test/unit/org/openstreetmap/josm/data/osm

Files:

• APIDataSetTest.java (modified) (1 diff)
• DataSetMergerTest.java (modified) (7 diffs)
• visitor/MergeSourceBuildingVisitorTest.java (modified) (4 diffs)

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

@@ -74 +74 @@
         r3.put("name", "r3");
 
-        Relation r4 = new Relation(1);
+        Relation r4 = new Relation(1, 1);
         r4.put("name", "r4");
-        r4.setIncomplete(false);
         r4.setModified(true);
 

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

@@ -191 +191 @@
         DataSet my = new DataSet();
         my.setVersion("0.6");
-        Node n = new Node(1);
+        Node n = new Node(1, 1);
         n.setCoor(new LatLon(0,0));
-        n.setIncomplete(false);
         n.setDeleted(true);
         n.put("key1", "value1");
@@ -201 +200 @@
         their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
-        n1.setOsmId(1,1);
+        n1.setOsmId(1,2);
         n1.setModified(false);
         n1.put("key1", "value1-new");
@@ -437 +436 @@
         DataSet my = new DataSet();
         my.setVersion("0.6");
-        Node n = new Node();
-        n.setCoor(new LatLon(0,0));
-        n.setOsmId(1,1);
-        n.setIncomplete(true);
+        Node n = new Node(1);
         my.addPrimitive(n);
 
@@ -1057 +1053 @@
         my.addPrimitive(n5);
 
-        Way w6 = new Way(3);
-        w6.setIncomplete(false);
+        Way w6 = new Way(3, 1);
         w6.setNodes(Arrays.asList(n4,n5));
         my.addPrimitive(w6);
@@ -1097 +1092 @@
 
         // an complete node
-        Node n1 = new Node(1);
+        Node n1 = new Node(1, 1);
         n1.setCoor(new LatLon(1,1));
-        n1.setIncomplete(false);
         source.addPrimitive(n1);
 
         // another complete node
-        Node n2 = new Node(2);
+        Node n2 = new Node(2, 1);
         n2.setCoor(new LatLon(2,2));
-        n2.setIncomplete(false);
         source.addPrimitive(n2);
 
-        // --- target daset
+        // --- target dataset
         DataSet target = new DataSet();
         target.setVersion("0.6");
@@ -1118 +1111 @@
         target.addPrimitive(n5);
 
-        Way w6 = new Way(3);
-        w6.setIncomplete(false);
+        Way w6 = new Way(3, 1);
         w6.addNode(n4);
         w6.addNode(n5);
-        w6.setIncomplete(true);
         target.addPrimitive(w6);
 
@@ -1143 +1134 @@
         assertNotNull(w);
         assertFalse(w.hasIncompleteNodes());
-        assertFalse(w.isUsable());
+        assertTrue(w.isUsable());
         assertEquals(2, w.getNodesCount());
         assertEquals(1, w.getNode(0).getId());

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

@@ -71 +71 @@
         Node n1 = new Node(1);
         Node n2 = new Node(2);
-        Way w1 = new Way(3);
-        w1.setIncomplete(false);
+        Way w1 = new Way(3, 1);
         w1.addNode(n1);
         w1.addNode(n2);
@@ -104 +103 @@
         Node n1 = new Node(1);
         Node n2 = new Node(2);
-        Way w1 = new Way(3);
-        w1.setIncomplete(false);
+        Way w1 = new Way(3, 1);
         w1.addNode(n1);
         w1.addNode(n2);
@@ -154 +152 @@
         DataSet source = new DataSet();
         Relation r1 = new Relation(1);
-        Node n20 = new Node(20);
+        Node n20 = new Node(20, 1);
         r1.addMember(new RelationMember("node-20",n20));
-        r1.setIncomplete(false);
-        Way w30 = new Way(30);
-        w30.setIncomplete(false);
+        Way w30 = new Way(30, 1);
         Node n21;
         w30.addNode(n21 = new Node(21));
@@ -216 +212 @@
         Node n20 = new Node(20);
         r1.addMember(new RelationMember("node-20",n20));
-        Way w30 = new Way(30);
-        w30.setIncomplete(false);
+        Way w30 = new Way(30, 1);
         Node n21;
         w30.addNode(n21 = new Node(21));