Author: markt
Date: Mon Apr 25 11:15:14 2016
New Revision: 1740811
URL: http://svn.apache.org/viewvc?rev=1740811&view=rev
Log:
Add a wait for the session to close on the server. Some failures were observed
on Gump when this hadn't happened by the time the test ended.
Add a check that no errors occurred on the server.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 25 11:15:14 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,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803
+/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-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java?rev=1740811&r1=1740810&r2=1740811&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
Mon Apr 25 11:15:14 2016
@@ -17,6 +17,7 @@
package org.apache.tomcat.websocket.server;
import java.net.URI;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletContextEvent;
import javax.websocket.ClientEndpoint;
@@ -32,6 +33,7 @@ import javax.websocket.WebSocketContaine
import javax.websocket.server.ServerContainer;
import javax.websocket.server.ServerEndpointConfig;
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -60,6 +62,17 @@ public class TestCloseBug58624 extends W
Session session = wsContainer.connectToServer(client, uri);
session.close();
+ // Wait for session to close on the server
+ int count = 0;
+ while (count < 50 && Bug58624ServerEndpoint.getOpenSessionCount() > 0)
{
+ count++;
+ Thread.sleep(100);
+ }
+ Assert.assertEquals(0, Bug58624ServerEndpoint.getOpenSessionCount());
+
+ // Ensure no errors were reported on the server
+ Assert.assertEquals(0, Bug58624ServerEndpoint.getErrorCount());
+
if (client.getError() != null) {
throw client.getError();
}
@@ -107,9 +120,20 @@ public class TestCloseBug58624 extends W
public static class Bug58624ServerEndpoint {
+ private static AtomicInteger openSessionCount = new AtomicInteger(0);
+ private static AtomicInteger errorCount = new AtomicInteger(0);
+
+ public static int getOpenSessionCount() {
+ return openSessionCount.get();
+ }
+
+ public static int getErrorCount() {
+ return errorCount.get();
+ }
+
@OnOpen
public void onOpen() {
- System.out.println("Session opened");
+ openSessionCount.incrementAndGet();
}
@@ -121,14 +145,14 @@ public class TestCloseBug58624 extends W
@OnError
public void onError(Throwable t) {
- System.out.println("HERE");
+ errorCount.incrementAndGet();
t.printStackTrace();
}
@OnClose
- public void onClose(CloseReason cr) {
- System.out.println("Session closed: " + cr);
+ public void onClose(@SuppressWarnings("unused") CloseReason cr) {
+ openSessionCount.decrementAndGet();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
