svn commit: r1475807 - in /tomcat/trunk/test/org/apache/catalina/servlets: TestDefaultServlet.java TestWebdavServlet.java

[markt]

Author: markt
Date: Thu Apr 25 14:51:17 2013
New Revision: 1475807

URL: http://svn.apache.org/r1475807
Log:
Fix some more unit test failures triggered by WebSocket init changes.

Modified:
    tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
    tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java

Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1475807&r1=1475806&r2=1475807&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Thu 
Apr 25 14:51:17 2013
@@ -43,6 +43,7 @@ import org.apache.catalina.startup.Simpl
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.websocket.server.WsListener;
 
 public class TestDefaultServlet extends TomcatBaseTest {
 
@@ -100,6 +101,7 @@ public class TestDefaultServlet extends 
         // app dir is relative to server home
         org.apache.catalina.Context ctx =
             tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+        ctx.addApplicationListener(WsListener.class.getName());
 
         // Override the default servlet with our own mappings
         Tomcat.addServlet(ctx, "default2", new DefaultServlet());

Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java?rev=1475807&r1=1475806&r2=1475807&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java Thu 
Apr 25 14:51:17 2013
@@ -30,6 +30,7 @@ import org.junit.Test;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.websocket.server.WsListener;
 
 public class TestWebdavServlet extends TomcatBaseTest {
 
@@ -93,6 +94,7 @@ public class TestWebdavServlet extends T
 
         Tomcat.addServlet(ctx, "webdav", new WebdavServlet());
         ctx.addServletMapping("/webdav/*", "webdav");
+        ctx.addApplicationListener(WsListener.class.getName());
 
         tomcat.start();
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org