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

Timestamp:

2014-05-18T16:38:55+02:00 (10 years ago)

Author:

bastiK

Message:

see #9691 - fix unit test

File:

• trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.groovy (modified) (5 diffs)

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

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles
 import org.openstreetmap.josm.gui.preferences.SourceEntry
+import org.openstreetmap.josm.io.Compression
 import org.openstreetmap.josm.io.OsmReader
 
@@ -39 +40 @@
      * The data file to be rendered
      */
-    def static DATA_FILE = "/my/test-data.osm"
+    def static DATA_FILE = "data_nodist/neubrandenburg.osm.bz2"
     /* ------------------------ / configuration section  ---------------------------- */
 
@@ -53 +54 @@
           if ( !f.isFile() || ! f.exists()) {
               fail("STYLE_FILE refers to '${STYLE_FILE}. This is either not a file or doesn't exist.\nPlease update configuration settings in the unit test file.")
-          }
-
-          f = new File(DATA_FILE);
-          if ( !f.isFile() || ! f.exists()) {
-              fail("DATA_FILE refers to '${DATA_FILE}. This is either not a file or doesn't exist.\nPlease update configuration settings in the unit test file.")
           }
     }
@@ -79 +75 @@
         MapCSSStyleSource source = new MapCSSStyleSource(
             new SourceEntry(
-                new File(STYLE_FILE).toURI().toURL().toString(),
+                STYLE_FILE,
                 "test style",
                 "a test style",
@@ -96 +92 @@
     def loadData() {
         print "Loading data file '$DATA_FILE' ..."
-        new File(DATA_FILE).withInputStream {
-            InputStream is ->
-            ds = OsmReader.parseDataSet(is,null)
-        }
+        ds = OsmReader.parseDataSet(Compression.getUncompressedFileInputStream(new File(DATA_FILE)), null);
         Main.main.addLayer(new OsmDataLayer(ds,"test layer",null /* no file */));
         println "DONE"