Polish WebSocket integration tests

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

@@ -47,12 +47,12 @@ public abstract class AbstractWebSocketIntegrationTests {
 	private static Map<Class<?>, Class<?>> upgradeStrategyConfigTypes = new HashMap<Class<?>, Class<?>>();
 
 	static {
-		upgradeStrategyConfigTypes.put(JettyTestServer.class, JettyUpgradeStrategyConfig.class);
-		upgradeStrategyConfigTypes.put(TomcatTestServer.class, TomcatUpgradeStrategyConfig.class);
+		upgradeStrategyConfigTypes.put(JettyWebSocketTestServer.class, JettyUpgradeStrategyConfig.class);
+		upgradeStrategyConfigTypes.put(TomcatWebSocketTestServer.class, TomcatUpgradeStrategyConfig.class);
 	}
 
 	@Parameter(0)
-	public TestServer server;
+	public WebSocketTestServer server;
 
 	@Parameter(1)
 	public WebSocketClient webSocketClient;

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

@@ -25,18 +25,18 @@ import org.springframework.web.servlet.DispatcherServlet;
 
 
 /**
- * Jetty based {@link TestServer}.
+ * Jetty based {@link WebSocketTestServer}.
  *
  * @author Rossen Stoyanchev
  */
-public class JettyTestServer implements TestServer {
+public class JettyWebSocketTestServer implements WebSocketTestServer {
 
 	private final Server jettyServer;
 
 	private final int port;
 
 
-	public JettyTestServer() {
+	public JettyWebSocketTestServer() {
 		this.port = SocketUtils.findAvailableTcpPort();
 		this.jettyServer = new Server(this.port);
 	}

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

@@ -33,11 +33,11 @@ import org.springframework.web.servlet.DispatcherServlet;
 
 
 /**
- * Tomcat based {@link TestServer}.
+ * Tomcat based {@link WebSocketTestServer}.
  *
  * @author Rossen Stoyanchev
  */
-public class TomcatTestServer implements TestServer {
+public class TomcatWebSocketTestServer implements WebSocketTestServer {
 
 	private static final ApplicationListener WS_APPLICATION_LISTENER =
 			new ApplicationListener(WsListener.class.getName(), false);
@@ -49,7 +49,7 @@ public class TomcatTestServer implements TestServer {
 	private Context context;
 
 
-	public TomcatTestServer() {
+	public TomcatWebSocketTestServer() {
 
 		this.port = SocketUtils.findAvailableTcpPort();
 

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

@@ -19,11 +19,11 @@ package org.springframework.web.socket;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
- * Contract for a test server to use for integration tests.
+ * Contract for a test server to use for WebSocket integration tests.
  *
  * @author Rossen Stoyanchev
  */
-public interface TestServer {
+public interface WebSocketTestServer {
 
 	int getPort();
 

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

@@ -28,8 +28,8 @@ 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.JettyTestServer;
-import org.springframework.web.socket.TomcatTestServer;
+import org.springframework.web.socket.JettyWebSocketTestServer;
+import org.springframework.web.socket.TomcatWebSocketTestServer;
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.adapter.WebSocketHandlerAdapter;
 import org.springframework.web.socket.client.endpoint.StandardWebSocketClient;
@@ -51,8 +51,8 @@ public class WebSocketConfigurationTests extends AbstractWebSocketIntegrationTes
 	@Parameters
 	public static Iterable<Object[]> arguments() {
 		return Arrays.asList(new Object[][] {
-				{new JettyTestServer(), new JettyWebSocketClient()},
-				{new TomcatTestServer(), new StandardWebSocketClient()}
+				{new JettyWebSocketTestServer(), new JettyWebSocketClient()},
+				{new TomcatWebSocketTestServer(), new StandardWebSocketClient()}
 		});
 	};