Changeset 11609 in josm for trunk/test

Timestamp:

2017-02-25T12:52:18+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14410 - AddPrimitivesCommand undo remove existing data (patch by Tyndare)

File:

• trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java

@@ -176 +176 @@
 
     /**
+     * Tests if the undo command does not remove
+     * data ignored by by the add command because they where already existing.
+     */
+    @Test
+    public void testUndoIgnoresExisting() {
+        OsmDataLayer layer1 = new OsmDataLayer(new DataSet(), "l1", null);
+        Main.getLayerManager().addLayer(layer1);
+
+        List<PrimitiveData> testData = createTestData();
+
+        assertTrue(new AddPrimitivesCommand(testData).executeCommand());
+        assertEquals(2, layer1.data.getNodes().size());
+        assertEquals(1, layer1.data.getWays().size());
+
+        testData.set(2, createTestNode(7));
+
+        AddPrimitivesCommand command = new AddPrimitivesCommand(testData);
+
+        assertTrue(command.executeCommand());
+
+        assertEquals(3, layer1.data.getNodes().size());
+        assertEquals(1, layer1.data.getWays().size());
+
+        for (int i = 0; i < 2; i++) {
+            // Needs to work multiple times.
+            command.undoCommand();
+
+            assertEquals(2, layer1.data.getNodes().size());
+            assertEquals(1, layer1.data.getWays().size());
+
+            // redo
+            assertTrue(command.executeCommand());
+
+            assertEquals(3, layer1.data.getNodes().size());
+            assertEquals(1, layer1.data.getWays().size());
+        }
+    }
+
+    /**
      * Test {@link AddCommand#getParticipatingPrimitives()}
      */