You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/10/24 20:20:26 UTC
svn commit: r1401810 - in /tomcat/trunk/test: org/apache/jasper/tagplugins/
org/apache/jasper/tagplugins/jstl/ org/apache/jasper/tagplugins/jstl/core/
org/apache/jasper/tagplugins/jstl/core/TestOut.java webapp-3.0/bug54011.jsp
Author: markt
Date: Wed Oct 24 18:20:25 2012
New Revision: 1401810
URL: http://svn.apache.org/viewvc?rev=1401810&view=rev
Log:
Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=54011
Note: This uses the new Resources API so can't be directly back-ported to 7.0.x.
Added:
tomcat/trunk/test/org/apache/jasper/tagplugins/
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java (with props)
tomcat/trunk/test/webapp-3.0/bug54011.jsp (with props)
Added: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java?rev=1401810&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java (added)
+++ tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java Wed Oct 24 18:20:25 2012
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+package org.apache.jasper.tagplugins.jstl.core;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.WebResourceRoot;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.webresources.StandardRoot;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestOut extends TomcatBaseTest {
+
+ @Test
+ public void testBug54011() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp-3.0");
+ Context ctx = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+ ctx.setResources(new StandardRoot(ctx));
+
+ // Add the JSTL (we need the TLD)
+ File lib = new File("webapps/examples/WEB-INF/lib");
+ ctx.getResources().createWebResourceSet(
+ WebResourceRoot.ResourceSetType.POST, lib.getAbsolutePath(),
+ "/WEB-INF/lib", "");
+
+ // Configure the use of the plug-in rather than the standard impl
+ File plugin = new File(
+ "java/org/apache/jasper/tagplugins/jstl/tagPlugins.xml");
+ ctx.getResources().createWebResourceSet(
+ WebResourceRoot.ResourceSetType.POST, plugin.getAbsolutePath(),
+ "/WEB-INF/tagPlugins.xml", "");
+
+ tomcat.start();
+
+ ByteChunk res = new ByteChunk();
+
+ int rc = getUrl("http://localhost:" + getPort() +
+ "/test/bug54011.jsp", res, null);
+
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+ String body = res.toString();
+ Assert.assertTrue(body.contains("OK - 1"));
+ Assert.assertTrue(body.contains("OK - 2"));
+ }
+}
Propchange: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/trunk/test/webapp-3.0/bug54011.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug54011.jsp?rev=1401810&view=auto
==============================================================================
--- tomcat/trunk/test/webapp-3.0/bug54011.jsp (added)
+++ tomcat/trunk/test/webapp-3.0/bug54011.jsp Wed Oct 24 18:20:25 2012
@@ -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 language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1" session="false"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+ <body>
+ <p><c:out escapeXml="false" value="OK - 1"/></p>
+ <p><c:out default="OK - 2" value="${request.session}"/></p>
+ </body>
+</html>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp-3.0/bug54011.jsp
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org