svn commit: r1719446 - /tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java

[markt]

Author: markt
Date: Fri Dec 11 15:10:17 2015
New Revision: 1719446

URL: http://svn.apache.org/viewvc?rev=1719446&view=rev
Log:
Enable test to handle different TCP reset behaviours on different operating 
systems

Modified:
    tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java

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=1719446&r1=1719445&r2=1719446&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java Fri Dec 
11 15:10:17 2015
@@ -17,6 +17,8 @@
 package org.apache.tomcat.websocket.server;
 
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -90,10 +92,19 @@ public class TestClose extends TomcatBas
     }
 
 
-    public static void awaitOnClose(CloseCode code) {
+    public static void awaitOnClose(CloseCode... codes) {
+        Set<CloseCode> set = new HashSet<>();
+        for (CloseCode code : codes) {
+            set.add(code);
+        }
+        awaitOnClose(set);
+    }
+
+
+    public static void awaitOnClose(Set<CloseCode> codes) {
         awaitLatch(events.onCloseCalled, "onClose not called");
-        Assert.assertEquals(code.getCode(), events.closeReason.getCloseCode()
-                .getCode());
+        CloseCode received = events.closeReason.getCloseCode();
+        Assert.assertTrue("Rx: " + received, codes.contains(received));
     }
 
 
@@ -159,8 +170,14 @@ public class TestClose extends TomcatBas
         client.sendCloseFrame(CloseCodes.GOING_AWAY);
         client.forceCloseSocket();
 
-        // WebSocket 1.1, section 2.1.5 requires this to be CLOSED_ABNORMALLY
-        awaitOnClose(CloseCodes.CLOSED_ABNORMALLY);
+        // WebSocket 1.1, section 2.1.5 requires this to be CLOSED_ABNORMALLY 
if
+        // the container initiates the close and the close close from the 
client
+        // if the client initiates it. When the client resets the TCP 
connection
+        // after sending the close, different operating systems react different
+        // ways. Some present the close message then drop the connection, some
+        // just drop the connection. Therefore, this test has to handle both
+        // close codes.
+        awaitOnClose(CloseCodes.CLOSED_ABNORMALLY, CloseCodes.GOING_AWAY);
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org