Use a dynamic port for tests

marci4 · marci4 · commit 4cdbc3e9ba3c · 2017-11-19T11:37:44.000+01:00
diff --git a/src/test/java/org/java_websocket/issues/Issue609Test.java b/src/test/java/org/java_websocket/issues/Issue609Test.java
@@ -30,6 +30,7 @@
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.handshake.ServerHandshake;
 import org.java_websocket.server.WebSocketServer;
+import org.java_websocket.util.SocketUtil;
 import org.junit.Test;
 
 import java.net.InetSocketAddress;
@@ -47,7 +48,8 @@ public class Issue609Test {
 
 	@Test
 	public void testIssue() throws Exception {
-		WebSocketServer server = new WebSocketServer( new InetSocketAddress( 8887 ) ) {
+		int port = SocketUtil.getAvailablePort();
+		WebSocketServer server = new WebSocketServer( new InetSocketAddress( port ) ) {
 			@Override
 			public void onOpen( WebSocket conn, ClientHandshake handshake ) {
 			}
@@ -73,7 +75,7 @@ public void onStart() {
 			}
 		};
 		server.start();
-		WebSocketClient webSocket = new WebSocketClient( new URI( "ws://localhost:8887" ) ) {
+		WebSocketClient webSocket = new WebSocketClient( new URI( "ws://localhost:" + port ) ) {
 			@Override
 			public void onOpen( ServerHandshake handshakedata ) {
 
diff --git a/src/test/java/org/java_websocket/misc/OpeningHandshakeRejectionTest.java b/src/test/java/org/java_websocket/misc/OpeningHandshakeRejectionTest.java
@@ -29,6 +29,7 @@
 import org.java_websocket.framing.CloseFrame;
 import org.java_websocket.handshake.ServerHandshake;
 import org.java_websocket.util.Charsetfunctions;
+import org.java_websocket.util.SocketUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -51,13 +52,16 @@ public class OpeningHandshakeRejectionTest {
 
 	private static boolean debugPrintouts = false;
 
+	private static int port;
+
 	@BeforeClass
-	public static void startServer() {
+	public static void startServer() throws Exception {
+		port = SocketUtil.getAvailablePort();
 		thread = new Thread(
 				new Runnable() {
 					public void run() {
 						try {
-							serverSocket = new ServerSocket( 8887 );
+							serverSocket = new ServerSocket( port );
 							serverSocket.setReuseAddress( true );
 							while( true ) {
 								Socket client = null;
@@ -198,7 +202,7 @@ public void testHandshakeRejectionTestCase11() throws Exception {
 	private void testHandshakeRejection( int i ) throws Exception {
 		final int finalI = i;
 		final boolean[] threadReturned = { false };
-		WebSocketClient webSocketClient = new WebSocketClient( new URI( "ws://localhost:8887/" + finalI ) ) {
+		WebSocketClient webSocketClient = new WebSocketClient( new URI( "ws://localhost:"+ port + "/" + finalI ) ) {
 			@Override
 			public void onOpen( ServerHandshake handshakedata ) {
 				fail( "There should not be a connection!" );
diff --git a/src/test/java/org/java_websocket/protocols/ProtoclHandshakeRejectionTest.java b/src/test/java/org/java_websocket/protocols/ProtoclHandshakeRejectionTest.java
@@ -32,6 +32,7 @@
 import org.java_websocket.handshake.ServerHandshake;
 import org.java_websocket.util.Base64;
 import org.java_websocket.util.Charsetfunctions;
+import org.java_websocket.util.SocketUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -58,13 +59,16 @@ public class ProtoclHandshakeRejectionTest {
 
 	private static boolean debugPrintouts = false;
 
+	private static int port;
+
 	@BeforeClass
-	public static void startServer() {
+	public static void startServer() throws Exception {
+		port = SocketUtil.getAvailablePort();
 		thread = new Thread(
 				new Runnable() {
 					public void run() {
 						try {
-							serverSocket = new ServerSocket( 8887 );
+							serverSocket = new ServerSocket( port );
 							serverSocket.setReuseAddress( true );
 							int count = 1;
 							while( true ) {
@@ -168,7 +172,7 @@ public void run() {
 								}
 							}
 						} catch ( Exception e ) {
-							e.printStackTrace(  );
+							e.printStackTrace();
 							fail( "There should be no exception" );
 						}
 					}
@@ -294,7 +298,7 @@ public void testHandshakeRejectionTestCase17() throws Exception {
 	private void testProtocolRejection( int i, Draft_6455 draft ) throws Exception {
 		final int finalI = i;
 		final boolean[] threadReturned = { false };
-		WebSocketClient webSocketClient = new WebSocketClient( new URI( "ws://localhost:8887/" + finalI ), draft ) {
+		WebSocketClient webSocketClient = new WebSocketClient( new URI( "ws://localhost:" + port + "/" + finalI ), draft ) {
 			@Override
 			public void onOpen( ServerHandshake handshakedata ) {
 				switch(finalI) {
diff --git a/src/test/java/org/java_websocket/util/SocketUtil.java b/src/test/java/org/java_websocket/util/SocketUtil.java
@@ -0,0 +1,17 @@
+package org.java_websocket.util;
+import java.io.IOException;
+import java.net.ServerSocket;
+
+public class SocketUtil {
+	public static int getAvailablePort() throws IOException {
+		ServerSocket srv = null;
+		try {
+			srv = new ServerSocket( 0 );
+			return srv.getLocalPort();
+		} finally {
+			if( srv != null ) {
+				srv.close();
+			}
+		}
+	}
+}
