Changeset 11781 in josm for trunk

Timestamp:

2017-03-26T13:52:10+02:00 (8 years ago)

Author:

michael2402

Message:

Update StyleCacheTest: Clear the style cache before each test. Add documentation.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (modified) (2 diffs)
• test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -254 +254 @@
     }
 
+    /**
+     * Reloads all styles from the preferences.
+     */
     public static void readFromPreferences() {
         styles.clear();

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -49 +49 @@
     }
 
+    /**
+     * Get the style for a specific style. Returns the range as well.
+     * @param scale The current scale
+     * @param selected true to get the state for a selected element,
+     * @return The style and the range it is valid for.
+     */
     public Pair<StyleElementList, Range> getWithRange(double scale, boolean selected) {
         int idx = getIndex(selected);
@@ -88 +94 @@
 
     /**
+     * Clears the style cache. This should only be used for testing.
+     * It may be removed some day and replaced by a WeakReference implementation that automatically forgets old entries.
+     */
+    static void clearStyleCachePool() {
+        internPool.clear();
+    }
+
+    /**
      * Get the size of the intern pool. Only for tests!
      * @return size of the intern pool

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java

@@ -17 +17 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -53 +52 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().platform().projection().mapStyles();
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform().projection().mapStyles().timeout(60000);
 
     /**
@@ -112 +111 @@
     @Test
     public void testStyleCacheInternPool() {
-        // This can be removed if there was no dependency on Main.map in some MapCSS conditions. See #14572
-        JOSMFixture.createFunctionalTestFixture().init(true);
-
+        StyleCache.clearStyleCachePool();
         Bounds bounds = new Bounds(53.56, 13.25, 53.57, 13.26);
         Rendering visitor = new StyledMapRenderer(g, nc, false);
@@ -141 +138 @@
     @Test
     public void testStyleCacheInternPool2() {
-        // This can be removed if there was no dependency on Main.map in some MapCSS conditions. See #14572
-        JOSMFixture.createFunctionalTestFixture().init(true);
-
+        StyleCache.clearStyleCachePool();
         Bounds bounds = new Bounds(53.56, 13.25, 53.57, 13.26);
         Rendering visitor = new StyledMapRenderer(g, nc, false);