Changeset 14946 in josm for trunk/test

Timestamp:

2019-04-01T07:46:58+02:00 (6 years ago)

Author:

GerdP

Message:

see #17459: remove duplicated code in reverter corehacks
Step 1: Add needed code to core methods.
Major changes:
1) If a changeset contains multiple versions for a primitive, class ChangesetDataSet keeps the first and the last version (not just the last) and provides methods to access them, unused method getPrimitivesByModificationType() was removed
2) The changeset reader classes have a new field useAnonymousUser. If set, the user found in a changeset is replaced by the anonymous user.

File:

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

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

@@ -9 +9 @@
 import java.util.Date;
 import java.util.Iterator;
-import java.util.Set;
 
 import org.junit.Rule;
@@ -18 +17 @@
 import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
-import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Logging;
@@ -35 +33 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
-
-    /**
-     * Unit test of method {@link ChangesetDataSet#getPrimitivesByModificationType}.
-     */
-    @Test
-    public void testGetPrimitivesByModificationType() {
-        final ChangesetDataSet cds = new ChangesetDataSet();
-        // empty object, null parameter => IllegalArgumentException
-        try {
-            cds.getPrimitivesByModificationType(null);
-            fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
-        } catch (IllegalArgumentException e) {
-            Logging.trace(e);
-            // Was expected
-        }
-
-        // empty object, a modification type => empty list
-        assertTrue(
-            "Empty data set should produce an empty list.",
-            cds.getPrimitivesByModificationType(
-                    ChangesetModificationType.CREATED).isEmpty()
-        );
-
-        // object with various items and modification types, fetch for CREATED
-        // => list containing only the CREATED item
-        HistoryNode prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
-        HistoryNode prim2 = new HistoryNode(2, 1, true, User.createLocalUser("test"), 1, new Date(), LatLon.NORTH_POLE);
-        HistoryNode prim3 = new HistoryNode(3, 1, true, User.getAnonymous(), 1, new Date(), LatLon.SOUTH_POLE);
-        cds.put(prim1, ChangesetModificationType.CREATED);
-        cds.put(prim2, ChangesetModificationType.DELETED);
-        cds.put(prim3, ChangesetModificationType.UPDATED);
-        Set<HistoryOsmPrimitive> result = cds.getPrimitivesByModificationType(
-                    ChangesetModificationType.CREATED);
-        assertEquals("We should have found only one item.", 1, result.size());
-        assertTrue("The item found is prim1.", result.contains(prim1));
-    }
 
     /**