Changeset 12651 in josm for trunk/test/performance/org

Timestamp:

2017-08-25T23:56:58+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - code refactoring to avoid dependence on GUI packages from MapPaintStyles

Location:

trunk/test/performance/org/openstreetmap/josm/gui/mappaint

Files:

• MapRendererPerformanceTest.java (modified) (4 diffs)
• mapcss/MapCSSPerformanceTest.java (modified) (1 diff)

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java

@@ -39 +39 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.StyleSetting.BooleanStyleSetting;
+import org.openstreetmap.josm.gui.mappaint.loader.MapPaintStyleLoader;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
@@ -142 +143 @@
         Assert.assertNotNull(hideIconsSetting);
         hideIconsSetting.setValue(false);
-        MapPaintStyles.reloadStyles(defaultStyleIdx);
+        MapPaintStyleLoader.reloadStyles(defaultStyleIdx);
 
         try (
@@ -157 +158 @@
             hideIconsSetting.setValue(true);
         }
-        MapPaintStyles.reloadStyles(defaultStyleIdx);
+        MapPaintStyleLoader.reloadStyles(defaultStyleIdx);
     }
 
@@ -290 +291 @@
             setFilterStyleActive(false);
         }
-        MapPaintStyles.reloadStyles(filterStyleIdx);
+        MapPaintStyleLoader.reloadStyles(filterStyleIdx);
         test.run();
     }

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java

@@ -68 +68 @@
 
     void loadStyle() {
-        System.out.println("Loading style '"+STYLE_FILE+"' ...");
+        System.out.print("Loading style '"+STYLE_FILE+"' ...");
         MapCSSStyleSource source = new MapCSSStyleSource(
             new SourceEntry(