From 1c4530f251d4fcef39e0d4a2bf8c47174eb5f6a3 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 22 Jan 2014 14:50:25 -0500 Subject: [PATCH] Re-enable Undertow tests in WebSocketConfigurationIT --- .../config/annotation/WebSocketConfigurationTests.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java index 38ee4443e9..3a2e50bb10 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java @@ -28,10 +28,7 @@ import org.junit.runners.Parameterized.Parameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.AbstractWebSocketIntegrationTests; -import org.springframework.web.socket.JettyWebSocketTestServer; -import org.springframework.web.socket.TomcatWebSocketTestServer; -import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.*; import org.springframework.web.socket.client.jetty.JettyWebSocketClient; import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.handler.AbstractWebSocketHandler; @@ -52,9 +49,8 @@ public class WebSocketConfigurationTests extends AbstractWebSocketIntegrationTes public static Iterable arguments() { return Arrays.asList(new Object[][] { {new JettyWebSocketTestServer(), new JettyWebSocketClient()}, - {new TomcatWebSocketTestServer(), new StandardWebSocketClient()} - // {new UndertowTestServer(), new StandardWebSocketClient()} - // TODO: Undertow tests fail against OpenJDK 8 build 124 with a BindException + {new TomcatWebSocketTestServer(), new StandardWebSocketClient()}, + {new UndertowTestServer(), new StandardWebSocketClient()} }); }