Author: markt
Date: Fri Mar 18 15:36:36 2016
New Revision: 1735618
URL: http://svn.apache.org/viewvc?rev=1735618&view=rev
Log:
Make test more robust after failure observed with NIO2
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 15:36:36 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java?rev=1735618&r1=1735617&r2=1735618&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestShutdown.java
Fri Mar 18 15:36:36 2016
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.net.URI;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
import javax.websocket.ClientEndpointConfig;
import javax.websocket.ContainerProvider;
@@ -68,6 +69,14 @@ public class TestShutdown extends Tomcat
wsSession.addMessageHandler(handler);
wsSession.getBasicRemote().sendText("Hello");
+ int count = 0;
+ while (count < 10 && EchoBufferedEndpoint.messageCount.get() == 0) {
+ Thread.sleep(200);
+ count++;
+ }
+ Assert.assertNotEquals("Message not received by server",
+ EchoBufferedEndpoint.messageCount.get(), 0);
+
tomcat.stop();
Assert.assertTrue("Latch expired waiting for message", latch.await(10,
TimeUnit.SECONDS));
@@ -85,6 +94,8 @@ public class TestShutdown extends Tomcat
@ServerEndpoint("/test")
public static class EchoBufferedEndpoint {
+ private static AtomicLong messageCount = new AtomicLong(0);
+
@OnOpen
public void onOpen(Session session, @SuppressWarnings("unused")
EndpointConfig epc)
throws IOException {
@@ -93,6 +104,7 @@ public class TestShutdown extends Tomcat
@OnMessage
public void onMessage(Session session, String msg) throws IOException {
+ messageCount.incrementAndGet();
session.getBasicRemote().sendText(msg);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
