Changeset 17615 in josm for trunk/test/performance/org/openstreetmap/josm/gui

Timestamp:

2021-03-21T13:56:13+01:00 (5 years ago)

Author:

simon04

Message:

see #4626 - Extract PerformanceTestUtils.getNeubrandenburgDataSet

Location:

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

Files:

• MapRendererPerformanceTest.java (modified) (3 diffs)
• mapcss/MapCSSPerformanceTest.java (modified) (5 diffs)

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

@@ -10 +10 @@
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44 +43 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
-import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.openstreetmap.josm.io.Compression;
-import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -169 +165 @@
         MapPaintStyleLoader.reloadStyles(defaultStyleIdx);
 
-        try (
-            InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2"));
-        ) {
-            dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE);
-        }
+        dsCity = PerformanceTestUtils.getNeubrandenburgDataSet();
     }
 

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

@@ -13 +13 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -20 +21 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.MapRendererPerformanceTest;
-import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.OsmReader;
 
 /**
@@ -37 +36 @@
     static final String STYLE_FILE = "resources/styles/standard/elemstyles.mapcss";
 
-    /**
-     * The data file to be rendered
-     */
-    static final String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2";
     /* ------------------------ / configuration section  ---------------------------- */
 
@@ -89 +84 @@
 
     void loadData() throws IllegalDataException, IOException {
-        System.out.print("Loading data file '"+DATA_FILE+"' ...");
-        ds = OsmReader.parseDataSet(Compression.getUncompressedFileInputStream(new File(DATA_FILE)), null);
+        System.out.print("Loading data file '"+PerformanceTestUtils.DATA_FILE+"' ...");
+        ds = PerformanceTestUtils.getNeubrandenburgDataSet();
         System.out.println("DONE");
     }
@@ -116 +111 @@
         );
         System.out.println("DONE");
-        System.out.println("data file : "+DATA_FILE);
+        System.out.println("data file : "+PerformanceTestUtils.DATA_FILE);
         System.out.println("style file: "+STYLE_FILE);
         System.out.println("");