From 8edbdf4ddb144cc4abd5e8cdf14d99c9732f6d4d Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 1 Apr 2014 13:33:09 -0400 Subject: [PATCH] Fix failing test --- .../adapter/jetty/JettyWebSocketHandlerAdapterTests.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java index e4102d956b..d4d55e822e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java @@ -17,8 +17,11 @@ package org.springframework.web.socket.adapter.jetty; import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.UpgradeRequest; +import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.adapter.jetty.JettyWebSocketHandlerAdapter; @@ -45,6 +48,9 @@ public class JettyWebSocketHandlerAdapterTests { @Before public void setup() { this.session = mock(Session.class); + when(this.session.getUpgradeRequest()).thenReturn(Mockito.mock(UpgradeRequest.class)); + when(this.session.getUpgradeResponse()).thenReturn(Mockito.mock(UpgradeResponse.class)); + this.webSocketHandler = mock(WebSocketHandler.class); this.webSocketSession = new JettyWebSocketSession(null, null); this.adapter = new JettyWebSocketHandlerAdapter(this.webSocketHandler, this.webSocketSession); -- GitLab