Changeset 12350 in josm

Timestamp:

2017-06-09T00:03:23+02:00 (7 years ago)

Author:

michael2402

Message:

See #13036: Add data set tests to SelectCommand

Location:

trunk

Files:

• src/org/openstreetmap/josm/command/SelectCommand.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/command/SelectCommandTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/SelectCommand.java

@@ -59 +59 @@
     @Override
     public void undoCommand() {
+        ensurePrimitivesAreInDataset();
+
         getAffectedDataSet().setSelected(oldSelection);
     }
@@ -64 +66 @@
     @Override
     public boolean executeCommand() {
+        ensurePrimitivesAreInDataset();
+
         oldSelection = getAffectedDataSet().getSelected();
         getAffectedDataSet().setSelected(newSelection);
         return true;
+    }
+
+    @Override
+    public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
+        return Collections.unmodifiableCollection(newSelection);
     }
 

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

@@ -123 +123 @@
     @Test
     public void testGetParticipatingPrimitives() {
-        SelectCommand command = new SelectCommand(Arrays.asList(testData.existingNode, testData.existingWay));
+        SelectCommand command = new SelectCommand(Arrays.asList(testData.existingNode));
         command.executeCommand();
-        assertArrayEquals(new Object[] {}, command.getParticipatingPrimitives().toArray());
+        assertArrayEquals(new Object[] { testData.existingNode }, command.getParticipatingPrimitives().toArray());
     }