Index: trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 3473)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 3476)
@@ -4,6 +4,10 @@
 import java.io.FileInputStream;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 
+import org.fest.reflect.core.Reflection;
+import org.fest.reflect.reference.TypeRef;
 import org.junit.Assert;
 import org.junit.Test;
@@ -20,17 +24,35 @@
         List<Way> allWays = new ArrayList<Way>(ds.getWays());
         List<Relation> allRelations = new ArrayList<Relation>(ds.getRelations());
+
+        QuadBuckets<Node> nodes = Reflection.field("nodes").ofType(new TypeRef<QuadBuckets<Node>>() {}).in(ds).get();
+        QuadBuckets<Way> ways = Reflection.field("ways").ofType(new TypeRef<QuadBuckets<Way>>() {}).in(ds).get();
+        Collection<Relation> relations = Reflection.field("relations").ofType(new TypeRef<Collection<Relation>>() {}).in(ds).get();
+
+        int expectedCount = allNodes.size();
         for (OsmPrimitive o: allNodes) {
             ds.removePrimitive(o);
+            checkIterator(nodes, --expectedCount);
         }
+        expectedCount = allWays.size();
         for (OsmPrimitive o: allWays) {
             ds.removePrimitive(o);
+            checkIterator(ways, --expectedCount);
         }
         for (OsmPrimitive o: allRelations) {
             ds.removePrimitive(o);
         }
+        Assert.assertTrue(nodes.isEmpty());
+        Assert.assertTrue(ways.isEmpty());
+        Assert.assertTrue(relations.isEmpty());
+    }
 
-        Assert.assertTrue(ds.getNodes().isEmpty());
-        Assert.assertTrue(ds.getWays().isEmpty());
-        Assert.assertTrue(ds.getRelations().isEmpty());
+    private void checkIterator(Collection<? extends OsmPrimitive> col, int expectedCount) {
+        int count = 0;
+        Iterator<? extends OsmPrimitive> it = col.iterator();
+        while (it.hasNext()) {
+            count++;
+            it.next();
+        }
+        Assert.assertEquals(expectedCount, count);
     }