Changeset 16547 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm

Timestamp:

2020-06-07T11:48:36+02:00 (4 years ago)

Author:

simon04

Message:

Revert "Simplify QuadBucketsTest"

Tests iterator implementation.

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java

@@ -53 +53 @@
         for (OsmPrimitive o: allNodes) {
             ds.removePrimitive(o);
-            Assert.assertEquals(--expectedCount, nodes.size());
+            checkIterator(nodes, --expectedCount);
         }
         expectedCount = allWays.size();
         for (OsmPrimitive o: allWays) {
             ds.removePrimitive(o);
-            Assert.assertEquals(--expectedCount, ways.size());
+            checkIterator(ways, --expectedCount);
         }
         for (OsmPrimitive o: allRelations) {
@@ -66 +66 @@
         Assert.assertTrue(ways.isEmpty());
         Assert.assertTrue(relations.isEmpty());
+    }
+
+    private void checkIterator(Iterable<? extends OsmPrimitive> col, int expectedCount) {
+        int count = 0;
+        Iterator<? extends OsmPrimitive> it = col.iterator();
+        while (it.hasNext()) {
+            count++;
+            it.next();
+        }
+        Assert.assertEquals(expectedCount, count);
     }