Changeset 11021 in josm for trunk

Timestamp:

2016-09-18T15:56:38+02:00 (8 years ago)

Author:

Don-vip

Message:

clear image provider cache before/after integration tests. The previous Jenkins job heap dump revealed it contained 14.000 entries and consumed up to 3Gb of memory

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -766 +766 @@
 
     /**
+     * Clears the internal image cache.
+     * @since 11021
+     */
+    public static void clearCache() {
+        synchronized (cache) {
+            cache.clear();
+        }
+    }
+
+    /**
      * Internal implementation of the image request.
      *

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -53 +54 @@
     @Test
     public void testValidityOfAvailableStyles() throws Exception {
+        ImageProvider.clearCache();
         Collection<ExtendedSourceEntry> sources = new MapPaintPreference.MapPaintSourceEditor()
                 .loadAndGetAvailableSources();
@@ -97 +99 @@
             }
         }
+        ImageProvider.clearCache();
         assertTrue(allErrors.toString()+"\n"+allWarnings.toString(), allErrors.isEmpty() && allWarnings.isEmpty());
     }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.xml.sax.SAXException;
 
@@ -50 +51 @@
     @Test
     public void testValidityOfAvailablePresets() throws Exception {
+        ImageProvider.clearCache();
         Collection<ExtendedSourceEntry> sources = new TaggingPresetPreference.TaggingPresetSourceEditor()
                 .loadAndGetAvailableSources();
@@ -84 +86 @@
             }
         }
+        ImageProvider.clearCache();
         assertTrue(allErrors.toString(), allErrors.isEmpty());
         assertTrue(allMessages.toString(), allMessages.isEmpty());