Changeset 11973 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java

Timestamp:

2017-04-22T15:23:07+02:00 (7 years ago)

Author:

Don-vip

Message:

add unit tests

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.Date;
+import java.util.Iterator;
 import java.util.Set;
 
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetDataSetEntry;
 import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
@@ -38 +44 @@
         try {
             cds.getPrimitivesByModificationType(null);
-            Assert.fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
+            fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
         } catch (IllegalArgumentException e) {
             Main.trace(e);
@@ -45 +51 @@
 
         // empty object, a modification type => empty list
-        Assert.assertTrue(
+        assertTrue(
             "Empty data set should produce an empty list.",
             cds.getPrimitivesByModificationType(
@@ -61 +67 @@
         Set<HistoryOsmPrimitive> result = cds.getPrimitivesByModificationType(
                     ChangesetModificationType.CREATED);
-        Assert.assertEquals("We should have found only one item.", 1, result.size());
-        Assert.assertTrue("The item found is prim1.", result.contains(prim1));
+        assertEquals("We should have found only one item.", 1, result.size());
+        assertTrue("The item found is prim1.", result.contains(prim1));
+    }
+
+    /**
+     * Unit test of method {@link ChangesetDataSet#iterator}.
+     */
+    @Test
+    public void testIterator() {
+        final ChangesetDataSet cds = new ChangesetDataSet();
+        HistoryNode prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
+        cds.put(prim1, ChangesetModificationType.CREATED);
+        Iterator<ChangesetDataSetEntry> it = cds.iterator();
+        assertTrue(it.hasNext());
+        ChangesetDataSetEntry cdse = it.next();
+        assertEquals(ChangesetModificationType.CREATED, cdse.getModificationType());
+        assertEquals(prim1, cdse.getPrimitive());
+        assertFalse(it.hasNext());
     }
 }