Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework more JMS tests to common CF resource

Browse Source 
* Refactor STOMP and WebSocket tests into JUnit 5
* Close a server application context in those tests when Tomcat is destroyed
This commit is contained in:
Artem Bilan
2021-03-15 12:03:27 -04:00
parent 78a0ae8a04
commit bb608d8922
26 changed files with 230 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-stomp/src/test/java/org/springframework/integration/stomp/StompSessionManagerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public class StompSessionManagerTests {
throw new RuntimeException("intentional");
}
else {
SettableListenableFuture<StompSession> future = new SettableListenableFuture<StompSession>();
SettableListenableFuture<StompSession> future = new SettableListenableFuture<>();
StompSession stompSession = mock(StompSession.class);
future.set(stompSession);
handler.afterConnected(stompSession, getConnectHeaders());
@@ -66,7 +66,7 @@ public class StompSessionManagerTests {
sessionManager.start();
final SettableListenableFuture<StompSession> stompSessionFuture = new SettableListenableFuture<StompSession>();
final SettableListenableFuture<StompSession> stompSessionFuture = new SettableListenableFuture<>();
sessionManager.connect(new StompSessionHandlerAdapter() {
@Override

5
spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2020 the original author or authors.
* Copyright 2015-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -323,7 +323,8 @@ public class StompInboundChannelAdapterWebSocketIntegrationTests {
@Override
public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response,
WebSocketHandler wsHandler, Map<String, Object> attributes) throws Exception {
WebSocketHandler wsHandler, Map<String, Object> attributes) {
return request.getHeaders().getOrigin() != null;
}