Changeset 14542 in josm

Timestamp:

2018-12-09T23:58:32+01:00 (7 years ago)

Author:

Don-vip

Message:

see #17040 - fix unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java (modified) (6 diffs)
• test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -130 +130 @@
         if (!isEnabled())
             return;
-
-        DataSet ds = getLayerManager().getEditDataSet();
+        runOn(getLayerManager().getEditDataSet());
+    }
+
+    /**
+     * Run the action on the given dataset.
+     * @param ds dataset
+     * @since 14542
+     */
+    public static void runOn(DataSet ds) {
         Collection<OsmPrimitive> sel = ds.getSelected();
         List<Node> nodes = OsmPrimitive.getFilteredList(sel, Node.class);

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -26 +26 @@
 import org.openstreetmap.josm.command.SplitWayCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
@@ -66 +67 @@
     @Override
     public void actionPerformed(ActionEvent e) {
+        runOn(getLayerManager().getEditDataSet());
+    }
+
+    /**
+     * Run the action on the given dataset.
+     * @param ds dataset
+     * @since 14542
+     */
+    public static void runOn(DataSet ds) {
 
         if (SegmentToKeepSelectionDialog.DISPLAY_COUNT.get() > 0) {
@@ -73 +83 @@
         }
 
-        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
+        Collection<OsmPrimitive> selection = ds.getSelected();
 
         List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
@@ -284 +294 @@
         List<? extends PrimitiveId> newSel = result.getNewSelection();
         if (newSel != null && !newSel.isEmpty()) {
-            MainApplication.getLayerManager().getEditDataSet().setSelected(newSel);
+            way.getDataSet().setSelected(newSel);
         }
     }

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.GeoProperty;
@@ -38 +36 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().projection().main();
+    public JOSMTestRules test = new JOSMTestRules().projection();
 
     /**
@@ -49 +47 @@
     public void testTicket7421case0() throws ReflectiveOperationException {
         DataSet dataSet = new DataSet();
-        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
 
         Node n1 = new Node(new EastNorth(0, 0));
@@ -64 +61 @@
         dataSet.addSelected(w);
 
-        CreateCircleAction action = new CreateCircleAction();
-        action.setEnabled(true);
-        try {
-            MainApplication.getLayerManager().addLayer(layer);
-            action.actionPerformed(null);
-        } finally {
-            // Ensure we clean the place before leaving, even if test fails.
-            MainApplication.getLayerManager().removeLayer(layer);
-        }
+        CreateCircleAction.runOn(dataSet);
 
         // Expected result: Dataset contain one closed way, clockwise
@@ -115 +104 @@
     public void testTicket7421case1() throws ReflectiveOperationException {
         DataSet dataSet = new DataSet();
-        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
 
         Node n1 = new Node(new EastNorth(0, 0));
@@ -135 +123 @@
 
         try {
-            CreateCircleAction action = new CreateCircleAction();
-            action.setEnabled(true);
-            try {
-                MainApplication.getLayerManager().addLayer(layer);
-                action.actionPerformed(null);
-            } finally {
-                // Ensure we clean the place before leaving, even if test fails.
-                MainApplication.getLayerManager().removeLayer(layer);
-            }
+            CreateCircleAction.runOn(dataSet);
 
             // Expected result: Dataset contain one closed way, clockwise

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

@@ -7 +7 @@
 import java.util.Arrays;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -14 +13 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -25 +22 @@
 public final class SplitWayActionTest {
 
-    /** Class under test. */
-    private static SplitWayAction action;
-
     /**
      * Setup test.
@@ -33 +27 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().projection();
-
-    /**
-     * Setup test.
-     */
-    @Before
-    public void setUp() {
-        if (action == null) {
-            action = MainApplication.getMenu().splitWay;
-            action.setEnabled(true);
-        }
-    }
+    public JOSMTestRules test = new JOSMTestRules().projection();
 
     /**
@@ -53 +36 @@
     public void testTicket11184() {
         DataSet dataSet = new DataSet();
-        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
 
         Node n1 = new Node(new EastNorth(0, 0));
@@ -81 +63 @@
         dataSet.addSelected(w2);
 
-        try {
-            MainApplication.getLayerManager().addLayer(layer);
-            action.actionPerformed(null);
-        } finally {
-            // Ensure we clean the place before leaving, even if test fails.
-            MainApplication.getLayerManager().removeLayer(layer);
-        }
+        SplitWayAction.runOn(dataSet);
 
         // Ensures 3 ways.