Author: markt Date: Sun Apr 13 01:24:15 2014 New Revision: 1586915 URL: http://svn.apache.org/r1586915 Log: Fix some issues back-porting the bug 56334 test case
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334.jspx 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=1586915&r1=1586914&r2=1586915&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 Sun Apr 13 01:24:15 2014 @@ -379,7 +379,7 @@ public class TestParser extends TomcatBa public void testBug56334() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp"); + File appDir = new File("test/webapp-3.0"); // app dir is relative to server home StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -395,8 +395,6 @@ public class TestParser extends TomcatBa String result = res.toString(); - System.out.println(result); - // NOTE: The expected values must themselves be \ escaped below Assert.assertTrue(result, result.contains("\\?resize01")); Assert.assertTrue(result, result.contains("<set data-value=\"\\\\?resize02a\"/>")); Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334.jspx URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334.jspx?rev=1586915&r1=1586914&r2=1586915&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334.jspx (original) +++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334.jspx Sun Apr 13 01:24:15 2014 @@ -1,4 +1,4 @@ -<jsp:root version="2.3" +<jsp:root version="2.2" xmlns="http://www.w3.org/1999/xhtml" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org