Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

433262 - WebSocket / Advanced close use cases 

+ because of the race condition in close on testNetworkCongestion(), the
  test has been modified to allow for either close condition as valid.
This commit is contained in:
Joakim Erdfelt 2014-05-07 16:14:50 -07:00
parent 8ff1cec570
commit 74e7195356
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
View File

@ -31,6 +31,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.EofException; import org.eclipse.jetty.io.EofException;
@ -78,6 +79,7 @@ public class ClientCloseTest
public int closeCode = -1; public int closeCode = -1;
public String closeReason = null; public String closeReason = null;
public CountDownLatch closeLatch = new CountDownLatch(1); public CountDownLatch closeLatch = new CountDownLatch(1);
public AtomicInteger closeCount = new AtomicInteger(0);
public CountDownLatch openLatch = new CountDownLatch(1); public CountDownLatch openLatch = new CountDownLatch(1);
public EventQueue<String> messageQueue = new EventQueue<>(); public EventQueue<String> messageQueue = new EventQueue<>();
@ -95,6 +97,7 @@ public class ClientCloseTest
long maxTimeout = clientTimeoutMs * 2; long maxTimeout = clientTimeoutMs * 2;
Assert.assertThat("Client Close Event Occurred",closeLatch.await(maxTimeout,TimeUnit.MILLISECONDS),is(true)); Assert.assertThat("Client Close Event Occurred",closeLatch.await(maxTimeout,TimeUnit.MILLISECONDS),is(true));
Assert.assertThat("Client Close Event Count",closeCount.get(),is(1));
Assert.assertThat("Client Close Event Status Code",closeCode,statusCodeMatcher); Assert.assertThat("Client Close Event Status Code",closeCode,statusCodeMatcher);
if (reasonMatcher == null) if (reasonMatcher == null)
{ {
@ -133,6 +136,7 @@ public class ClientCloseTest
{ {
LOG.debug("onWebSocketClose({},{})",statusCode,reason); LOG.debug("onWebSocketClose({},{})",statusCode,reason);
super.onWebSocketClose(statusCode,reason); super.onWebSocketClose(statusCode,reason);
closeCount.incrementAndGet();
closeCode = statusCode; closeCode = statusCode;
closeReason = reason; closeReason = reason;
closeLatch.countDown(); closeLatch.countDown();
@ -427,7 +431,9 @@ public class ClientCloseTest
// client idle timeout triggers close event on client ws-endpoint // client idle timeout triggers close event on client ws-endpoint
// client close event on ws-endpoint // client close event on ws-endpoint
clientSocket.assertReceivedCloseEvent(timeout,is(StatusCode.SHUTDOWN),containsString("Timeout")); clientSocket.assertReceivedCloseEvent(timeout,
anyOf(is(StatusCode.SHUTDOWN),is(StatusCode.ABNORMAL)),
anyOf(containsString("Timeout"),containsString("Write")));
} }
@Test @Test