Changeset 11697 in josm for trunk

Timestamp:

2017-03-07T23:45:28+01:00 (8 years ago)

Author:

michael2402

Message:

MapCSSRendererTest: Require fixed font for text drawing test.

Location:

trunk/test

Files:

• data/renderer/node-text/reference.png (modified) ( previous)
• data/renderer/node-text/style.mapcss (modified) (1 diff)
• unit/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (5 diffs)

trunk/test/data/renderer/node-text/style.mapcss

@@ -9 +9 @@
         symbol-fill-color: #8888ff;
         text-color: red;
+        font-family: DejaVu Sans;
         _match: regexp_match("n(.+)", tag("test"));
         text: eval(concat("Test ", get(prop("_match"),1)));

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

@@ -6 +6 @@
 
 import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.RenderingHints;
@@ -17 +18 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -77 +79 @@
 
                 /** Text for nodes */
-                new TestConfig("node-text", AREA_DEFAULT),
+                new TestConfig("node-text", AREA_DEFAULT).usesFont("DejaVu Sans"),
 
                 /** Tests that StyledMapRenderer#drawWay respects width */
@@ -108 +110 @@
     public void testForOpenJDK() {
         String javaHome = System.getProperty("java.home");
-        Assume.assumeTrue(javaHome != null && javaHome.contains("openjdk"));
+        Assume.assumeTrue("Test requires openJDK", javaHome != null && javaHome.contains("openjdk"));
+
+        List<String> fonts = Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
+        for(String font : testConfig.fonts) {
+            Assume.assumeTrue("Test requires font: " + font, fonts.contains(font));
+        }
     }
 
@@ -233 +240 @@
         private final String testDirectory;
         private final Bounds testArea;
+        private final ArrayList<String> fonts = new ArrayList<>();
 
         TestConfig(String testDirectory, Bounds testArea) {
             this.testDirectory = testDirectory;
             this.testArea = testArea;
+        }
+
+        public TestConfig usesFont(String string) {
+            this.fonts.add(string);
+            return this;
         }