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

Timestamp:

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

Author:

Don-vip

Message:

test cleanup

Location:

trunk/test/performance/org/openstreetmap/josm/data/osm

Files:

• RoundingPerformanceTest.java (modified) (5 diffs)
• visitor (added)
• visitor/paint (added)
• visitor/paint/StyledMapRendererPerformanceTest.java (moved) (moved from trunk/test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java ) (4 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();
     }