Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove awaitCloseStatus in SockJS integration tests

Browse Source 
A CloseStatus may not be received if the connection is closed while
the client is between XHR polling requests.
This commit is contained in:
Rossen Stoyanchev
2014-07-22 13:40:02 -04:00
parent 6c4aff4c9d
commit 988499f7dc
1 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.web.socket.sockjs.client;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -31,7 +30,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.util.concurrent.ListenableFutureCallback;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.WebSocketTestServer;
@@ -64,9 +62,7 @@ import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.fail;
/**
@@ -166,20 +162,20 @@ public abstract class AbstractSockJsIntegrationTests {
@Ignore
@Test
public void closeAfterOneMessageWebSocket() throws Exception {
testCloseAfterOneMessage(createWebSocketTransport());
public void receiveOneMessageWebSocket() throws Exception {
testReceiveOneMessage(createWebSocketTransport());
}
@Test
public void closeAfterOneMessageXhrStreaming() throws Exception {
testCloseAfterOneMessage(createXhrTransport());
public void receiveOneMessageXhrStreaming() throws Exception {
testReceiveOneMessage(createXhrTransport());
}
@Test
public void closeAfterOneMessageXhr() throws Exception {
public void receiveOneMessageXhr() throws Exception {
AbstractXhrTransport xhrTransport = createXhrTransport();
xhrTransport.setXhrStreamingDisabled(true);
testCloseAfterOneMessage(xhrTransport);
testReceiveOneMessage(xhrTransport);
}
@Test
@@ -251,7 +247,7 @@ public abstract class AbstractSockJsIntegrationTests {
session.close();
}
private void testCloseAfterOneMessage(Transport transport) throws Exception {
private void testReceiveOneMessage(Transport transport) throws Exception {
TestClientHandler clientHandler = new TestClientHandler();
initSockJsClient(transport);
this.sockJsClient.doHandshake(clientHandler, this.baseUrl + "/test").get();
@@ -263,16 +259,6 @@ public abstract class AbstractSockJsIntegrationTests {
TextMessage message = new TextMessage("message1");
serverHandler.session.sendMessage(message);
clientHandler.awaitMessage(message, 5000);
CloseStatus expected = new CloseStatus(3500, "Oops");
serverHandler.session.close(expected);
CloseStatus actual = clientHandler.awaitCloseStatus(5000);
if (transport instanceof XhrTransport) {
assertThat(actual, Matchers.anyOf(equalTo(expected), equalTo(new CloseStatus(3000, "Go away!"))));
}
else {
assertEquals(expected, actual);
}
}
@@ -324,8 +310,6 @@ public abstract class AbstractSockJsIntegrationTests {
private volatile Throwable transportError;
private volatile CloseStatus closeStatus;
@Override
public void afterConnectionEstablished(WebSocketSession session) throws Exception {
@@ -342,11 +326,6 @@ public abstract class AbstractSockJsIntegrationTests {
this.transportError = exception;
}
@Override
public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
this.closeStatus = status;
}
public void awaitMessageCount(final int count, long timeToWait) throws Exception {
awaitEvent(() -> receivedMessages.size() >= count, timeToWait,
count + " number of messages. Received so far: " + this.receivedMessages);
@@ -364,14 +343,6 @@ public abstract class AbstractSockJsIntegrationTests {
fail("Timed out waiting for [" + expected + "]");
}
}
public CloseStatus awaitCloseStatus(long timeToWait) throws InterruptedException {
awaitEvent(() -> this.closeStatus != null || this.transportError != null, timeToWait, " CloseStatus");
if (this.transportError != null) {
throw new AssertionError("Transport error", this.transportError);
}
return this.closeStatus;
}
}
private static class TestServerHandler extends TextWebSocketHandler {