Changeset 158 in josm for test/org/openstreetmap/josm

Timestamp:

2006-10-08T21:45:13+02:00 (18 years ago)

Author:

imi

Message:

• added possibility to support a locale in .josm/lang/*.jar
• fixed bug that displayed the layer's context menu at wrong place

Location:

test/org/openstreetmap/josm

Files:

• data/osm/visitor/AllNodesVisitorTest.java (modified) (3 diffs)
• testframework/MotherObject.java (modified) (1 diff)

test/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitorTest.java

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.LinkedList;
 
@@ -31 +30 @@
                 s.visit(v);
                 assertEquals(2, v.nodes.size());
-                Iterator<Node> it = v.nodes.iterator();
-                assertSame(s.from, it.next());
-                assertSame(s.to, it.next());
+                assertTrue(v.nodes.contains(s.from));
+                assertTrue(v.nodes.contains(s.to));
         }
 
@@ -41 +39 @@
                 int numberOfNodes = 2*w.segments.size();
                 assertEquals(numberOfNodes, v.nodes.size());
-                Iterator<Node> itNodes = v.nodes.iterator();
-                Iterator<Segment> it = w.segments.iterator();
-                for (int i = 0; i < numberOfNodes; ++i)
-                        assertSame(i%2==0?it.next().from:it.next().to, itNodes.next());
+                for (Segment s : w.segments) {
+                        assertTrue(v.nodes.contains(s.from));
+                        assertTrue(v.nodes.contains(s.to));
+                }
         }
 

test/org/openstreetmap/josm/testframework/MotherObject.java

@@ -90 +90 @@
                 assertEquals(0, copy.size());
     }
+        
+        /**
+         * To have JUnit shut up.
+         */
+        public void test() {
+        }
 }