Author: markt
Date: Tue Mar 1 13:24:31 2011
New Revision: 1075811
URL: http://svn.apache.org/viewvc?rev=1075811&view=rev
Log:
Fix bug in unit test due to some Lifecycle refactoring
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1075811&r1=1075810&r2=1075811&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Tue Mar 1 13:24:31 2011
@@ -29,6 +29,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.deploy.WebXml;
import org.apache.catalina.startup.ContextConfig;
@@ -149,6 +151,9 @@ public class TestStandardContextResource
// prevent it from looking ( if it finds one - it'll have dup error )
config1.setDefaultWebXml("org/apache/catalin/startup/NO_DEFAULT_XML");
listener1[1] = config1;
+ // Need to init since context won't call init
+ config1.lifecycleEvent(
+ new LifecycleEvent(ctx, Lifecycle.AFTER_INIT_EVENT, null));
Tomcat.addServlet(ctx, "getresource", new GetResourceServlet());
ctx.addServletMapping("/getresource", "getresource");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
