Changeset 12563 in josm for trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

Timestamp:

2017-08-03T21:43:11+02:00 (7 years ago)

Author:

Don-vip

Message:

fix unit tests

File:

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

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

@@ -151 +151 @@
 
         initContentPane();
-        initMainPanel();
+        initMainPanel(false);
         initToolbar();
         if (Main.main == null) {
@@ -157 +157 @@
         } else {
             if (Main.main.panel == null) {
-                initMainPanel();
+                initMainPanel(false);
                 Main.main.panel = Main.mainPanel;
             }
@@ -177 +177 @@
     /**
      * Make sure {@code Main.mainPanel} is initialized.
+     * @param reAddListeners {@code true} to re-add listeners
      */
-    public static void initMainPanel() {
+    public static void initMainPanel(boolean reAddListeners) {
         if (Main.mainPanel == null) {
             Main.mainPanel = new MainPanel(Main.getLayerManager());
+        }
+        if (reAddListeners) {
+            Main.mainPanel.reAddListeners();
         }
     }