Changeset 12069 in josm for trunk/test

Timestamp:

2017-05-06T14:10:40+02:00 (7 years ago)

Author:

michael2402

Message:

Fix #14737: Preserve selection order and add comments that it is ordered. Add unit tests.

File:

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

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

@@ -5 +5 @@
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -124 +125 @@
         ds.unlinkNodeFromWays(n2);
     }
+
+    /**
+     * Test the selection order.
+     * See <a href="https://josm.openstreetmap.de/ticket/14737">#14737</a>
+     * @since 12069
+     */
+    @Test
+    public void testSelectionOrderPreserved() {
+        final DataSet ds = new DataSet();
+        Node n1 = new Node(1);
+        Node n2 = new Node(2);
+        Node n3 = new Node(3);
+        ds.addPrimitive(n1);
+        ds.addPrimitive(n2);
+        ds.addPrimitive(n3);
+
+        assertEquals(Arrays.asList(), new ArrayList<>(ds.getSelected()));
+
+        ds.setSelected(n1.getPrimitiveId(), n2.getPrimitiveId());
+        assertEquals(Arrays.asList(n1, n2), new ArrayList<>(ds.getSelected()));
+
+        ds.clearSelection();
+        assertEquals(Arrays.asList(), new ArrayList<>(ds.getSelected()));
+
+        ds.addSelected(n3.getPrimitiveId());
+        ds.addSelected(n1.getPrimitiveId(), n2.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n1, n2), new ArrayList<>(ds.getSelected()));
+
+        ds.addSelected(n3.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n1, n2), new ArrayList<>(ds.getSelected()));
+
+        ds.clearSelection(n1.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n2), new ArrayList<>(ds.getSelected()));
+
+        ds.toggleSelected(n1.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n2, n1), new ArrayList<>(ds.getSelected()));
+
+        ds.toggleSelected(n2.getPrimitiveId());
+        assertEquals(Arrays.asList(n3, n1), new ArrayList<>(ds.getSelected()));
+
+    }
 }