From 2f106fbb32128097491895b0d29049d768ed3b52 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 4 Sep 2019 22:02:47 -0700 Subject: [PATCH] Polishing web socket test to use BDD Mockito --- .../server/support/WebSocketHttpRequestHandlerTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java index 54ec421638..d55f0a9579 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java @@ -35,7 +35,7 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.when; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -70,8 +70,8 @@ public class WebSocketHttpRequestHandlerTests { TestInterceptor interceptor = new TestInterceptor(true); this.requestHandler.setHandshakeInterceptors(Collections.singletonList(interceptor)); - when(this.handshakeHandler.doHandshake(any(), any(), any(), any())) - .thenThrow(new IllegalStateException("bad state")); + given(this.handshakeHandler.doHandshake(any(), any(), any(), any())) + .willThrow(new IllegalStateException("bad state")); assertThatThrownBy(() -> this.requestHandler.handleRequest(new MockHttpServletRequest(), this.response)) .isInstanceOf(HandshakeFailureException.class)