Changeset 12978 in josm for trunk

Timestamp:

2017-10-10T15:04:35+02:00 (7 years ago)

Author:

bastiK

Message:

promote old MapCSS reference file to MapCSSRendererTest checks

Location:

trunk

Files:

• data_nodist/mapcss (deleted)
• test/data/renderer/node-shapes-combined (added)
• test/data/renderer/node-shapes-combined/data.osm (added)
• test/data/renderer/node-shapes-combined/reference.png (added)
• test/data/renderer/node-shapes-combined/style.mapcss (added)
• test/data/renderer/node-shapes-default (added)
• test/data/renderer/node-shapes-default/data.osm (added)
• test/data/renderer/node-shapes-default/reference.png (added)
• test/data/renderer/node-shapes-default/style.mapcss (added)
• test/data/renderer/node-shapes2 (added)
• test/data/renderer/node-shapes2/data.osm (added)
• test/data/renderer/node-shapes2/reference.png (added)
• test/data/renderer/node-shapes2/style.mapcss (added)
• test/data/renderer/node-text2 (added)
• test/data/renderer/node-text2/data.osm (added)
• test/data/renderer/node-text2/reference.png (added)
• test/data/renderer/node-text2/style.mapcss (added)
• test/data/renderer/relation-linkselector (added)
• test/data/renderer/relation-linkselector/data.osm (added)
• test/data/renderer/relation-linkselector/reference.png (added)
• test/data/renderer/relation-linkselector/style.mapcss (added)
• test/data/renderer/relation-parentselector (added)
• test/data/renderer/relation-parentselector/data.osm (added)
• test/data/renderer/relation-parentselector/reference.png (added)
• test/data/renderer/relation-parentselector/style.mapcss (added)
• test/data/renderer/way-dashes2 (added)
• test/data/renderer/way-dashes2/data.osm (added)
• test/data/renderer/way-dashes2/reference.png (added)
• test/data/renderer/way-dashes2/style.mapcss (added)
• test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (6 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

@@ -117 +117 @@
 
                 /** Tests text along a way */
-                new TestConfig("way-text", AREA_DEFAULT)
+                new TestConfig("way-text", AREA_DEFAULT),
+
+                /** Another test for node shapes */
+                new TestConfig("node-shapes2").setImageWidth(600),
+                /** Tests default values for node shapes */
+                new TestConfig("node-shapes-default"),
+                /** Tests node shapes with both fill and stroke combined */
+                new TestConfig("node-shapes-combined"),
+                /** Another test for dashed ways */
+                new TestConfig("way-dashes2"),
+                /** Tests node text placement */
+                new TestConfig("node-text2"),
+                /** Tests relation link selector */
+                new TestConfig("relation-linkselector"),
+                /** Tests parent selector on relation */
+                new TestConfig("relation-parentselector")
+
                 ).map(e -> new Object[] {e, e.testDirectory})
                 .collect(Collectors.toList());
@@ -162 +178 @@
 
         ProjectionBounds pb = new ProjectionBounds();
-        pb.extend(Main.getProjection().latlon2eastNorth(testConfig.testArea.getMin()));
-        pb.extend(Main.getProjection().latlon2eastNorth(testConfig.testArea.getMax()));
-        double scale = (pb.maxEast - pb.minEast) / IMAGE_SIZE;
+        pb.extend(Main.getProjection().latlon2eastNorth(testConfig.getTestArea().getMin()));
+        pb.extend(Main.getProjection().latlon2eastNorth(testConfig.getTestArea().getMax()));
+        double scale = (pb.maxEast - pb.minEast) / testConfig.imageWidth;
 
         RenderingHelper.StyleData sd = new RenderingHelper.StyleData();
         sd.styleUrl = testConfig.getStyleSourceUrl();
-        RenderingHelper rh = new RenderingHelper(dataSet, testConfig.testArea, scale, Collections.singleton(sd));
+        RenderingHelper rh = new RenderingHelper(dataSet, testConfig.getTestArea(), scale, Collections.singleton(sd));
         rh.setFillBackground(false);
         BufferedImage image = rh.render();
@@ -180 +196 @@
 
         // now compute differences:
-        assertEquals(IMAGE_SIZE, reference.getWidth());
-        assertEquals(IMAGE_SIZE, reference.getHeight());
+        assertEquals(image.getWidth(), reference.getWidth());
+        assertEquals(image.getHeight(), reference.getHeight());
 
         StringBuilder differences = new StringBuilder();
@@ -246 +262 @@
     private static class TestConfig {
         private final String testDirectory;
-        private final Bounds testArea;
+        private Bounds testArea;
         private final ArrayList<String> fonts = new ArrayList<>();
+        private DataSet ds;
+        private int imageWidth = IMAGE_SIZE;
 
         TestConfig(String testDirectory, Bounds testArea) {
@@ -254 +272 @@
         }
 
+        TestConfig(String testDirectory) {
+            this.testDirectory = testDirectory;
+        }
+
+        public TestConfig setImageWidth(int imageWidth) {
+            this.imageWidth = imageWidth;
+            return this;
+        }
+
         public TestConfig usesFont(String string) {
             this.fonts.add(string);
@@ -272 +299 @@
 
         public DataSet getOsmDataSet() throws FileNotFoundException, IllegalDataException {
-            return OsmReader.parseDataSet(new FileInputStream(getTestDirectory() + "/data.osm"), null);
+            if (ds == null) {
+                ds = OsmReader.parseDataSet(new FileInputStream(getTestDirectory() + "/data.osm"), null);
+            }
+            return ds;
+        }
+
+        public Bounds getTestArea() throws FileNotFoundException, IllegalDataException {
+            if (testArea == null) {
+                testArea = getOsmDataSet().getDataSourceBounds().get(0);
+            }
+            return testArea;
         }