Author: markt
Date: Thu Oct 25 08:44:16 2012
New Revision: 1402024
URL: http://svn.apache.org/viewvc?rev=1402024&view=rev
Log:
Test case for BZ54012
Added:
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
(with props)
tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag
tomcat/trunk/test/webapp-3.0/bug54012.jsp (with props)
Added: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java?rev=1402024&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
(added)
+++ tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java Thu
Oct 25 08:44:16 2012
@@ -0,0 +1,73 @@
+/*
+ * 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 TestSet extends TomcatBaseTest {
+
+ @Test
+ public void testBug54011() throws Exception {
+ }
+
+ public void toFix() throws Exception {
+ // TODO: Extract common code from this test and TestOut.java
+ 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/bug54012.jsp", res, null);
+
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+ String body = res.toString();
+ Assert.assertTrue(body.contains("OK"));
+ }
+}
Propchange:
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag?rev=1402024&view=auto
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag (added)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags/bug54012.tag Thu Oct 25 08:44:16
2012
@@ -0,0 +1,20 @@
+<%--
+ 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.
+--%><%@ tag %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<%@ tag body-content="empty" %>
+<c:set var="test" value="OK" />
+<p><c:out value="${test}"/></p>
\ No newline at end of file
Added: tomcat/trunk/test/webapp-3.0/bug54012.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug54012.jsp?rev=1402024&view=auto
==============================================================================
--- tomcat/trunk/test/webapp-3.0/bug54012.jsp (added)
+++ tomcat/trunk/test/webapp-3.0/bug54012.jsp Thu Oct 25 08:44:16 2012
@@ -0,0 +1,24 @@
+<%--
+ 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 prefix="tags" tagdir="/WEB-INF/tags" %>
+<html>
+ <body>
+ <tags:bug54012 />
+ </body>
+</html>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp-3.0/bug54012.jsp
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
