Changeset 2578 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm

Timestamp:

2009-12-05T18:23:03+01:00 (16 years ago)

Author:

jttt

Message:

Encalupse OsmPrimitive.incomplete

Location:

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

Files:

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

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

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

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

@@ -202 +202 @@
         Node n = new Node(1);
         n.setCoor(new LatLon(0,0));
-        n.incomplete = false;
+        n.setIncomplete(false);
         n.setDeleted(true);
         n.put("key1", "value1");
@@ -449 +449 @@
         n.setCoor(new LatLon(0,0));
         n.setOsmId(1,1);
-        n.incomplete = true;
+        n.setIncomplete(true);
         my.addPrimitive(n);
 
@@ -470 +470 @@
         assertEquals("value1",n2.get("key1"));
         assertEquals(true, n1.getTimestamp().equals(n2.getTimestamp()));
-        assertEquals(false, n2.incomplete);
+        assertEquals(false, n2.isIncomplete());
         assertTrue(n2 == n);
     }
@@ -1004 +1004 @@
         w3.setNodes(Arrays.asList(n1,n2));
         source.addPrimitive(w3);
-        assertTrue(w3.incomplete);
+        assertTrue(w3.isIncomplete());
 
         DataSet target = new DataSet();
@@ -1016 +1016 @@
         OsmPrimitive p= target.getPrimitiveById(1, OsmPrimitiveType.NODE);
         assertNotNull(p);
-        assertTrue(p.incomplete);
+        assertTrue(p.isIncomplete());
         p= target.getPrimitiveById(2, OsmPrimitiveType.NODE);
         assertNotNull(p);
-        assertTrue(p.incomplete);
+        assertTrue(p.isIncomplete());
         p= target.getPrimitiveById(3, OsmPrimitiveType.WAY);
         assertNotNull(p);
-        assertTrue(p.incomplete);
+        assertTrue(p.isIncomplete());
 
         Way w = (Way)target.getPrimitiveById(3, OsmPrimitiveType.WAY);
         assertNotNull(w);
-        assertTrue(p.incomplete);
+        assertTrue(p.isIncomplete());
         assertEquals(2, w.getNodesCount());
-        assertTrue(w.getNode(0).incomplete);
-        assertTrue(w.getNode(1).incomplete);
+        assertTrue(w.getNode(0).isIncomplete());
+        assertTrue(w.getNode(1).isIncomplete());
     }
 
@@ -1067 +1067 @@
 
         Way w6 = new Way(3);
-        w6.incomplete = false;
+        w6.setIncomplete(false);
         w6.setNodes(Arrays.asList(n4,n5));
         my.addPrimitive(w6);
@@ -1078 +1078 @@
         OsmPrimitive p= my.getPrimitiveById(1, OsmPrimitiveType.NODE);
         assertNotNull(p);
-        assertTrue(!p.incomplete);
+        assertTrue(!p.isIncomplete());
         p= my.getPrimitiveById(2, OsmPrimitiveType.NODE);
         assertNotNull(p);
-        assertTrue(!p.incomplete);
+        assertTrue(!p.isIncomplete());
         p= my.getPrimitiveById(3,OsmPrimitiveType.WAY);
         assertNotNull(p);
-        assertTrue(!p.incomplete);
+        assertTrue(!p.isIncomplete());
 
         Way w = (Way)my.getPrimitiveById(3,OsmPrimitiveType.WAY);
         assertNotNull(w);
-        assertTrue(!p.incomplete);
+        assertTrue(!p.isIncomplete());
         assertEquals(2, w.getNodesCount());
-        assertTrue(!w.getNode(0).incomplete);
-        assertTrue(!w.getNode(1).incomplete);
+        assertTrue(!w.getNode(0).isIncomplete());
+        assertTrue(!w.getNode(1).isIncomplete());
     }
 
@@ -1108 +1108 @@
         Node n1 = new Node(1);
         n1.setCoor(new LatLon(1,1));
-        n1.incomplete = false;
+        n1.setIncomplete(false);
         source.addPrimitive(n1);
 
@@ -1114 +1114 @@
         Node n2 = new Node(2);
         n2.setCoor(new LatLon(2,2));
-        n2.incomplete = false;
+        n2.setIncomplete(false);
         source.addPrimitive(n2);
 
@@ -1128 +1128 @@
 
         Way w6 = new Way(3);
-        w6.incomplete = false;
+        w6.setIncomplete(false);
         w6.addNode(n4);
         w6.addNode(n5);
-        w6.incomplete = true;
+        w6.setIncomplete(true);
         target.addPrimitive(w6);
 
@@ -1143 +1143 @@
         Node n = (Node)target.getPrimitiveById(1, OsmPrimitiveType.NODE);
         assertNotNull(n);
-        assertFalse(n.incomplete);
+        assertFalse(n.isIncomplete());
 
         n = (Node)target.getPrimitiveById(2, OsmPrimitiveType.NODE);
         assertNotNull(n);
-        assertFalse(n.incomplete);
+        assertFalse(n.isIncomplete());
 
         Way w = (Way)target.getPrimitiveById(3, OsmPrimitiveType.WAY);
         assertNotNull(w);
-        assertFalse(w.incomplete);
+        assertFalse(w.isIncomplete());
         assertEquals(2, w.getNodesCount());
         assertEquals(1, w.getNode(0).getId());

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

@@ -72 +72 @@
         Node n2 = new Node(2);
         Way w1 = new Way(3);
-        w1.incomplete = false;
+        w1.setIncomplete(false);
         w1.addNode(n1);
         w1.addNode(n2);
@@ -105 +105 @@
         Node n2 = new Node(2);
         Way w1 = new Way(3);
-        w1.incomplete = false;
+        w1.setIncomplete(false);
         w1.addNode(n1);
         w1.addNode(n2);
@@ -147 +147 @@
         assertNotNull(p);
         assertEquals(p.getClass(), Way.class);
-        assertTrue(p.incomplete);
+        assertTrue(p.isIncomplete());
     }
 
@@ -156 +156 @@
         Node n20 = new Node(20);
         r1.addMember(new RelationMember("node-20",n20));
-        r1.incomplete = false;
+        r1.setIncomplete(false);
         Way w30 = new Way(30);
-        w30.incomplete = false;
+        w30.setIncomplete(false);
         Node n21;
         w30.addNode(n21 = new Node(21));
@@ -217 +217 @@
         r1.addMember(new RelationMember("node-20",n20));
         Way w30 = new Way(30);
-        w30.incomplete = false;
+        w30.setIncomplete(false);
         Node n21;
         w30.addNode(n21 = new Node(21));
@@ -246 +246 @@
         Way w = (Way)hull.getPrimitiveById(30, OsmPrimitiveType.WAY);
         assertNotNull(w);
-        assertTrue(w.incomplete);
+        assertTrue(w.isIncomplete());
 
 
@@ -257 +257 @@
         Relation r = (Relation)hull.getPrimitiveById(40, OsmPrimitiveType.RELATION);
         assertNotNull(r);
-        assertTrue(r.incomplete);
+        assertTrue(r.isIncomplete());
 
         r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);