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

Timestamp:

2016-06-20T00:06:54+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13001 - Add MainPanel + some new methods (patch by michael2402, modified) - gsoc-core

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• io/NoteImporterTest.java (modified) (2 diffs)
• testutils/JOSMTestRules.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java

@@ -7 +7 @@
 import java.io.File;
 
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 /**
@@ -18 +19 @@
 
     /**
+     * Use the test rules to remove any layers and reset state.
+     */
+    @Rule
+    public final JOSMTestRules rules = new JOSMTestRules();
+
+    /**
      * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12531">Bug #12531</a>.
      */
     @Test
     public void testTicket12531() {
-        if (Main.map != null) {
-            for (Layer l: Main.getLayerManager().getLayers()) {
-                Main.getLayerManager().removeLayer(l);
-            }
-            Main.main.setMapFrame(null);
-        }
+        Main.getLayerManager().resetState();
         assertNull(Main.map);
         assertTrue(new NoteImporter().importDataHandleExceptions(

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmApi;
@@ -223 +222 @@
         });
         // Remove all layers
-        MainLayerManager lm = Main.getLayerManager();
-        while (!lm.getLayers().isEmpty()) {
-            lm.removeLayer(lm.getLayers().get(0));
-        }
+        Main.getLayerManager().resetState();
 
         // TODO: Remove global listeners and other global state.