Changeset 2388 in josm for trunk/test

Timestamp:

2009-11-02T21:04:32+01:00 (16 years ago)

Author:

jttt

Message:

Replace Dataset.nodes with getNodes(), etc

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (4 diffs)
• unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) (1 diff)

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

@@ -15 +15 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -241 +240 @@
     public void testMultiGet10Nodes() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.nodes);
+        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
         for (int i =0; i< 10; i++) {
             reader.append(nodes.get(i));
@@ -247 +246 @@
         DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE);
         assertEquals(10, out.getNodes().size());
-        Iterator<Node> it = out.nodes.iterator();
-        while(it.hasNext()) {
-            Node n1 = it.next();
+        for (Node n1:out.getNodes()) {
             Node n2 = (Node)ds.getPrimitiveById(n1.getId(), OsmPrimitiveType.NODE);
             assertNotNull(n2);
@@ -302 +299 @@
         DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE);
         assertEquals(812, out.getNodes().size());
-        Iterator<Node> it = out.nodes.iterator();
-        while(it.hasNext()) {
-            Node n1 = it.next();
+        for (Node n1:out.getNodes()) {
             Node n2 = (Node)ds.getPrimitiveById(n1.getId(), OsmPrimitiveType.NODE);
             assertNotNull(n2);

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

@@ -332 +332 @@
         RelationMember m = new RelationMember("node-20", lookupByName(hull.getNodes(), "n20"));
         assertTrue(r.getMembers().contains(m));
-        m = new RelationMember("way-30", lookupByName(hull.ways, "w30"));
-        assertTrue(r.getMembers().contains(m));
-        m = new RelationMember("relation-40", lookupByName(hull.relations, "r40"));
+        m = new RelationMember("way-30", lookupByName(hull.getWays(), "w30"));
+        assertTrue(r.getMembers().contains(m));
+        m = new RelationMember("relation-40", lookupByName(hull.getRelations(), "r40"));
         assertTrue(r.getMembers().contains(m));
     }