Author: markt
Date: Thu Apr 25 14:38:16 2013
New Revision: 1475800
URL: http://svn.apache.org/r1475800
Log:
Fix a handful of unit test failures triggered by WebSocket init changes.
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1475800&r1=1475799&r2=1475800&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Thu Apr 25 14:38:16 2013
@@ -28,6 +28,7 @@ import org.apache.catalina.startup.Simpl
import org.apache.catalina.startup.TestTomcat.MapRealm;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.server.WsListener;
public class TestFormAuthenticator extends TomcatBaseTest {
@@ -109,6 +110,7 @@ public class TestFormAuthenticator exten
File appDir = new File(getBuildDirectory(), "webapps/examples");
Context ctx = tomcat.addWebapp(null, "/examples",
appDir.getAbsolutePath());
+ ctx.addApplicationListener(WsListener.class.getName());
MapRealm realm = new MapRealm();
realm.addUser("tomcat", "tomcat");
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1475800&r1=1475799&r2=1475800&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Thu Apr 25
14:38:16 2013
@@ -50,6 +50,7 @@ import org.apache.catalina.deploy.Contex
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.catalina.realm.RealmBase;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.websocket.server.WsListener;
public class TestTomcat extends TomcatBaseTest {
@@ -259,8 +260,9 @@ public class TestTomcat extends TomcatBa
File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
- tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-
+ org.apache.catalina.Context ctxt = tomcat.addWebapp(
+ null, "/examples", appDir.getAbsolutePath());
+ ctxt.addApplicationListener(WsListener.class.getName());
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() +
@@ -274,7 +276,9 @@ public class TestTomcat extends TomcatBa
File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
- tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+ org.apache.catalina.Context ctxt = tomcat.addWebapp(
+ null, "/examples", appDir.getAbsolutePath());
+ ctxt.addApplicationListener(WsListener.class.getName());
tomcat.start();
@@ -394,6 +398,7 @@ public class TestTomcat extends TomcatBa
// app dir is relative to server home
org.apache.catalina.Context ctx =
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+ ctx.addApplicationListener(WsListener.class.getName());
Tomcat.addServlet(ctx, "testGetResource", new GetResource());
ctx.addServletMapping("/testGetResource", "testGetResource");
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1475800&r1=1475799&r2=1475800&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Thu Apr 25
14:38:16 2013
@@ -27,6 +27,7 @@ import static org.junit.Assert.fail;
import org.junit.Test;
+import org.apache.catalina.Context;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -34,6 +35,7 @@ import org.apache.coyote.ProtocolHandler
import org.apache.coyote.http11.AbstractHttp11JsseProtocol;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl;
+import org.apache.tomcat.websocket.server.WsListener;
/**
* The keys and certificates used in this file are all available in svn and
were
@@ -70,7 +72,9 @@ public class TestCustomSsl extends Tomca
connector.setProperty("SSLEnabled", "true");
File appDir = new File(getBuildDirectory(), "webapps/examples");
- tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+ Context ctxt = tomcat.addWebapp(
+ null, "/examples", appDir.getAbsolutePath());
+ ctxt.addApplicationListener(WsListener.class.getName());
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1475800&r1=1475799&r2=1475800&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Thu Apr 25
14:38:16 2013
@@ -38,6 +38,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;
/**
* The keys and certificates used in this file are all available in svn and
were
@@ -53,7 +54,9 @@ public class TestSsl extends TomcatBaseT
Tomcat tomcat = getTomcatInstance();
File appDir = new File(getBuildDirectory(), "webapps/examples");
- tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+ org.apache.catalina.Context ctxt = tomcat.addWebapp(
+ null, "/examples", appDir.getAbsolutePath());
+ ctxt.addApplicationListener(WsListener.class.getName());
TesterSupport.initSsl(tomcat);
@@ -70,7 +73,9 @@ public class TestSsl extends TomcatBaseT
Tomcat tomcat = getTomcatInstance();
File appDir = new File(getBuildDirectory(), "webapps/examples");
- tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+ org.apache.catalina.Context ctxt = tomcat.addWebapp(
+ null, "/examples", appDir.getAbsolutePath());
+ ctxt.addApplicationListener(WsListener.class.getName());
TesterSupport.initSsl(tomcat, "localhost-copy1.jks", "changeit",
"tomcatpass");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
