Changeset 11777 in josm for trunk

Timestamp:

2017-03-25T22:09:41+01:00 (7 years ago)

Author:

michael2402

Message:

See #14495 - move style source reset to JOSM test rules.

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java (modified) (2 diffs)
• unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (4 diffs)

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

@@ -53 +53 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().platform().projection();
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform().projection().mapStyles();
 
     /**
      * Load the test data that is required.
-     * @throws Exception
+     * @throws Exception It an error occurred during load.
      */
     @BeforeClass
@@ -96 +96 @@
         nc = new MapView(Main.getLayerManager(), null);
         nc.setBounds(0, 0, IMG_WIDTH, IMG_HEIGHT);
-        MapPaintStyles.readFromPreferences();
     }
 

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

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmApi;
@@ -44 +45 @@
     private boolean commands;
     private boolean allowMemoryManagerLeaks;
+    private boolean useMapStyles;
 
     /**
@@ -153 +155 @@
     public JOSMTestRules memoryManagerLeaks() {
         allowMemoryManagerLeaks = true;
+        return this;
+    }
+
+    /**
+     * Use map styles in this test.
+     * @return this instance, for easy chaining
+     * @since 11777
+     */
+    public JOSMTestRules mapStyles() {
+        preferences();
+        useMapStyles = true;
         return this;
     }
@@ -233 +246 @@
         if (platform) {
             Main.determinePlatformHook();
+        }
+
+        if (useMapStyles) {
+            // Reset the map paint styles.
+            MapPaintStyles.readFromPreferences();
         }