Changeset 14542 in josm for trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java

Timestamp:

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

Author:

Don-vip

Message:

see #17040 - fix unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (modified) (6 diffs)

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.