Author: markt
Date: Mon Feb 8 01:58:06 2010
New Revision: 907534
URL: http://svn.apache.org/viewvc?rev=907534&view=rev
Log:
Add test cases for bug 48668
Added:
tomcat/trunk/test/webapp/bug48668a.jsp (with props)
tomcat/trunk/test/webapp/bug48668b.jsp (with props)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=907534&r1=907533&r2=907534&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Mon Feb 8
01:58:06 2010
@@ -45,6 +45,40 @@
assertEcho(result, "01-\\");
}
+ public void testBug48668a() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir =
+ new File("test/webapp");
+ // app dir is relative to server home
+ tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
+ "/test/bug48668a.jsp");
+ String result = res.toString();
+ assertEcho(result, "00-Hello world</p>#{foo.bar}");
+ assertEcho(result, "01-Hello world</p>${foo.bar}");
+ }
+
+ public void testBug48668b() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir =
+ new File("test/webapp");
+ // app dir is relative to server home
+ tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
+ "/test/bug48668b.jsp");
+ String result = res.toString();
+ System.out.println(result);
+ assertEcho(result, "00-Hello world</p>#{foo.bar}");
+ }
+
/** Assertion for text printed by tags:echo */
private static void assertEcho(String result, String expected) {
assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
Added: tomcat/trunk/test/webapp/bug48668a.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug48668a.jsp?rev=907534&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/bug48668a.jsp (added)
+++ tomcat/trunk/test/webapp/bug48668a.jsp Mon Feb 8 01:58:06 2010
@@ -0,0 +1,26 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ page isELIgnored="true" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<html>
+ <head><title>Bug 48668a test case</title></head>
+ <body>
+ <p><tags:echo echo="00-Hello world" />#{foo.bar}</p>
+ <p><tags:echo echo="01-Hello world" />${foo.bar}</p>
+ </body>
+</html>
+
Propchange: tomcat/trunk/test/webapp/bug48668a.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/trunk/test/webapp/bug48668b.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug48668b.jsp?rev=907534&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/bug48668b.jsp (added)
+++ tomcat/trunk/test/webapp/bug48668b.jsp Mon Feb 8 01:58:06 2010
@@ -0,0 +1,25 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ page deferredSyntaxAllowedAsLiteral="true" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<html>
+ <head><title>Bug 48668b test case</title></head>
+ <body>
+ <p><tags:echo echo="00-Hello world" />#{foo.bar}</p>
+ </body>
+</html>
+
Propchange: tomcat/trunk/test/webapp/bug48668b.jsp
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
