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

Allow Undertow client in websocket integration tests

Browse Source 
It seems to work.
This commit is contained in:
Rossen Stoyanchev
2017-11-09 17:49:11 -05:00
parent 988c5f2b56
commit 8cfa3c632b
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java
View File

@@ -62,8 +62,6 @@ import org.springframework.web.reactive.socket.server.upgrade.TomcatRequestUpgra
import org.springframework.web.reactive.socket.server.upgrade.UndertowRequestUpgradeStrategy; import org.springframework.web.reactive.socket.server.upgrade.UndertowRequestUpgradeStrategy;
import org.springframework.web.server.adapter.WebHttpHandlerBuilder; import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
import static org.junit.Assume.assumeFalse;
/** /**
* Base class for WebSocket integration tests. Sub-classes must implement * Base class for WebSocket integration tests. Sub-classes must implement
* {@link #getWebConfigClass()} to return Spring config class with (server-side) * {@link #getWebConfigClass()} to return Spring config class with (server-side)
@@ -117,15 +115,6 @@ public abstract class AbstractWebSocketIntegrationTests {
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
// TODO
// Caused by: java.io.IOException: Upgrade responses cannot have a transfer coding
// at org.xnio.http.HttpUpgrade$HttpUpgradeState.handleUpgrade(HttpUpgrade.java:490)
// at org.xnio.http.HttpUpgrade$HttpUpgradeState.access$1200(HttpUpgrade.java:165)
// at org.xnio.http.HttpUpgrade$HttpUpgradeState$UpgradeResultListener.handleEvent(HttpUpgrade.java:461)
// at org.xnio.http.HttpUpgrade$HttpUpgradeState$UpgradeResultListener.handleEvent(HttpUpgrade.java:400)
// at org.xnio.ChannelListeners.invokeChannelListener(ChannelListeners.java:92)
assumeFalse(this.client instanceof UndertowWebSocketClient);
this.server.setHandler(createHttpHandler()); this.server.setHandler(createHttpHandler());
this.server.afterPropertiesSet(); this.server.afterPropertiesSet();

6
spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
View File

@@ -63,7 +63,7 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
Flux<String> input = Flux.range(1, count).map(index -> "msg-" + index); Flux<String> input = Flux.range(1, count).map(index -> "msg-" + index);
ReplayProcessor<Object> output = ReplayProcessor.create(count); ReplayProcessor<Object> output = ReplayProcessor.create(count);
client.execute(getUrl("/echo"), this.client.execute(getUrl("/echo"),
session -> { session -> {
logger.debug("Starting to send messages"); logger.debug("Starting to send messages");
return session return session
@@ -87,7 +87,7 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
AtomicReference<HandshakeInfo> infoRef = new AtomicReference<>(); AtomicReference<HandshakeInfo> infoRef = new AtomicReference<>();
MonoProcessor<Object> output = MonoProcessor.create(); MonoProcessor<Object> output = MonoProcessor.create();
client.execute(getUrl("/sub-protocol"), this.client.execute(getUrl("/sub-protocol"),
new WebSocketHandler() { new WebSocketHandler() {
@Override @Override
public List<String> getSubProtocols() { public List<String> getSubProtocols() {
@@ -117,7 +117,7 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
headers.add("my-header", "my-value"); headers.add("my-header", "my-value");
MonoProcessor<Object> output = MonoProcessor.create(); MonoProcessor<Object> output = MonoProcessor.create();
client.execute(getUrl("/custom-header"), headers, this.client.execute(getUrl("/custom-header"), headers,
session -> session.receive() session -> session.receive()
.map(WebSocketMessage::getPayloadAsText) .map(WebSocketMessage::getPayloadAsText)
.subscribeWith(output) .subscribeWith(output)