@ -28,10 +28,7 @@ import org.junit.runners.Parameterized.Parameters;
@@ -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
@@ -52,9 +49,8 @@ public class WebSocketConfigurationTests extends AbstractWebSocketIntegrationTes
public static Iterable < Object [ ] > 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 ( ) }
} ) ;
}