Changeset 17000 in josm for trunk

Timestamp:

2020-09-02T20:51:50+02:00 (4 years ago)

Author:

simon04

Message:

see #19017 - MapCSSRendererTest: move reference.png to reference-java8.png (separate tests for Java 8 and Java 11+)

Location:

trunk/test

Files:

• data/renderer/area-fill-color/reference-java8.png (moved) (moved from trunk/test/data/renderer/area-fill-color/reference.png )
• data/renderer/area-fill-image/reference-java8.png (moved) (moved from trunk/test/data/renderer/area-fill-image/reference.png )
• data/renderer/area-icon/reference-java8.png (moved) (moved from trunk/test/data/renderer/area-icon/reference.png )
• data/renderer/area-text/reference-java8.png (moved) (moved from trunk/test/data/renderer/area-text/reference.png )
• data/renderer/eval/reference-java8.png (moved) (moved from trunk/test/data/renderer/eval/reference.png )
• data/renderer/node-shapes-combined/reference-java8.png (moved) (moved from trunk/test/data/renderer/node-shapes-combined/reference.png )
• data/renderer/node-shapes-default/reference-java8.png (moved) (moved from trunk/test/data/renderer/node-shapes-default/reference.png )
• data/renderer/node-shapes/reference-java8.png (moved) (moved from trunk/test/data/renderer/node-shapes/reference.png )
• data/renderer/node-shapes2/reference-java8.png (moved) (moved from trunk/test/data/renderer/node-shapes2/reference.png )
• data/renderer/node-text/reference-java8.png (moved) (moved from trunk/test/data/renderer/node-text/reference.png )
• data/renderer/node-text2/reference-java8.png (moved) (moved from trunk/test/data/renderer/node-text2/reference.png )
• data/renderer/order/reference-java8.png (moved) (moved from trunk/test/data/renderer/order/reference.png )
• data/renderer/relation-linkselector/reference-java8.png (moved) (moved from trunk/test/data/renderer/relation-linkselector/reference.png )
• data/renderer/relation-parentselector/reference-java8.png (moved) (moved from trunk/test/data/renderer/relation-parentselector/reference.png )
• data/renderer/way-color/reference-java8.png (moved) (moved from trunk/test/data/renderer/way-color/reference.png )
• data/renderer/way-dashes-clamp/reference-java8.png (moved) (moved from trunk/test/data/renderer/way-dashes-clamp/reference.png )
• data/renderer/way-dashes/reference-java8.png (moved) (moved from trunk/test/data/renderer/way-dashes/reference.png )
• data/renderer/way-dashes2/reference-java8.png (moved) (moved from trunk/test/data/renderer/way-dashes2/reference.png )
• data/renderer/way-repeat-image-clamp/reference-java8.png (moved) (moved from trunk/test/data/renderer/way-repeat-image-clamp/reference.png )
• data/renderer/way-repeat-image/reference-java8.png (moved) (moved from trunk/test/data/renderer/way-repeat-image/reference.png )
• data/renderer/way-text/reference-java8.png (moved) (moved from trunk/test/data/renderer/way-text/reference.png )
• data/renderer/way-width/reference-java8.png (moved) (moved from trunk/test/data/renderer/way-width/reference.png )
• functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (2 diffs)

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

@@ -45 +45 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.Utils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -383 +384 @@
 
         public File getReference() {
-            return new File(getTestDirectory() + "/reference.png");
+            // Java 8 renders SVG images differently, thus, use separate reference files
+            final String javaSuffix = Utils.getJavaVersion() == 8 ? "-java8" : "";
+            return new File(getTestDirectory() + "/reference" + javaSuffix + ".png");
         }