Author: markt
Date: Thu Apr 14 12:52:35 2016
New Revision: 1739082
URL: http://svn.apache.org/viewvc?rev=1739082&view=rev
Log:
Expand the check that the BackgroundProcessManager has correctly shut down at
the end of the test to more WebSocket tests.
Added:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
- copied unchanged from r1739079,
tomcat/trunk/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 14 12:52:35 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1739082&r1=1739081&r2=1739082&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
Thu Apr 14 12:52:35 2016
@@ -32,11 +32,10 @@ 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;
-public class TestWebSocketFrameClient extends TomcatBaseTest {
+public class TestWebSocketFrameClient extends WebSocketBaseTest {
@Test
public void testConnectToServerEndpoint() throws Exception {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1739082&r1=1739081&r2=1739082&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Thu Apr 14 12:52:35 2016
@@ -33,13 +33,12 @@ 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.util.net.TesterSupport;
import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText;
import org.apache.tomcat.websocket.TesterMessageCountClient.SleepingText;
import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
-public class TestWebSocketFrameClientSSL extends TomcatBaseTest {
+public class TestWebSocketFrameClientSSL extends WebSocketBaseTest {
@Test
public void testConnectToServerEndpoint() throws Exception {
@@ -150,20 +149,5 @@ public class TestWebSocketFrameClientSSL
// Close the client session.
wsSession.close();
-
- // Make sure the background process has stopped (else in some test
- // environments it will continue to run and break other tests that
check
- // it has stopped.
- count = 0;
- while (count < 50) {
- if (BackgroundProcessManager.getInstance().getProcessCount() == 0)
{
- break;
- }
- Thread.sleep(100);
- count++;
- }
-
- Assert.assertEquals(0,
BackgroundProcessManager.getInstance().getProcessCount());
-
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1739082&r1=1739081&r2=1739082&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
Thu Apr 14 12:52:35 2016
@@ -33,12 +33,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.TesterMessageCountClient.TesterEndpoint;
import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
-public class TestWsPingPongMessages extends TomcatBaseTest {
+public class TestWsPingPongMessages extends WebSocketBaseTest {
ByteBuffer applicationData = ByteBuffer.wrap(new String("mydata")
.getBytes());
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1739082&r1=1739081&r2=1739082&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
Thu Apr 14 12:52:35 2016
@@ -38,7 +38,6 @@ 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.AsyncBinary;
import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncHandler;
import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncText;
@@ -46,7 +45,7 @@ import org.apache.tomcat.websocket.Teste
import org.apache.tomcat.websocket.TesterMessageCountClient.TesterEndpoint;
import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
-public class TestWsRemoteEndpoint extends TomcatBaseTest {
+public class TestWsRemoteEndpoint extends WebSocketBaseTest {
private static final String SEQUENCE = "ABCDE";
private static final int S_LEN = SEQUENCE.length();
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1739082&r1=1739081&r2=1739082&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
Thu Apr 14 12:52:35 2016
@@ -36,11 +36,10 @@ 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.TesterProgrammaticEndpoint;
import org.apache.tomcat.websocket.server.TesterEndpointConfig;
-public class TestWsSubprotocols extends TomcatBaseTest {
+public class TestWsSubprotocols extends WebSocketBaseTest {
@Test
public void testWsSubprotocols() throws Exception {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1739082&r1=1739081&r2=1739082&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Thu Apr 14 12:52:35 2016
@@ -50,7 +50,6 @@ 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.util.net.TesterSupport;
import org.apache.tomcat.websocket.TesterMessageCountClient.BasicBinary;
import org.apache.tomcat.websocket.TesterMessageCountClient.BasicHandler;
@@ -60,7 +59,7 @@ import org.apache.tomcat.websocket.Teste
import org.apache.tomcat.websocket.server.Constants;
import org.apache.tomcat.websocket.server.WsContextListener;
-public class TestWsWebSocketContainer extends TomcatBaseTest {
+public class TestWsWebSocketContainer extends WebSocketBaseTest {
private static final String MESSAGE_EMPTY = "";
private static final String MESSAGE_STRING_1 = "qwerty";
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
