Changeset 11109 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2016-10-09T04:03:32+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1871 - Two branches in the same conditional structure should not have exactly the same implementation

Location:

trunk/test/unit/org/openstreetmap/josm/actions

Files:

• MergeNodesActionTest.java (modified) (2 diffs)
• SessionSaveAsActionTest.java (added)

trunk/test/unit/org/openstreetmap/josm/actions/MergeNodesActionTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.util.Arrays;
@@ -46 +47 @@
 
     /**
-     * Unit test of {@link MergeNodesAction#selectTargetLocationNode} - mode 0
+     * Unit test of {@link MergeNodesAction#selectTargetLocationNode}
      */
     @Test
-    public void testSelectTargetLocationNodeMode0() {
+    public void testSelectTargetLocationNode() {
         Main.pref.putInteger("merge-nodes.mode", 0);
         assertEquals(1, MergeNodesAction.selectTargetLocationNode(Arrays.asList(new Node(0), new Node(1))).getId());
-    }
 
-    /**
-     * Unit test of {@link MergeNodesAction#selectTargetLocationNode} - mode 1
-     */
-    @Test
-    public void testSelectTargetLocationNodeMode1() {
         Main.pref.putInteger("merge-nodes.mode", 1);
         assertEquals(LatLon.ZERO, MergeNodesAction.selectTargetLocationNode(
                 Arrays.asList(new Node(LatLon.NORTH_POLE), new Node(LatLon.SOUTH_POLE))).getCoor());
-    }
 
-    /**
-     * Unit test of {@link MergeNodesAction#selectTargetLocationNode} - mode 2 with a single node
-     */
-    @Test
-    public void testSelectTargetLocationNodeMode2SingleNode() {
         Main.pref.putInteger("merge-nodes.mode", 2);
         assertEquals(LatLon.NORTH_POLE, MergeNodesAction.selectTargetLocationNode(
                 Arrays.asList(new Node(LatLon.NORTH_POLE))).getCoor());
     }
+
+    /**
+     * Unit test of {@link MergeNodesAction#selectTargetNode}
+     */
+    @Test
+    public void testSelectTargetNode() {
+        assertNull(MergeNodesAction.selectTargetNode(Collections.emptyList()));
+        assertEquals(1, MergeNodesAction.selectTargetNode(Arrays.asList(new Node(1))).getId());
+    }
 }