Issue #3762 - use the default port of 0 for WebSocket tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketConnectionStatsTest.java

@@ -33,15 +33,9 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.BufferUtil;
-import org.eclipse.jetty.websocket.api.CloseStatus;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.api.WebSocketPolicy;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
-import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.eclipse.jetty.websocket.common.CloseInfo;
 import org.eclipse.jetty.websocket.common.Generator;
@@ -60,52 +54,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class WebSocketConnectionStatsTest
 {
-
-    @WebSocket
-    public static class ClientSocket
-    {
-        CountDownLatch closed = new CountDownLatch(1);
-        int closeStatus;
-        String closeReason;
-        String behavior;
-
-        @OnWebSocketConnect
-        public void onOpen(Session session)
-        {
-            behavior = session.getPolicy().getBehavior().name();
-        }
-
-        @OnWebSocketClose
-        public void onClose(int statusCode, String reason)
-        {
-            closeStatus = statusCode;
-            closeReason = reason;
-            closed.countDown();
-        }
-
-        @OnWebSocketError
-        public void onError(Throwable cause)
-        {
-            cause.printStackTrace(System.err);
-        }
-
-        @Override
-        public String toString()
-        {
-            return String.format("[%s@%s]", behavior, Integer.toHexString(hashCode()));
-        }
-    }
-
-    @WebSocket
-    public static class EchoSocket extends ClientSocket
-    {
-        @OnWebSocketMessage
-        public void onMessage(Session session, String message)
-        {
-            session.getRemote().sendString(message, null);
-        }
-    }
-
     public static class MyWebSocketServlet extends WebSocketServlet
     {
         @Override
@@ -115,11 +63,12 @@ public class WebSocketConnectionStatsTest
         }
     }
 
-    Server server;
+    private Server server;
-    WebSocketClient client;
+    private ServerConnector connector;
-    ConnectionStatistics statistics;
+    private WebSocketClient client;
-    CountDownLatch wsUpgradeComplete = new CountDownLatch(1);
+    private ConnectionStatistics statistics;
-    CountDownLatch wsConnectionClosed = new CountDownLatch(1);
+    private CountDownLatch wsUpgradeComplete = new CountDownLatch(1);
+    private CountDownLatch wsConnectionClosed = new CountDownLatch(1);
 
     @BeforeEach
     public void start() throws Exception
@@ -139,8 +88,7 @@ public class WebSocketConnectionStatsTest
         };
 
         server = new Server();
-        ServerConnector connector = new ServerConnector(server);
+        connector = new ServerConnector(server);
-        connector.setPort(8080);
         connector.addBean(statistics);
         server.addConnector(connector);
 
@@ -175,8 +123,8 @@ public class WebSocketConnectionStatsTest
     @Test
     public void echoStatsTest() throws Exception
     {
-        URI uri = URI.create("ws://localhost:8080/testPath");
+        URI uri = URI.create("ws://localhost:"+connector.getLocalPort()+"/testPath");
-        ClientSocket socket = new ClientSocket();
+        EventSocket socket = new EventSocket();
         Future<Session> connect = client.connect(socket, uri);
 
         final long numMessages = 10000;
@@ -208,7 +156,7 @@ public class WebSocketConnectionStatsTest
         assertThat(statistics.getReceivedMessages(), is(numMessages + 2L));
 
         WebSocketFrame textFrame = new TextFrame().setPayload(msgText);
-        WebSocketFrame closeFrame = new CloseInfo(socket.closeStatus, socket.closeReason).asFrame();
+        WebSocketFrame closeFrame = new CloseInfo(socket.closeCode, socket.closeReason).asFrame();
 
         final long textFrameSize = getFrameByteSize(textFrame);
         final long closeFrameSize = getFrameByteSize(closeFrame);

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java

@@ -80,7 +80,6 @@ public class BadNetworkTest
         server = new Server();
 
         connector = new ServerConnector(server);
-        connector.setPort(0);
         server.addConnector(connector);
 
         context = new ServletContextHandler();

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java

@@ -119,7 +119,6 @@ public class ClientCloseTest
         server = new Server();
 
         ServerConnector connector = new ServerConnector(server);
-        connector.setPort(0);
         server.addConnector(connector);
 
         ServletContextHandler context = new ServletContextHandler();

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java

@@ -63,7 +63,6 @@ public class ClientSessionsTest
         server = new Server();
 
         ServerConnector connector = new ServerConnector(server);
-        connector.setPort(0);
         server.addConnector(connector);
 
         ServletContextHandler context = new ServletContextHandler();

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java

@@ -65,7 +65,6 @@ public class SlowClientTest
         server = new Server();
 
         ServerConnector connector = new ServerConnector(server);
-        connector.setPort(0);
         server.addConnector(connector);
 
         ServletContextHandler context = new ServletContextHandler();

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java

@@ -65,7 +65,6 @@ public class ServerCloseTest
         server = new Server();
 
         ServerConnector connector = new ServerConnector(server);
-        connector.setPort(0);
         server.addConnector(connector);
 
         ServletContextHandler context = new ServletContextHandler();

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java

@@ -64,7 +64,6 @@ public class SlowServerTest
         server = new Server();
 
         ServerConnector connector = new ServerConnector(server);
-        connector.setPort(0);
         server.addConnector(connector);
 
         ServletContextHandler context = new ServletContextHandler();