Changeset 10663 in josm for trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java

Timestamp:

2016-07-28T01:24:39+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13223 - Minor command class fixes (patch by michael2402, modified) - gsoc-core

File:

• trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java (modified) (2 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.command;
 
-import org.junit.BeforeClass;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
@@ -18 +30 @@
 
     /**
-     * Setup test.
+     * We need prefs for nodes.
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init(false);
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+    private CommandTestDataWithRelation testData;
+
+    /**
+     * Set up the test data.
+     */
+    @Before
+    public void createTestData() {
+        testData = new CommandTestDataWithRelation();
+    }
+
+    /**
+     * Test {@link SelectCommand#executeCommand()}
+     */
+    @Test
+    public void testExecute() {
+        SelectCommand command = new SelectCommand(Arrays.asList(testData.existingNode, testData.existingWay));
+
+        testData.layer.data.setSelected(Arrays.asList(testData.existingNode2));
+
+        command.executeCommand();
+
+        assertTrue(testData.existingNode.isSelected());
+        assertFalse(testData.existingNode2.isSelected());
+        assertTrue(testData.existingWay.isSelected());
+    }
+
+    /**
+     * Test {@link SelectCommand#executeCommand()}
+     */
+    @Test
+    public void testExecuteAfterModify() {
+        List<OsmPrimitive> list = new ArrayList<>(Arrays.asList(testData.existingNode, testData.existingWay));
+        SelectCommand command = new SelectCommand(list);
+
+        list.remove(testData.existingNode);
+        list.add(testData.existingNode2);
+
+        command.executeCommand();
+
+        assertTrue(testData.existingNode.isSelected());
+        assertFalse(testData.existingNode2.isSelected());
+        assertTrue(testData.existingWay.isSelected());
+    }
+
+    /**
+     * Test {@link SelectCommand#undoCommand()}
+     */
+    @Test
+    public void testUndo() {
+        SelectCommand command = new SelectCommand(Arrays.asList(testData.existingNode, testData.existingWay));
+        testData.layer.data.setSelected(Arrays.asList(testData.existingNode2));
+
+        command.executeCommand();
+
+        command.undoCommand();
+
+        assertFalse(testData.existingNode.isSelected());
+        assertTrue(testData.existingNode2.isSelected());
+        assertFalse(testData.existingWay.isSelected());
+
+        command.executeCommand();
+
+        assertTrue(testData.existingNode.isSelected());
+        assertFalse(testData.existingNode2.isSelected());
+        assertTrue(testData.existingWay.isSelected());
+    }
+
+    /**
+     * Tests {@link SelectCommand#fillModifiedData(java.util.Collection, java.util.Collection, java.util.Collection)}
+     */
+    @Test
+    public void testFillModifiedData() {
+        ArrayList<OsmPrimitive> modified = new ArrayList<>();
+        ArrayList<OsmPrimitive> deleted = new ArrayList<>();
+        ArrayList<OsmPrimitive> added = new ArrayList<>();
+        SelectCommand command = new SelectCommand(Arrays.asList(testData.existingNode, testData.existingWay));
+        command.fillModifiedData(modified, deleted, added);
+        // intentionally empty.
+        assertArrayEquals(new Object[] {}, modified.toArray());
+        assertArrayEquals(new Object[] {}, deleted.toArray());
+        assertArrayEquals(new Object[] {}, added.toArray());
+    }
+
+    /**
+     * Tests {@link SelectCommand#getParticipatingPrimitives()}
+     */
+    @Test
+    public void testGetParticipatingPrimitives() {
+        SelectCommand command = new SelectCommand(Arrays.asList(testData.existingNode, testData.existingWay));
+        command.executeCommand();
+        assertArrayEquals(new Object[] {}, command.getParticipatingPrimitives().toArray());
+    }
+
+    /**
+     * Test {@link SelectCommand#getDescriptionText()}
+     */
+    @Test
+    public void testDescription() {
+        assertTrue(new SelectCommand(Arrays.<OsmPrimitive>asList(testData.existingNode))
+                .getDescriptionText().matches("Selected 1 object"));
+        assertTrue(new SelectCommand(Arrays.asList(testData.existingNode, testData.existingWay))
+                .getDescriptionText().matches("Selected 2 objects"));
+        assertTrue(new SelectCommand(Arrays.<OsmPrimitive>asList())
+                .getDescriptionText().matches("Selected 0 objects"));
+        assertTrue(new SelectCommand(null)
+                .getDescriptionText().matches("Selected 0 objects"));
     }