Changeset 12825 in josm for trunk/test

Timestamp:

2017-09-11T20:43:41+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - make FileWatcher generic so it has no more dependence on MapCSS

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (2 diffs)
• performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java (modified) (2 diffs)

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

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
+import org.openstreetmap.josm.data.preferences.sources.SourceType;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
@@ -302 +303 @@
 
         public SourceEntry getStyleSourceEntry() {
-            return new SourceEntry(getTestDirectory() + "/style.mapcss",
+            return new SourceEntry(SourceType.MAP_PAINT_STYLE, getTestDirectory() + "/style.mapcss",
                     "test style", "a test style", true // active
             );

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
+import org.openstreetmap.josm.data.preferences.sources.SourceType;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.MapRendererPerformanceTest;
@@ -71 +72 @@
         MapCSSStyleSource source = new MapCSSStyleSource(
             new SourceEntry(
+                SourceType.MAP_PAINT_STYLE,
                 STYLE_FILE,
                 "test style",