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

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/data

Files:

• osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java (modified) (2 diffs)
• validation/tests/MapCSSTagCheckerPerformanceTest.java (modified) (2 diffs)

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