Changeset 1910 in josm for trunk/test/functional

Timestamp:

2009-08-05T08:19:02+02:00 (15 years ago)

Author:

jttt

Message:

Way refactoring - finish replacing Way.nodes with the new api

Location:

trunk/test/functional/org/openstreetmap/josm

Files:

• gui/conflict/nodes/NodeListMergerTest.java (modified) (3 diffs)
• gui/dialogs/ConflictResolutionDialogTest.java (modified) (1 diff)
• io/MultiFetchServerObjectReaderTest.java (modified) (1 diff)
• io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java

@@ -17 +17 @@
         Way w1 = new Way();
         Node n1;
-        w1.nodes.add(n1 = new Node(1));
+        w1.addNode(n1 = new Node(1));
         for (int i=0; i < 20; i++) {
             n1.put("key" + i, "value" + i);
@@ -26 +26 @@
         }
         n1.put("note", note);
-        w1.nodes.add(new Node(2));
-        w1.nodes.add(new Node(3));
+        w1.addNode(new Node(2));
+        w1.addNode(new Node(3));
 
         Way w2 = new Way();
-        w2.nodes.add(new Node(4));
-        w2.nodes.add(new Node(5));
-        w2.nodes.add(new Node(6));
+        w2.addNode(new Node(4));
+        w2.addNode(new Node(5));
+        w2.addNode(new Node(6));
 
         nodeListMerger.populate(w1, w2);
@@ -41 +41 @@
         Way w1 = new Way();
         for (int i = 0; i < 100; i++) {
-            w1.nodes.add(new Node(i));
+            w1.addNode(new Node(i));
         }
 
         Way w2 = new Way();
         for (int i = 1; i < 200; i+=2) {
-            w2.nodes.add(new Node(i));
+            w2.addNode(new Node(i));
         }
         nodeListMerger.populate(w1, w2);

trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java

@@ -10 +10 @@
 
     private ConflictResolutionDialog dialog;
-    
+
     protected void build() {
         setSize(100,100);
         dialog = new ConflictResolutionDialog(this);
         dialog.setSize(600,600);
-        
-        
+
+
     }
     protected void populate() {
         Way w1 = new Way(1);
-          w1.nodes.add(new Node(10));
-          w1.nodes.add(new Node(11));
-        
+          w1.addNode(new Node(10));
+          w1.addNode(new Node(11));
+
         Way w2 = new Way(1);
-          w2.nodes.add(new Node(10));
-          w2.nodes.add(new Node(11));
-    
+          w2.addNode(new Node(10));
+          w2.addNode(new Node(11));
+
        dialog.getConflictResolver().populate(w1, w2);
     }
-    
+
     public void showDialog() {
         dialog.setVisible(true);
     }
-    
+
     public ConflictResolutionDialogTest() {
         build();
     }
-    
+
     static public void main(String args[]) {
         ConflictResolutionDialogTest test = new ConflictResolutionDialogTest();

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

@@ -76 +76 @@
                 int idx = (start + j) % numNodes;
                 Node n = nodes.get(idx);
-                w.nodes.add(n);
+                w.addNode(n);
             }
             w.put("name", "way-"+i);

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

@@ -74 +74 @@
             w.incomplete = false;
             for (int j = 0; j < 10;j++) {
-                w.nodes.add(lookupNode(ds, i+j));
+                w.addNode(lookupNode(ds, i+j));
             }
             w.put("name", "way-"+i);