Changeset 11781 in josm for trunk/test/functional

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.

File:

• trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java (modified) (4 diffs)

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);