Changeset 7109 in josm for trunk/test/performance/org

Timestamp:

2014-05-12T00:40:09+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8671 - some code refactoring done in an unsuccessful attempt to reproduce error, but worth keeping

Location:

trunk/test/performance/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRendererPerformanceTest.java (modified) (3 diffs)
• gui/mappaint/mapcss/MapCSSPerformanceTest.groovy (modified) (1 diff)

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

@@ -4 +4 @@
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
-import java.io.File;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmReader;
-import org.openstreetmap.josm.io.Compression;
 
 public class StyledMapRendererPerformanceTest {
@@ -34 +33 @@
     @BeforeClass
     public static void load() throws Exception {
-        Main.initApplicationPreferences();
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+        JOSMFixture.createPerformanceTestFixture().init();
         img = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, BufferedImage.TYPE_3BYTE_BGR);
         g = (Graphics2D)img.getGraphics();
@@ -53 +51 @@
             dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE);
         }
-
-        // Warm up
-        new StyledMapRendererPerformanceTest().testRestrictionSmall();
-        new StyledMapRendererPerformanceTest().testCity();
     }
 

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

@@ -111 +111 @@
         def mv = Main.map.mapView
 
-        BufferedImage img = mv.createImage(mv.getWidth(), mv.getHeight())
+        BufferedImage img = new BufferedImage(mv.getWidth(), mv.getHeight(), BufferedImage.TYPE_3BYTE_BGR)
         Graphics2D g = img.createGraphics()
         g.setClip(0,0, mv.getWidth(), mv.getHeight())