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

Timestamp:

2016-07-22T23:03:22+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, fix #13120 - Use a new memory manager for imagery layers (patch by michael2402) - gsoc-core - requires java 8

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• testutils/JOSMTestRules.java (modified) (5 diffs)
• tools/MemoryManagerTest.java (added)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.MemoryManagerTest;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -39 +40 @@
     private boolean platform;
     private boolean useProjection;
+    private boolean allowMemoryManagerLeaks;
 
     /**
@@ -130 +132 @@
     public JOSMTestRules projection() {
         useProjection = true;
+        return this;
+    }
+
+    /**
+     * Allow the memory manager to contain items after execution of the test cases.
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules memoryManagerLeaks() {
+        allowMemoryManagerLeaks = true;
         return this;
     }
@@ -218 +229 @@
     @SuppressFBWarnings("DM_GC")
     private void cleanUpFromJosmFixture() {
+        MemoryManagerTest.resetState(true);
         Main.getLayerManager().resetState();
         Main.pref = null;
@@ -237 +249 @@
         // Remove all layers
         Main.getLayerManager().resetState();
+        MemoryManagerTest.resetState(allowMemoryManagerLeaks);
 
         // TODO: Remove global listeners and other global state.