Changeset 12562 in josm for trunk/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java

Timestamp:

2017-08-03T19:57:36+02:00 (7 years ago)

Author:

Don-vip

Message:

speedup unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -26 +27 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().commands();
+    public JOSMTestRules test = new JOSMTestRules().platform().mainMenu();
 
     private MergeLayerAction action;
@@ -35 +36 @@
     @Before
     public void setUp() {
+        try {
+            LayerListDialog.getInstance();
+        } catch (IllegalStateException e) {
+            LayerListDialog.createInstance(Main.getLayerManager());
+            Main.trace(e);
+        }
         if (action == null) {
             action = new MergeLayerAction();