Author: jboynes
Date: Sat Jul 20 19:00:17 2013
New Revision: 1505190
URL: http://svn.apache.org/r1505190
Log:
Add disabled testcase for #55285
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1505190&r1=1505189&r2=1505190&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java Sat
Jul 20 19:00:17 2013
@@ -17,13 +17,17 @@
package org.apache.catalina.core;
import java.io.File;
+import java.util.Collection;
import javax.servlet.Filter;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
+import javax.servlet.descriptor.JspConfigDescriptor;
+import javax.servlet.descriptor.JspPropertyGroupDescriptor;
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -116,6 +120,34 @@ public class TestApplicationContext exte
Assert.assertNotNull(servletContext.getJspConfigDescriptor());
}
+ @Test
+ @Ignore("Bug 55285")
+ public void testJspPropertyGroupsAreIsolated() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp");
+ // app dir is relative to server home
+ StandardContext standardContext = (StandardContext) tomcat.addWebapp(
+ null, "/test", appDir.getAbsolutePath());
+
+ ServletContext servletContext = standardContext.getServletContext();
+
+ Assert.assertNull(servletContext.getJspConfigDescriptor());
+
+ tomcat.start();
+
+ JspConfigDescriptor jspConfigDescriptor =
+ servletContext.getJspConfigDescriptor();
+ Collection<JspPropertyGroupDescriptor> propertyGroups =
+ jspConfigDescriptor.getJspPropertyGroups();
+ Assert.assertFalse(propertyGroups.isEmpty());
+ propertyGroups.clear();
+
+ jspConfigDescriptor = servletContext.getJspConfigDescriptor();
+ propertyGroups = jspConfigDescriptor.getJspPropertyGroups();
+ Assert.assertFalse(propertyGroups.isEmpty());
+ }
+
private ServletContext getServletContext() {
Tomcat tomcat = getTomcatInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
