Author: markt Date: Fri Apr 22 13:21:43 2016 New Revision: 1740520 URL: http://svn.apache.org/viewvc?rev=1740520&view=rev Log: Expand checks for proper WebSocket shutdown
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java?rev=1740520&r1=1740519&r2=1740520&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/BackgroundProcessManager.java Fri Apr 22 13:21:43 2016 @@ -108,6 +108,17 @@ public class BackgroundProcessManager { } + void shutdown() { + synchronized (processesLock) { + processes.clear(); + if (wsBackgroundThread != null) { + wsBackgroundThread.halt(); + wsBackgroundThread = null; + } + } + } + + private static class WsBackgroundThread extends Thread { private final BackgroundProcessManager manager; Modified: tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java?rev=1740520&r1=1740519&r2=1740520&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java Fri Apr 22 13:21:43 2016 @@ -41,5 +41,8 @@ public abstract class WebSocketBaseTest } Assert.assertEquals(0, BackgroundProcessManager.getInstance().getProcessCount()); + + // Ensure the next test is not affected + BackgroundProcessManager.getInstance().shutdown(); } } Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java?rev=1740520&r1=1740519&r2=1740520&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClassLoader.java Fri Apr 22 13:21:43 2016 @@ -35,12 +35,12 @@ import org.apache.catalina.Context; import org.apache.catalina.loader.WebappClassLoaderBase; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.tomcat.websocket.WebSocketBaseTest; /** * Tests endpoint methods are called with the correct class loader. */ -public class TestClassLoader extends TomcatBaseTest { +public class TestClassLoader extends WebSocketBaseTest { private static final String PASS = "PASS"; private static final String FAIL = "FAIL"; Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1740520&r1=1740519&r2=1740520&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java Fri Apr 22 13:21:43 2016 @@ -42,14 +42,14 @@ import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTest; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.websocket.WebSocketBaseTest; /** * Test the behavior of closing websockets under various conditions. */ -public class TestClose extends TomcatBaseTest { +public class TestClose extends WebSocketBaseTest { private static Log log = LogFactory.getLog(TestClose.class); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java?rev=1740520&r1=1740519&r2=1740520&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58264.java Fri Apr 22 13:21:43 2016 @@ -37,9 +37,9 @@ import org.junit.Test; import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.tomcat.websocket.WebSocketBaseTest; -public class TestCloseBug58264 extends TomcatBaseTest { +public class TestCloseBug58264 extends WebSocketBaseTest { @Test public void testOnErrorNotCalledWhenClosingConnection() throws Throwable { Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java?rev=1740520&r1=1740519&r2=1740520&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java Fri Apr 22 13:21:43 2016 @@ -37,15 +37,15 @@ import org.junit.Test; import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint; +import org.apache.tomcat.websocket.WebSocketBaseTest; /** * Tests inspired by https://bz.apache.org/bugzilla/show_bug.cgi?id=58835 to * check that WebSocket connections are closed gracefully on Tomcat shutdown. */ -public class TestShutdown extends TomcatBaseTest { +public class TestShutdown extends WebSocketBaseTest { @Test public void testShutdownBufferedMessages() throws Exception { Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1740520&r1=1740519&r2=1740520&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java Fri Apr 22 13:21:43 2016 @@ -42,11 +42,11 @@ import org.junit.Test; import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.tomcat.websocket.WebSocketBaseTest; import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient; @Ignore // This test requires manual intervention to create breakpoints etc. -public class TestWsRemoteEndpointImplServer extends TomcatBaseTest { +public class TestWsRemoteEndpointImplServer extends WebSocketBaseTest { /* * https://bz.apache.org/bugzilla/show_bug.cgi?id=58624 Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1740520&r1=1740519&r2=1740520&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Fri Apr 22 13:21:43 2016 @@ -33,14 +33,14 @@ import org.apache.catalina.Context; import org.apache.catalina.LifecycleState; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.unittest.TesterServletContext; import org.apache.tomcat.websocket.TesterEchoServer; import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText; +import org.apache.tomcat.websocket.WebSocketBaseTest; import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient; -public class TestWsServerContainer extends TomcatBaseTest { +public class TestWsServerContainer extends WebSocketBaseTest { @Test public void testBug54807() throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org