Changeset 11693 in josm for trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

Timestamp:

2017-03-05T17:44:07+01:00 (7 years ago)

Author:

michael2402

Message:

Add new MapCSS reference test for way dashes/color and node texts.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (4 diffs)

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

@@ -70 +70 @@
      * @return The parameters.
      */
-    @Parameters(name="{1}")
+    @Parameters(name = "{1}")
     public static Collection<Object[]> runs() {
         return Stream.of(
@@ -76 +76 @@
                 new TestConfig("node-shapes", AREA_DEFAULT),
 
+                /** Text for nodes */
+                new TestConfig("node-text", AREA_DEFAULT),
+
                 /** Tests that StyledMapRenderer#drawWay respects width */
-                new TestConfig("way-width", AREA_DEFAULT)
+                new TestConfig("way-width", AREA_DEFAULT),
+
+                /** Tests the way color property, including alpha */
+                new TestConfig("way-color", AREA_DEFAULT),
+
+                /** Tests dashed ways. */
+                new TestConfig("way-dashes", AREA_DEFAULT)
 
                 ).map(e -> new Object[] {e, e.testDirectory})
@@ -147 +156 @@
         nc.zoomTo(testConfig.testArea);
         dataSet.allPrimitives().stream().forEach(n -> n.setHighlighted(n.isKeyTrue("highlight")));
+        dataSet.allPrimitives().stream().filter(n -> n.isKeyTrue("disabled")).forEach(n -> n.setDisabledState(false));
         Graphics2D g = image.createGraphics();
         // Force all render hints to be defaults - do not use platform values
@@ -207 +217 @@
     /**
      * Check if two colors differ
-     * @param expected
-     * @param result
+     * @param expected The expected color
+     * @param actual The actual color
      * @return <code>true</code> if they differ.
      */
-    private boolean colorsAreSame(int expected, int result) {
+    private boolean colorsAreSame(int expected, int actual) {
         int expectedAlpha = expected >> 24;
         if (expectedAlpha == 0) {
-            return (result & 0xff000000) == 0;
+            return actual >> 24 == 0;
         } else {
-            return expected == result;
+            return expected == actual;
         }
     }