Skip to content

Commit f51838b

Browse files
rstoyanchevrstoyanchev
committed
Polishing spring-websocket tests
1 parent 19588d4 commit f51838b

File tree

4 files changed

+40
-25
lines changed

4 files changed

+40
-25
lines changed

‎spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@
5555
*/
5656
public abstract class AbstractWebSocketIntegrationTests {
5757

58-
private static Map<Class<?>, Class<?>> upgradeStrategyConfigTypes = Map.of(
59-
JettyWebSocketTestServer.class, JettyUpgradeStrategyConfig.class, //
60-
TomcatWebSocketTestServer.class, TomcatUpgradeStrategyConfig.class, //
58+
private static final Map<Class<?>, Class<?>> upgradeStrategyConfigTypes = Map.of(
59+
JettyWebSocketTestServer.class, JettyUpgradeStrategyConfig.class,
60+
TomcatWebSocketTestServer.class, TomcatUpgradeStrategyConfig.class,
6161
UndertowTestServer.class, UndertowUpgradeStrategyConfig.class);
6262

63-
@SuppressWarnings("removal")
6463
static Stream<Arguments> argumentsFactory() {
6564
return Stream.of(
6665
arguments(named("Tomcat", new TomcatWebSocketTestServer()), named("Standard", new StandardWebSocketClient())),
@@ -112,7 +111,7 @@ protected void setup(WebSocketTestServer server, WebSocketClient webSocketClient
112111
protected abstract Class<?>[] getAnnotatedConfigClasses();
113112

114113
@AfterEach
115-
void teardown() throws Exception {
114+
void teardown() {
116115
try {
117116
if (this.webSocketClient instanceof Lifecycle) {
118117
((Lifecycle) this.webSocketClient).stop();

‎spring-websocket/src/test/java/org/springframework/web/socket/WebSocketHandshakeTests.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,27 @@ protected Class<?>[] getAnnotatedConfigClasses() {
5353

5454

5555
@ParameterizedWebSocketTest
56-
@SuppressWarnings("deprecation")
57-
void subProtocolNegotiation(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
56+
void subProtocolNegotiation(
57+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
58+
5859
super.setup(server, webSocketClient, testInfo);
5960

6061
WebSocketHttpHeaders headers = new WebSocketHttpHeaders();
6162
headers.setSecWebSocketProtocol("foo");
6263
URI url = URI.create(getWsBaseUrl() + "/ws");
63-
WebSocketSession session = this.webSocketClient.doHandshake(new TextWebSocketHandler(), headers, url).get();
64+
WebSocketSession session = this.webSocketClient.execute(new TextWebSocketHandler(), headers, url).get();
6465
assertThat(session.getAcceptedProtocol()).isEqualTo("foo");
6566
session.close();
6667
}
6768

6869
@ParameterizedWebSocketTest // SPR-12727
69-
@SuppressWarnings("deprecation")
70-
void unsolicitedPongWithEmptyPayload(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
70+
void unsolicitedPongWithEmptyPayload(
71+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
72+
7173
super.setup(server, webSocketClient, testInfo);
7274

7375
String url = getWsBaseUrl() + "/ws";
74-
WebSocketSession session = this.webSocketClient.doHandshake(new AbstractWebSocketHandler() {}, url).get();
76+
WebSocketSession session = this.webSocketClient.execute(new AbstractWebSocketHandler() {}, url).get();
7577

7678
TestWebSocketHandler serverHandler = this.wac.getBean(TestWebSocketHandler.class);
7779
serverHandler.setWaitMessageCount(1);
@@ -129,15 +131,15 @@ public Throwable getTransportError() {
129131
}
130132

131133
@Override
132-
public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exception {
134+
public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) {
133135
this.receivedMessages.add(message);
134136
if (this.receivedMessages.size() >= this.waitMessageCount) {
135137
this.latch.countDown();
136138
}
137139
}
138140

139141
@Override
140-
public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
142+
public void handleTransportError(WebSocketSession session, Throwable exception) {
141143
this.transportError = exception;
142144
this.latch.countDown();
143145
}

‎spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,12 @@ protected Class<?>[] getAnnotatedConfigClasses() {
4949

5050

5151
@ParameterizedWebSocketTest
52-
@SuppressWarnings("deprecation")
53-
void registerWebSocketHandler(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
52+
void registerWebSocketHandler(
53+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
54+
5455
super.setup(server, webSocketClient, testInfo);
5556

56-
WebSocketSession session = this.webSocketClient.doHandshake(
57+
WebSocketSession session = this.webSocketClient.execute(
5758
new AbstractWebSocketHandler() {}, getWsBaseUrl() + "/ws").get();
5859

5960
TestHandler serverHandler = this.wac.getBean(TestHandler.class);
@@ -63,11 +64,12 @@ void registerWebSocketHandler(WebSocketTestServer server, WebSocketClient webSoc
6364
}
6465

6566
@ParameterizedWebSocketTest
66-
@SuppressWarnings("deprecation")
67-
void registerWebSocketHandlerWithSockJS(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
67+
void registerWebSocketHandlerWithSockJS(
68+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
69+
6870
super.setup(server, webSocketClient, testInfo);
6971

70-
WebSocketSession session = this.webSocketClient.doHandshake(
72+
WebSocketSession session = this.webSocketClient.execute(
7173
new AbstractWebSocketHandler() {}, getWsBaseUrl() + "/sockjs/websocket").get();
7274

7375
TestHandler serverHandler = this.wac.getBean(TestHandler.class);

‎spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompWebSocketIntegrationTests.java

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ protected Class<?>[] getAnnotatedConfigClasses() {
7474

7575

7676
@ParameterizedWebSocketTest
77-
void sendMessageToController(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
77+
void sendMessageToController(
78+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
79+
7880
super.setup(server, webSocketClient, testInfo);
7981

8082
TextMessage message = create(StompCommand.SEND).headers("destination:/app/simple").build();
@@ -87,7 +89,9 @@ void sendMessageToController(WebSocketTestServer server, WebSocketClient webSock
8789
}
8890

8991
@ParameterizedWebSocketTest
90-
void sendMessageToControllerAndReceiveReplyViaTopic(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
92+
void sendMessageToControllerAndReceiveReplyViaTopic(
93+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
94+
9195
super.setup(server, webSocketClient, testInfo);
9296

9397
TextMessage m0 = create(StompCommand.CONNECT).headers("accept-version:1.1").build();
@@ -105,7 +109,9 @@ void sendMessageToControllerAndReceiveReplyViaTopic(WebSocketTestServer server,
105109
}
106110

107111
@ParameterizedWebSocketTest // SPR-10930
108-
void sendMessageToBrokerAndReceiveReplyViaTopicWithSelectorHeader(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
112+
void sendMessageToBrokerAndReceiveReplyViaTopicWithSelectorHeader(
113+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
114+
109115
super.setup(server, webSocketClient, testInfo);
110116

111117
String destination = "destination:/topic/foo";
@@ -127,7 +133,9 @@ void sendMessageToBrokerAndReceiveReplyViaTopicWithSelectorHeader(WebSocketTestS
127133
}
128134

129135
@ParameterizedWebSocketTest // SPR-11648
130-
void sendSubscribeToControllerAndReceiveReply(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
136+
void sendSubscribeToControllerAndReceiveReply(
137+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
138+
131139
super.setup(server, webSocketClient, testInfo);
132140

133141
TextMessage m0 = create(StompCommand.CONNECT).headers("accept-version:1.1").build();
@@ -146,7 +154,9 @@ void sendSubscribeToControllerAndReceiveReply(WebSocketTestServer server, WebSoc
146154
}
147155

148156
@ParameterizedWebSocketTest
149-
void handleExceptionAndSendToUser(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
157+
void handleExceptionAndSendToUser(
158+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
159+
150160
super.setup(server, webSocketClient, testInfo);
151161

152162
String destHeader = "destination:/user/queue/error";
@@ -167,7 +177,9 @@ void handleExceptionAndSendToUser(WebSocketTestServer server, WebSocketClient we
167177
}
168178

169179
@ParameterizedWebSocketTest
170-
void webSocketScope(WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
180+
void webSocketScope(
181+
WebSocketTestServer server, WebSocketClient webSocketClient, TestInfo testInfo) throws Exception {
182+
171183
super.setup(server, webSocketClient, testInfo);
172184

173185
TextMessage m0 = create(StompCommand.CONNECT).headers("accept-version:1.1").build();

0 commit comments

Comments
 (0)