Changeset 16006 in josm for trunk/test/performance/org/openstreetmap/josm

Timestamp:

2020-03-03T02:12:44+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18140 - reorganization of data(_nodist), images(_nodist), styles(_nodist), IDE and native files in a more practical file tree.

• Everything belonging to the jar is now in resources (data, images, styles)
• Everything not belonging to the jar is now in nodist (data, images, styles)
• Everything related to OS native functions is now in native (linux, macosx, windows)
• Everything related to an IDE is now in ide (eclipse, netbeans)

Location:

trunk/test/performance/org/openstreetmap/josm

Files:

• data/osm/OsmDataGenerator.java (modified) (1 diff)
• data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java (modified) (1 diff)
• gui/mappaint/MapRendererPerformanceTest.java (modified) (3 diffs)
• gui/mappaint/mapcss/MapCSSPerformanceTest.java (modified) (1 diff)
• io/OsmReaderPerformanceTest.java (modified) (1 diff)

trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java

@@ -18 +18 @@
     private static final int DEFAULT_KEY_VALUE_RATIO = 3;
     private static final int DEFAULT_NODE_COUNT = 1000;
-    private static final String DATA_DIR = "data_nodist" + File.separator + "osmfiles";
+    private static final String DATA_DIR = "nodist/data" + File.separator + "osmfiles";
 
     private OsmDataGenerator() {

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

@@ -81 +81 @@
         StyledMapRenderer.PREFERENCE_TEXT_ANTIALIASING.put("gasp");
 
-        try (InputStream fisR = Files.newInputStream(Paths.get("data_nodist/restriction.osm"));
-             InputStream fisM = Files.newInputStream(Paths.get("data_nodist/multipolygon.osm"));
-             InputStream fisC = Compression.getUncompressedFileInputStream(new File("data_nodist/neubrandenburg.osm.bz2"));
-             InputStream fisO = Compression.getUncompressedFileInputStream(new File("data_nodist/overpass-download.osm.bz2"));) {
+        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);

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

@@ -19 +19 @@
 import javax.imageio.ImageIO;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -49 +48 @@
 import org.openstreetmap.josm.tools.Logging;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Performance test of map renderer.
@@ -152 +153 @@
 
         try (
-            InputStream fisC = Compression.getUncompressedFileInputStream(new File("data_nodist/neubrandenburg.osm.bz2"));
+            InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2"));
         ) {
             dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE);

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

@@ -35 +35 @@
      * The path to the style file used for rendering.
      */
-    static final String STYLE_FILE = "styles/standard/elemstyles.mapcss";
+    static final String STYLE_FILE = "resources/styles/standard/elemstyles.mapcss";
 
     /**
      * The data file to be rendered
      */
-    static final String DATA_FILE = "data_nodist/neubrandenburg.osm.bz2";
+    static final String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2";
     /* ------------------------ / configuration section  ---------------------------- */
 

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

@@ -31 +31 @@
 public class OsmReaderPerformanceTest {
     private static final int TIMES = 4;
-    private static String DATA_FILE = "data_nodist/neubrandenburg.osm.bz2";
+    private static String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2";
 
     /**