Changeset 7535 in josm

Timestamp:

2014-09-14T19:42:23+02:00 (10 years ago)

Author:

Don-vip

Message:

fix unit test

Location:

trunk/test

Files:

• performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.groovy (modified) (2 diffs)
• unit/org/openstreetmap/josm/JOSMFixture.java (modified) (3 diffs)
• unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (modified) (2 diffs)
• unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (modified) (2 diffs)

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.groovy

@@ -9 +9 @@
 import org.junit.*
 import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.Main
 import org.openstreetmap.josm.data.Bounds
 import org.openstreetmap.josm.data.osm.DataSet
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer
-import org.openstreetmap.josm.gui.MainApplication
 import org.openstreetmap.josm.gui.NavigatableComponent
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles
 import org.openstreetmap.josm.gui.preferences.SourceEntry
-import org.openstreetmap.josm.gui.preferences.ToolbarPreferences
 import org.openstreetmap.josm.io.Compression
 import org.openstreetmap.josm.io.OsmReader
@@ -51 +48 @@
     @BeforeClass
     public static void createJOSMFixture() {
-        JOSMFixture.createPerformanceTestFixture().init();
-        Main.toolbar = new ToolbarPreferences();
-        new MainApplication();
+        JOSMFixture.createPerformanceTestFixture().init(true);
     }
 

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.I18n;
@@ -52 +54 @@
 
     /**
-     * Initializes the test fixture.
+     * Initializes the test fixture, without GUI.
      */
     public void init() {
+        init(false);
+    }
+
+    /**
+     * Initializes the test fixture, with or without GUI.
+     * @param createGui if {@code true} creates main GUI components
+     */
+    public void init(boolean createGui) {
 
         // check josm.home
@@ -89 +99 @@
             fail(MessageFormat.format("configured server url ''{0}'' seems to be a productive url, aborting.", url));
         }
+
+        if (createGui) {
+            if (Main.toolbar == null) {
+                Main.toolbar = new ToolbarPreferences();
+            }
+            if (Main.main == null) {
+                new MainApplication();
+            }
+            if (Main.map == null) {
+                Main.main.createMapFrame(null, null);
+            }
+        }
     }
 }

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

@@ -12 +12 @@
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
@@ -28 +26 @@
     @BeforeClass
     public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-        Main.toolbar = new ToolbarPreferences();
-        new MainApplication();
-        Main.main.createMapFrame(null, null);
+        JOSMFixture.createUnitTestFixture().init(true);
     }
 

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

@@ -12 +12 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -79 +76 @@
     @BeforeClass
     public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
+        JOSMFixture.createUnitTestFixture().init(true);
         ProjectionPreference.setProjection();
-        Main.toolbar = new ToolbarPreferences();
-        new MainApplication();
-        Main.main.createMapFrame(null, null);
     }