Index: trunk/test/data/renderer/eval/data.osm
===================================================================
--- trunk/test/data/renderer/eval/data.osm	(revision 12994)
+++ trunk/test/data/renderer/eval/data.osm	(revision 12994)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+  <bounds minlat='23.2628349' minlon='6.7909447' maxlat='23.6008378' maxlon='7.4540337'/>
+  <node id='-40673' action='modify' lat='23.40126813706' lon='6.86812402846'>
+    <tag k='test' v='3' />
+  </node>
+  <node id='-40674' action='modify' lat='23.46061342982' lon='6.86740537624'>
+    <tag k='12' v='12' />
+    <tag k='15' v='15' />
+    <tag k='test' v='2' />
+  </node>
+  <node id='-40675' action='modify' lat='23.5199320577' lon='6.86668672401'>
+    <tag k='test' v='1' />
+  </node>
+  <node id='-40676' action='modify' lat='23.34189623112' lon='6.86884268069'>
+    <tag k='test' v='4' />
+  </node>
+</osm>
Index: trunk/test/data/renderer/eval/style.mapcss
===================================================================
--- trunk/test/data/renderer/eval/style.mapcss	(revision 12994)
+++ trunk/test/data/renderer/eval/style.mapcss	(revision 12994)
@@ -0,0 +1,38 @@
+* {
+    font-size: 20;
+}
+
+node[test] {
+    symbol-shape:square;
+    symbol-size: 20;
+    value: "";
+    result: "";
+}
+
+node[test=1] {
+    value: 2 + 3 * 5 + 1 / 4;
+    result: 17.25;
+}
+
+node[test=2] {
+    tmp: 3;
+    value: cond(tag("12") >= 14, 1, 2) + (10*cond(tag("15") >= 14, 1, 2)) + (100*max(prop("tmp"), 2));
+    result: 312;
+}
+
+node[test=3] {
+    lst: 12, 3, 6;
+    tmp: list(get(prop("lst"), 1), get(prop("lst"), 0), get(prop("lst"), 2), length(prop("lst")));
+    value: concat("", prop("tmp"));
+    result: "[3.0, 12.0, 6.0, 3]";
+}
+
+node[test=4] {
+    value: regexp_test("aa\\|", "aa|");
+    result: "true";
+}
+
+node[test] {
+    text: concat("Test ", tag("test"), ": ", prop(result), " == ", prop(value));
+}
+
Index: trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java	(revision 12990)
+++ trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java	(revision 12994)
@@ -132,5 +132,8 @@
                 new TestConfig("relation-linkselector"),
                 /** Tests parent selector on relation */
-                new TestConfig("relation-parentselector")
+                new TestConfig("relation-parentselector"),
+
+                /** Tests evaluation of expressions */
+                new TestConfig("eval").setImageWidth(600)
 
                 ).map(e -> new Object[] {e, e.testDirectory})