Changeset 1898 in josm for trunk/test/functional/org

Timestamp:

2009-08-03T21:18:50+02:00 (15 years ago)

Author:

jttt

Message:

Way refactoring - rewritten another parts of code to the new nodes api

Location:

trunk/test/functional/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReaderTest.java (modified) (3 diffs)
• OsmServerBackreferenceReaderTest.java (modified) (4 diffs)

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.xml.sax.SAXException;
 
@@ -275 +274 @@
             Way w2 = (Way)ds.getPrimitiveById(w1.id);
             assertNotNull(w2);
-            assertEquals(w2.nodes.size(), w1.nodes.size());
+            assertEquals(w2.getNodesCount(), w1.getNodesCount());
             assertEquals(w2.get("name"),w1.get("name"));
         }
@@ -340 +339 @@
         assertFalse(reader.getMissingPrimitives().isEmpty());
         assertEquals(1, reader.getMissingPrimitives().size());
-        assertEquals(9999999, reader.getMissingPrimitives().iterator().next());
+        assertEquals(9999999, (long)reader.getMissingPrimitives().iterator().next());
     }
 }

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.xml.sax.SAXException;
 
@@ -280 +279 @@
             assertEquals(w.id, way.id);
             assertEquals(false, way.incomplete);
-            assertEquals(10, w.nodes.size());
+            assertEquals(10, w.getNodesCount());
         }
     }
@@ -326 +325 @@
         for (Way way: referers.ways) {
             Way orig = (Way)ds.getPrimitiveById(way.id);
-            for(Node n: orig.nodes) {
+            for(Node n: orig.getNodes()) {
                 expectedNodeIds.add(n.id);
             }
@@ -417 +416 @@
         HashSet<Long> ret = new HashSet<Long>();
         if (way == null)return ret;
-        for (Node n: way.nodes) {
+        for (Node n: way.getNodes()) {
             ret.add(n.id);
         }