Changeset 17615 in josm for trunk/test/performance

Timestamp:

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

Author:

simon04

Message:

see #4626 - Extract PerformanceTestUtils.getNeubrandenburgDataSet

Location:

trunk/test/performance/org/openstreetmap/josm

Files:

• PerformanceTestUtils.java (modified) (2 diffs)
• data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java (modified) (2 diffs)
• data/validation/tests/MapCSSTagCheckerPerformanceTest.java (modified) (2 diffs)
• gui/mappaint/MapRendererPerformanceTest.java (modified) (3 diffs)
• gui/mappaint/mapcss/MapCSSPerformanceTest.java (modified) (5 diffs)
• io/OsmReaderPerformanceTest.java (modified) (3 diffs)

trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java

@@ -2 +2 @@
 package org.openstreetmap.josm;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.io.Compression;
+import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.io.XmlWriter;
 
@@ -14 +22 @@
  */
 public final class PerformanceTestUtils {
+    /**
+     * The Neubrandenburg data file
+     */
+    public static final String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2";
     private static final int TIMES_WARMUP = 2;
     private static final int TIMES_RUN = 8;
+
+    /**
+     * Parses and returns the Neubrandenburg dataset
+     * @return the Neubrandenburg dataset
+     * @throws IllegalDataException in case of invalid data
+     * @throws IOException in case of I/O error
+     */
+    public static DataSet getNeubrandenburgDataSet() throws IOException, IllegalDataException {
+        try (InputStream in = Compression.getUncompressedFileInputStream(new File(DATA_FILE))) {
+            return OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+        }
+    }
 
     /**

trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java

@@ -18 +18 @@
 import org.junit.jupiter.api.Timeout;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -75 +76 @@
         StyledMapRenderer.PREFERENCE_TEXT_ANTIALIASING.put("gasp");
 
+        dsCity = PerformanceTestUtils.getNeubrandenburgDataSet();
         try (InputStream fisR = Files.newInputStream(Paths.get("nodist/data/restriction.osm"));
              InputStream fisM = Files.newInputStream(Paths.get("nodist/data/multipolygon.osm"));
-             InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2"));
              InputStream fisO = Compression.getUncompressedFileInputStream(new File("nodist/data/overpass-download.osm.bz2"));) {
             dsRestriction = OsmReader.parseDataSet(fisR, NullProgressMonitor.INSTANCE);
             dsMultipolygon = OsmReader.parseDataSet(fisM, NullProgressMonitor.INSTANCE);
-            dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE);
             dsOverpass = OsmReader.parseDataSet(fisO, NullProgressMonitor.INSTANCE);
         }

trunk/test/performance/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerPerformanceTest.java

@@ -6 +6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
-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;
-
-import java.io.File;
-import java.io.InputStream;
 
 /**
@@ -39 +34 @@
         tagChecker = new MapCSSTagChecker();
         tagChecker.initialize();
-        try (InputStream in = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2"))) {
-            dsCity = OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
-        }
+        dsCity = PerformanceTestUtils.getNeubrandenburgDataSet();
     }
 

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("");

trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java

@@ -30 +30 @@
 class OsmReaderPerformanceTest {
     private static final int TIMES = 4;
-    private static final String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2";
 
     /**
@@ -65 +64 @@
             is.reset();
 
-            ds = OsmReader.parseDataSet(decompressBeforeRead ? is : Compression.byExtension(DATA_FILE)
+            ds = OsmReader.parseDataSet(decompressBeforeRead ? is : Compression.byExtension(PerformanceTestUtils.DATA_FILE)
                     .getUncompressedInputStream(is), null);
         }
@@ -73 +72 @@
 
     private InputStream loadFile(boolean decompressBeforeRead) throws IOException {
-        File file = new File(DATA_FILE);
+        File file = new File(PerformanceTestUtils.DATA_FILE);
         try (InputStream is = decompressBeforeRead ? Compression.getUncompressedFileInputStream(file) : new FileInputStream(file)) {
             ByteArrayOutputStream temporary = new ByteArrayOutputStream();