From dcf7813de84267fb82aed351a8175e89ae7fedd8 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 31 Jul 2013 22:06:15 -0400 Subject: [PATCH] Fix failing test Issue: SPR-10800 --- .../handler/AbstractHttpReceivingTransportHandler.java | 6 ++++-- .../handler/HttpReceivingTransportHandlerTests.java | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java index 690b87d043e..930a5362055 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java @@ -24,6 +24,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; +import org.springframework.util.Assert; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; @@ -45,12 +46,13 @@ public abstract class AbstractHttpReceivingTransportHandler @Override public final void handleRequest(ServerHttpRequest request, ServerHttpResponse response, - WebSocketHandler webSocketHandler, WebSocketSession webSocketSession) throws SockJsProcessingException { + WebSocketHandler wsHandler, WebSocketSession wsSession) throws SockJsProcessingException { // TODO: check "Sec-WebSocket-Protocol" header // https://github.com/sockjs/sockjs-client/issues/130 - handleRequestInternal(request, response, webSocketHandler, webSocketSession); + Assert.notNull(wsSession, "No session"); + handleRequestInternal(request, response, wsHandler, wsSession); } protected void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response, diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java index b4c7d2f5358..1fd4b45b0a8 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java @@ -24,9 +24,6 @@ import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.sockjs.SockJsProcessingException; -import org.springframework.web.socket.sockjs.transport.handler.AbstractHttpReceivingTransportHandler; -import org.springframework.web.socket.sockjs.transport.handler.JsonpTransportHandler; -import org.springframework.web.socket.sockjs.transport.handler.XhrTransportHandler; import org.springframework.web.socket.sockjs.transport.session.AbstractSockJsSession; import org.springframework.web.socket.sockjs.transport.session.StubSockJsServiceConfig; import org.springframework.web.socket.sockjs.transport.session.TestSockJsSession; @@ -97,12 +94,10 @@ public class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTest handleRequestAndExpectFailure(); } - @Test + @Test(expected=IllegalArgumentException.class) public void readMessagesNoSession() throws Exception { WebSocketHandler webSocketHandler = mock(WebSocketHandler.class); new XhrTransportHandler().handleRequest(this.request, this.response, webSocketHandler, null); - - assertEquals(404, this.servletResponse.getStatus()); } @Test