Skip to content

Commit dcf7813

Browse files
committed
Fix failing test
Issue: SPR-10800
1 parent ad40ecf commit dcf7813

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.http.MediaType;
2525
import org.springframework.http.server.ServerHttpRequest;
2626
import org.springframework.http.server.ServerHttpResponse;
27+
import org.springframework.util.Assert;
2728
import org.springframework.web.socket.TextMessage;
2829
import org.springframework.web.socket.WebSocketHandler;
2930
import org.springframework.web.socket.WebSocketSession;
@@ -45,12 +46,13 @@ public abstract class AbstractHttpReceivingTransportHandler
4546

4647
@Override
4748
public final void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
48-
WebSocketHandler webSocketHandler, WebSocketSession webSocketSession) throws SockJsProcessingException {
49+
WebSocketHandler wsHandler, WebSocketSession wsSession) throws SockJsProcessingException {
4950

5051
// TODO: check "Sec-WebSocket-Protocol" header
5152
// https://github.com/sockjs/sockjs-client/issues/130
5253

53-
handleRequestInternal(request, response, webSocketHandler, webSocketSession);
54+
Assert.notNull(wsSession, "No session");
55+
handleRequestInternal(request, response, wsHandler, wsSession);
5456
}
5557

5658
protected void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
import org.springframework.web.socket.TextMessage;
2525
import org.springframework.web.socket.WebSocketHandler;
2626
import org.springframework.web.socket.sockjs.SockJsProcessingException;
27-
import org.springframework.web.socket.sockjs.transport.handler.AbstractHttpReceivingTransportHandler;
28-
import org.springframework.web.socket.sockjs.transport.handler.JsonpTransportHandler;
29-
import org.springframework.web.socket.sockjs.transport.handler.XhrTransportHandler;
3027
import org.springframework.web.socket.sockjs.transport.session.AbstractSockJsSession;
3128
import org.springframework.web.socket.sockjs.transport.session.StubSockJsServiceConfig;
3229
import org.springframework.web.socket.sockjs.transport.session.TestSockJsSession;
@@ -97,12 +94,10 @@ public void readMessagesBadContent() throws Exception {
9794
handleRequestAndExpectFailure();
9895
}
9996

100-
@Test
97+
@Test(expected=IllegalArgumentException.class)
10198
public void readMessagesNoSession() throws Exception {
10299
WebSocketHandler webSocketHandler = mock(WebSocketHandler.class);
103100
new XhrTransportHandler().handleRequest(this.request, this.response, webSocketHandler, null);
104-
105-
assertEquals(404, this.servletResponse.getStatus());
106101
}
107102

108103
@Test

0 commit comments

Comments
 (0)