Author: markt
Date: Fri Feb 21 11:59:30 2014
New Revision: 1570540
URL: http://svn.apache.org/r1570540
Log:
Back-port unit test for bug 56147
Added:
tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanD.java
- copied, changed from r1570176,
tomcat/trunk/test/org/apache/el/TesterBeanD.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56147.jsp
- copied, changed from r1570294,
tomcat/trunk/test/webapp/bug5nnnn/bug56147.jsp
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1570176
Modified: tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java?rev=1570540&r1=1570539&r2=1570540&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java Fri Feb 21
11:59:30 2014
@@ -465,6 +465,29 @@ public class TestELInJsp extends TomcatB
}
+ @Test
+ public void testBug56147() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp-3.0");
+ // app dir is relative to server home
+ StandardContext ctx = (StandardContext) tomcat.addWebapp(
+ null, "/test", appDir.getAbsolutePath());
+
+ // This test needs the JSTL libraries
+ File lib = new File("webapps/examples/WEB-INF/lib");
+ ctx.setAliases("/WEB-INF/lib=" + lib.getCanonicalPath());
+
+ tomcat.start();
+
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
+ "/test/bug5nnnn/bug56147.jsp");
+
+ String result = res.toString();
+ assertEcho(result, "00-OK");
+ }
+
+
// Assertion for text contained with <p></p>, e.g. printed by tags:echo
private static void assertEcho(String result, String expected) {
assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
Copied: tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanD.java (from
r1570176, tomcat/trunk/test/org/apache/el/TesterBeanD.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanD.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanD.java&p1=tomcat/trunk/test/org/apache/el/TesterBeanD.java&r1=1570176&r2=1570540&rev=1570540&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TesterBeanD.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanD.java Fri Feb 21
11:59:30 2014
@@ -24,7 +24,7 @@ import java.util.List;
*/
public class TesterBeanD {
- private List<Object> things = new ArrayList<>();
+ private List<Object> things = new ArrayList<Object>();
public void addThing(String thing) {
things.add(thing);
Copied: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56147.jsp (from
r1570294, tomcat/trunk/test/webapp/bug5nnnn/bug56147.jsp)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56147.jsp?p2=tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56147.jsp&p1=tomcat/trunk/test/webapp/bug5nnnn/bug56147.jsp&r1=1570294&r2=1570540&rev=1570540&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/bug5nnnn/bug56147.jsp (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56147.jsp Fri Feb 21
11:59:30 2014
@@ -20,7 +20,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<html>
<%
- List<Object> list = new ArrayList<>();
+ List<Object> list = new ArrayList<Object>();
list.add(new TesterBeanD());
pageContext.setAttribute("listItems", list);
%>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
