Changeset 2381 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

Timestamp:

2009-11-02T07:51:28+01:00 (14 years ago)

Author:

jttt

Message:

Change most occurrences of Dataset.nodes/ways/relations with getNodes()/../.. or addPrimitive

File:

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

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

@@ -8 +8 @@
 
 import java.io.File;
-import java.net.URLEncoder;
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -358 +357 @@
         Node n2 = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE);
         assertEquals(0,visitor.getConflicts().size());
-        assertEquals(2,my.nodes.size());
+        assertEquals(2, my.getNodes().size());
         assertEquals(n,n2);
     }
@@ -402 +401 @@
         visitor.merge();
 
-        Node n2 = my.nodes.iterator().next();
+        Node n2 = my.getNodes().iterator().next();
         assertEquals(0,visitor.getConflicts().size());
         assertEquals("value1",n2.get("key1"));
@@ -440 +439 @@
         visitor.merge();
 
-        Node n2 = my.nodes.iterator().next();
+        Node n2 = my.getNodes().iterator().next();
         assertEquals(0,visitor.getConflicts().size());
         assertEquals("value1",n2.get("key1"));