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

Fix configuration issues in DefaultSockJsService

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-08-09 16:50:37 -04:00
parent 01feae0ad5
commit 9925d8385f
6 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.web.socket.sockjs.transport.handler;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.junit.Before;
@@ -97,6 +98,30 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests {
assertNotNull(handlers.get(TransportType.EVENT_SOURCE));
}
@Test
public void defaultTransportHandlersWithOverride() {
XhrReceivingTransportHandler xhrHandler = new XhrReceivingTransportHandler();
DefaultSockJsService service = new DefaultSockJsService(mock(TaskScheduler.class), null, xhrHandler);
Map<TransportType, TransportHandler> handlers = service.getTransportHandlers();
assertEquals(8, handlers.size());
assertSame(xhrHandler, handlers.get(xhrHandler.getTransportType()));
}
@Test
public void customizedTransportHandlerList() {
List<TransportHandler> handlers = Arrays.<TransportHandler>asList(
new XhrPollingTransportHandler(), new XhrReceivingTransportHandler());
DefaultSockJsService service = new DefaultSockJsService(mock(TaskScheduler.class), handlers);
Map<TransportType, TransportHandler> actualHandlers = service.getTransportHandlers();
assertEquals(handlers.size(), actualHandlers.size());
}
@Test
public void handleTransportRequestXhr() throws Exception {

16
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java
View File

@@ -32,7 +32,7 @@ import static org.mockito.Mockito.*;
/**
* Test fixture for {@link AbstractHttpReceivingTransportHandler} and sub-classes
* {@link XhrTransportHandler} and {@link JsonpTransportHandler}.
* {@link XhrReceivingTransportHandler} and {@link JsonpReceivingTransportHandler}.
*
* @author Rossen Stoyanchev
*/
@@ -48,7 +48,7 @@ public class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTest
@Test
public void readMessagesXhr() throws Exception {
this.servletRequest.setContent("[\"x\"]".getBytes("UTF-8"));
handleRequest(new XhrTransportHandler());
handleRequest(new XhrReceivingTransportHandler());
assertEquals(204, this.servletResponse.getStatus());
}
@@ -56,7 +56,7 @@ public class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTest
@Test
public void readMessagesJsonp() throws Exception {
this.servletRequest.setContent("[\"x\"]".getBytes("UTF-8"));
handleRequest(new JsonpTransportHandler());
handleRequest(new JsonpReceivingTransportHandler());
assertEquals(200, this.servletResponse.getStatus());
assertEquals("ok", this.servletResponse.getContentAsString());
@@ -66,7 +66,7 @@ public class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTest
public void readMessagesJsonpFormEncoded() throws Exception {
this.servletRequest.setContent("d=[\"x\"]".getBytes("UTF-8"));
this.servletRequest.setContentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
handleRequest(new JsonpTransportHandler());
handleRequest(new JsonpReceivingTransportHandler());
assertEquals(200, this.servletResponse.getStatus());
assertEquals("ok", this.servletResponse.getContentAsString());
@@ -78,7 +78,7 @@ public class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTest
public void readMessagesJsonpFormEncodedWithEncoding() throws Exception {
this.servletRequest.setContent("d=[\"x\"]".getBytes("UTF-8"));
this.servletRequest.setContentType("application/x-www-form-urlencoded;charset=UTF-8");
handleRequest(new JsonpTransportHandler());
handleRequest(new JsonpReceivingTransportHandler());
assertEquals(200, this.servletResponse.getStatus());
assertEquals("ok", this.servletResponse.getContentAsString());
@@ -96,7 +96,7 @@ public class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTest
@Test(expected=IllegalArgumentException.class)
public void readMessagesNoSession() throws Exception {
WebSocketHandler webSocketHandler = mock(WebSocketHandler.class);
new XhrTransportHandler().handleRequest(this.request, this.response, webSocketHandler, null);
new XhrReceivingTransportHandler().handleRequest(this.request, this.response, webSocketHandler, null);
}
@Test
@@ -113,7 +113,7 @@ public class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTest
doThrow(new Exception()).when(wsHandler).handleMessage(session, new TextMessage("x"));
try {
XhrTransportHandler transportHandler = new XhrTransportHandler();
XhrReceivingTransportHandler transportHandler = new XhrReceivingTransportHandler();
transportHandler.setSockJsServiceConfiguration(sockJsConfig);
transportHandler.handleRequest(this.request, this.response, wsHandler, session);
fail("Expected exception");
@@ -143,7 +143,7 @@ public class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTest
WebSocketHandler wsHandler = mock(WebSocketHandler.class);
AbstractSockJsSession session = new TestHttpSockJsSession("1", new StubSockJsServiceConfig(), wsHandler);
new XhrTransportHandler().handleRequest(this.request, this.response, wsHandler, session);
new XhrReceivingTransportHandler().handleRequest(this.request, this.response, wsHandler, session);
assertEquals(500, this.servletResponse.getStatus());
verifyNoMoreInteractions(wsHandler);