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

Timestamp:

2014-05-06T01:24:41+02:00 (11 years ago)

Author:

Don-vip

Message:

test cleanup

Location:

trunk/test/performance/org/openstreetmap/josm

Files:

• data/osm/RoundingPerformanceTest.java (modified) (5 diffs)
• data/osm/visitor (added)
• data/osm/visitor/paint (added)
• data/osm/visitor/paint/StyledMapRendererPerformanceTest.java (moved) (moved from trunk/test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java ) (4 diffs)
• gui (added)
• gui/mappaint (added)
• gui/mappaint/mapcss (added)
• gui/mappaint/mapcss/MapCSSPerformanceTest.groovy (copied) (copied from trunk/test/functional/mapcss/performance/PerformanceTest.groovy ) (8 diffs)

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -5 +8 @@
 import org.openstreetmap.josm.data.coor.LatLonTest;
 
-import static org.junit.Assert.assertTrue;
+public class RoundingPerformanceTest {
 
-public class RoundingPerformanceTest extends LatLonTest {
-    
     private static double oldRoundToOsmPrecision(double value) {
         return Math.round(value / LatLon.MAX_SERVER_PRECISION) * LatLon.MAX_SERVER_PRECISION; // Old method, causes rounding errors, but efficient
@@ -18 +19 @@
         long start = System.nanoTime();
         for (int i = 0; i < n; i++) {
-            for (double value : sampleValues) {
+            for (double value : LatLonTest.SAMPLE_VALUES) {
                 oldRoundToOsmPrecision(value);
             }
@@ -25 +26 @@
         long oldTime = end-start;
         System.out.println("Old time: "+oldTime/1000000.0 + " ms");
-        
+
         start = System.nanoTime();
         for (int i = 0; i < n; i++) {
-            for (double value : sampleValues) {
+            for (double value : LatLonTest.SAMPLE_VALUES) {
                 LatLon.roundToOsmPrecision(value);
             }
@@ -35 +36 @@
         long newTime = end-start;
         System.out.println("New time: "+newTime/1000000.0 + " ms");
-        
+
         assertTrue(newTime <= oldTime*10);
     }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.data.osm.visitor.paint;
 
 import java.awt.Graphics2D;
@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
@@ -19 +20 @@
 import org.openstreetmap.josm.io.OsmReader;
 
-public class MapPaintVisitorPerformanceTest {
+public class StyledMapRendererPerformanceTest {
 
     private static final int IMG_WIDTH = 1400;
@@ -54 +55 @@
 
         // Warm up
-        new MapPaintVisitorPerformanceTest().testRestrictionSmall();
-        new MapPaintVisitorPerformanceTest().testCity();
+        new StyledMapRendererPerformanceTest().testRestrictionSmall();
+        new StyledMapRendererPerformanceTest().testCity();
     }
 

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

@@ -1 @@
-
 // License: GPL. For details, see LICENSE file.
-package mapcss.performance;
+package org.openstreetmap.josm.gui.mappaint.mapcss;
 
 import static org.junit.Assert.*
@@ -16 +15 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource
 import org.openstreetmap.josm.gui.preferences.SourceEntry
 import org.openstreetmap.josm.io.OsmReader
 
 /**
- * This performance tests measures the time for a full run of MapPaintVisitor.visitAll()
+ * This performance test measures the time for a full run of MapPaintVisitor.visitAll()
  * against a test data set using a test style.
- * 
+ *
  */
-class PerformanceTest {
+class MapCSSPerformanceTest {
 
     /* ------------------------ configuration section  ---------------------------- */
     /**
-    * The path to the JOSM home environment
-    */
-   def static JOSM_HOME="/my/josm/home/dir"
-   
-   /**
-    * The path to the style file used for rendering.
-    */
-   def static STYLE_FILE="/my/test-style.mapcss"
+     * The path to the JOSM home environment
+     */
+    def static JOSM_HOME="test/config/performance-josm.home"
 
-   /**
-    * The data file to be rendered
-    */
-   def static DATA_FILE = "/my/test-data.osm"
-    /* ------------------------ / configuration section  ---------------------------- */     
-    
+    /**
+     * The path to the style file used for rendering.
+     */
+    def static STYLE_FILE="styles/standard/elemstyles.mapcss"
+
+    /**
+     * The data file to be rendered
+     */
+    def static DATA_FILE = "/my/test-data.osm"
+    /* ------------------------ / configuration section  ---------------------------- */
+
     def DataSet ds
-    
+
     def static boolean checkTestEnvironment() {
           File f = new File(JOSM_HOME)
           if  (!f.isDirectory() || !f.exists()) {
-              fail("JOSM_HOME refers to '${JOSM_HOME}. This is either not a directory or doesn't exist.\nPlease update configuration settings in the unit test file.")              
+              fail("JOSM_HOME refers to '${JOSM_HOME}. This is either not a directory or doesn't exist.\nPlease update configuration settings in the unit test file.")
           }
-          
+
           f = new File(STYLE_FILE);
           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()) {
@@ -62 +60 @@
           }
     }
-    
+
     @BeforeClass
     public static void createJOSMFixture(){
@@ -69 +67 @@
         MainApplication.main(new String[0])
     }
-    
+
     def timed(Closure c){
         long before = System.currentTimeMillis()
@@ -76 +74 @@
         return after - before
     }
-    
+
     def  loadStyle() {
         print "Loading style '$STYLE_FILE' ..."
@@ -95 +93 @@
         println "DONE"
     }
-    
+
     def loadData() {
         print "Loading data file '$DATA_FILE' ..."
@@ -105 +103 @@
         println "DONE"
     }
-    
+
     @Test
     public void measureTimeForStylePreparation() {
         loadStyle()
         loadData()
-        
+
         def mv = Main.map.mapView
-        
+
         BufferedImage img = mv.createImage(mv.getWidth(), mv.getHeight())
         Graphics2D g = img.createGraphics()
         g.setClip(0,0, mv.getWidth(), mv.getHeight())
-        def visitor = new StyledMapRenderer()
-        visitor.setNavigatableComponent(Main.map.mapView)
-        visitor.setGraphics(g)
+        def visitor = new StyledMapRenderer(g, Main.map.mapView, false)
 
         print "Rendering ..."
@@ -128 +124 @@
         println "style file: ${STYLE_FILE}"
         println ""
-        println "Rendering took $time ms."       
+        println "Rendering took $time ms."
     }
 }