You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/05/26 15:57:55 UTC
svn commit: r1597587 - in /tomcat/tc7.0.x/trunk: ./
test/org/apache/jasper/compiler/TestParser.java
test/webapp-3.0/bug5nnnn/bug56334and56561.jspx
Author: kkolinko
Date: Mon May 26 13:57:55 2014
New Revision: 1597587
URL: http://svn.apache.org/r1597587
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=56561
Followup to r1597532: check the output of the new test.
It is backport of r1597573 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334and56561.jspx
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1597573
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1597587&r1=1597586&r2=1597587&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java Mon May 26 13:57:55 2014
@@ -407,6 +407,7 @@ public class TestParser extends TomcatBa
Assert.assertTrue(result, result.contains("<set data-value=\"05a$${&\"/>"));
Assert.assertTrue(result, result.contains("<set data-value=\"05b$${&2\"/>"));
Assert.assertTrue(result, result.contains("<set data-value=\"05c##{>hello<\"/>"));
+ Assert.assertTrue(result, result.contains("05x:<set data-value=\"\"/>"));
Assert.assertTrue(result, result.contains("<set xmlns:foo=\"urn:06a\\bar\\baz\"/>"));
}
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334and56561.jspx
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334and56561.jspx?rev=1597587&r1=1597586&r2=1597587&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334and56561.jspx (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334and56561.jspx Mon May 26 13:57:55 2014
@@ -33,7 +33,8 @@
<set data-value="05a\$\${&" />
<set data-value="05b\$\${&${1+1}" />
<set data-value="05c\#\#{>${'hello'}<" />
- <set data-value="" />
+ <!-- Test for BZ 56561 -->
+ 05x:<set data-value="" />
<!-- Test 6: nonTaglibXmlnsAttributes on a Node.UninterpretedTag -->
<set xmlns:foo="urn:06a\bar\baz" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org