Changeset 10443 in josm for trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

Timestamp:

2016-06-20T23:57:32+02:00 (10 years ago)

Author:

Don-vip

Message:

see #12974 - Unit tests hang (patch by michael2402) - gsoc-core

File:

• trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (2 diffs)

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

@@ -157 +157 @@
      */
     protected void before() throws InitializationError {
+        cleanUpFromJosmFixture();
+
         // Tests are running headless by default.
         System.setProperty("java.awt.headless", "true");
@@ -212 +214 @@
 
     /**
+     * Clean up what test not using these test rules may have broken.
+     */
+    private void cleanUpFromJosmFixture() {
+        Main.getLayerManager().resetState();
+        Main.pref = null;
+        Main.platform = null;
+        Main.pref.put("osm-server.url", "invalid-server");
+        System.gc();
+    }
+
+    /**
      * Clean up after running a test
      */