Changeset 12070 in josm

Timestamp:

2017-05-06T14:27:02+02:00 (8 years ago)

Author:

michael2402

Message:

Reset the SelectionEventManager listeners for each test.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

@@ -147 +147 @@
         }
     };
+
+    /**
+     * Only to be used during unit tests, to reset the state. Do not use it in plugins/other code.
+     * Called after the layer manager was reset by the test framework.
+     */
+    public void resetState() {
+        inEDTListeners.clear();
+        normalListeners.clear();
+        Main.getLayerManager().addAndFireActiveLayerChangeListener(this);
+    }
 }

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

@@ -21 +21 @@
 import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -140 +141 @@
 
     private void setupGUI() {
-        Main.getLayerManager().resetState();
+        JOSMTestRules.cleanLayerEnvironment();
         assertTrue(Main.getLayerManager().getLayers().isEmpty());
         assertNull(Main.getLayerManager().getEditLayer());

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

@@ -15 +15 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -286 +287 @@
     private void cleanUpFromJosmFixture() {
         MemoryManagerTest.resetState(true);
-        Main.getLayerManager().resetState();
+        cleanLayerEnvironment();
         Main.pref.resetToInitialState();
         Main.platform = null;
         System.gc();
+    }
+
+    /**
+     * Cleans the Layer manager and the SelectionEventManager.
+     * You don't need to call this during tests, the test environment will do it for you.
+     * @since 12070
+     */
+    public static void cleanLayerEnvironment() {
+        // Get the instance before cleaning - this ensures that it is initialized.
+        SelectionEventManager eventManager = SelectionEventManager.getInstance();
+        Main.getLayerManager().resetState();
+        eventManager.resetState();
     }
 
@@ -304 +317 @@
         });
         // Remove all layers
-        Main.getLayerManager().resetState();
+        cleanLayerEnvironment();
         MemoryManagerTest.resetState(allowMemoryManagerLeaks);