Author: markt
Date: Wed Jul 17 14:32:00 2013
New Revision: 1504153
URL: http://svn.apache.org/r1504153
Log:
Add unit tests that check (very basically) that the new EL syntax works in a
JSP. There are single tests for lambda expressions, streams and imports.
TODO: Figure out why the import test currently fails.
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/webapp/el-misc.jsp
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1504153&r1=1504152&r2=1504153&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Wed Jul 17 14:32:00 2013
@@ -388,6 +388,10 @@ public class TestELInJsp extends TomcatB
assertEcho(result, "15-foo\\bar\\baz");
assertEcho(result, "16-foo\\bar\\baz");
assertEcho(result, "17-foo\\bar\\baz");
+ assertEcho(result, "18-3");
+ assertEcho(result, "19-4");
+ // TODO Figure out why this doesn't work.
+ // assertEcho(result, "20-" + Integer.MAX_VALUE);
}
@Test
Modified: tomcat/trunk/test/webapp/el-misc.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/el-misc.jsp?rev=1504153&r1=1504152&r2=1504153&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/el-misc.jsp (original)
+++ tomcat/trunk/test/webapp/el-misc.jsp Wed Jul 17 14:32:00 2013
@@ -36,5 +36,8 @@
<tags:echo echo='15-${\'foo\'}\\${"bar"}\\${\'baz\'}' />
<tags:echo echo='16-${"foo"}\\${\'bar\'}\\${"baz"}' />
<tags:echo echo='17-${"foo"}\\${'bar'}\\${"baz"}' />
+ <tags:echo echo='18-${((x,y)->x+y)(1,2)}' />
+ <tags:echo echo='19-${{1,2,3,4}.stream().max().orElse(-1)}' />
+ <tags:echo echo='20-${Integer.MAX_VAUE}' />
</body>
</html>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
