Author: markt
Date: Mon Dec 16 11:47:02 2013
New Revision: 1551188
URL: http://svn.apache.org/r1551188
Log:
Add a unit test for tag files packaged in JARs
Added:
tomcat/trunk/test/org/apache/jasper/TestJspCpompilationContext.java (with
props)
tomcat/trunk/test/webapp/WEB-INF/lib/
tomcat/trunk/test/webapp/WEB-INF/lib/test-lib.jar (with props)
tomcat/trunk/test/webapp/jsp/tagFileInJar.jsp (with props)
Added: tomcat/trunk/test/org/apache/jasper/TestJspCpompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspCpompilationContext.java?rev=1551188&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/TestJspCpompilationContext.java (added)
+++ tomcat/trunk/test/org/apache/jasper/TestJspCpompilationContext.java Mon Dec
16 11:47:02 2013
@@ -0,0 +1,50 @@
+/*
+ * 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;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspCpompilationContext extends TomcatBaseTest {
+
+ @Test
+ public void testTagFileInJar() 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 body = new ByteChunk();
+
+ int rc = getUrl("http://localhost:"; + getPort() +
+ "/test/jsp/tagFileInJar.jsp", body, null);
+
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertTrue(body.toString().contains("00 - OK"));
+ }
+}
Propchange: tomcat/trunk/test/org/apache/jasper/TestJspCpompilationContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/trunk/test/webapp/WEB-INF/lib/test-lib.jar
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/lib/test-lib.jar?rev=1551188&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/trunk/test/webapp/WEB-INF/lib/test-lib.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/trunk/test/webapp/jsp/tagFileInJar.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/tagFileInJar.jsp?rev=1551188&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/tagFileInJar.jsp (added)
+++ tomcat/trunk/test/webapp/jsp/tagFileInJar.jsp Mon Dec 16 11:47:02 2013
@@ -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/test-lib"; prefix="testlib" %>
+<testlib:echo echo="00 - OK" />
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/tagFileInJar.jsp
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
