Author: markt
Date: Thu Jul 8 21:28:21 2010
New Revision: 961947
URL: http://svn.apache.org/viewvc?rev=961947&view=rev
Log:
Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49555
Fix to follow shortly
Added:
tomcat/trunk/test/webapp-3.0/bug49555.jsp (with props)
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/el/TesterFunctions.java
tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=961947&r1=961946&r2=961947&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Thu Jul 8 21:28:21 2010
@@ -309,6 +309,22 @@ public class TestELInJsp extends TomcatB
assertEcho(result, "{OK}");
}
+ public void testBug49555() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp-3.0");
+ // app dir is relative to server home
+ tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
+ "/test/bug49555.jsp");
+
+ String result = res.toString();
+ assertEcho(result, "00-" + TesterFunctions.Inner.RETVAL);
+ }
+
public void testELMisc() throws Exception {
Tomcat tomcat = getTomcatInstance();
Modified: tomcat/trunk/test/org/apache/el/TesterFunctions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterFunctions.java?rev=961947&r1=961946&r2=961947&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TesterFunctions.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterFunctions.java Thu Jul 8 21:28:21
2010
@@ -21,4 +21,12 @@ public class TesterFunctions {
public static String trim(String input) {
return input.trim();
}
+
+ public static class Inner {
+
+ public static final String RETVAL = "Return from bug49555";
+ public static String bug49555() {
+ return RETVAL;
+ }
+ }
}
Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld?rev=961947&r1=961946&r2=961947&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld Thu Jul 8 21:28:21 2010
@@ -67,5 +67,9 @@
<scope>AT_END</scope>
</variable>
</tag>
-
+ <function>
+ <name>bug49555</name>
+ <function-class>org.apache.el.TesterFunctions$Inner</function-class>
+ <function-signature>java.lang.String bug49555()</function-signature>
+ </function>
</taglib>
\ No newline at end of file
Added: tomcat/trunk/test/webapp-3.0/bug49555.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug49555.jsp?rev=961947&view=auto
==============================================================================
--- tomcat/trunk/test/webapp-3.0/bug49555.jsp (added)
+++ tomcat/trunk/test/webapp-3.0/bug49555.jsp Thu Jul 8 21:28:21 2010
@@ -0,0 +1,18 @@
+<%--
+ 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.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/bugs"; prefix="bugs" %>
+<p>00-${bugs:bug49555()}</p>
Propchange: tomcat/trunk/test/webapp-3.0/bug49555.jsp
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
