Make Issue609 Test work on a server

marci4 · marci4 · commit b375041e9f99 · 2017-11-19T11:46:41.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
@@ -42,61 +42,63 @@
 public class Issue609Test {
 
 	CountDownLatch countDownLatch = new CountDownLatch( 1 );
+	CountDownLatch countServerDownLatch = new CountDownLatch( 1 );
 
 	boolean wasOpenClient;
 	boolean wasOpenServer;
 
 	@Test
 	public void testIssue() throws Exception {
 		int port = SocketUtil.getAvailablePort();
-		WebSocketServer server = new WebSocketServer( new InetSocketAddress( port ) ) {
+		WebSocketClient webSocket = new WebSocketClient( new URI( "ws://localhost:" + port ) ) {
 			@Override
-			public void onOpen( WebSocket conn, ClientHandshake handshake ) {
-			}
+			public void onOpen( ServerHandshake handshakedata ) {
 
-			@Override
-			public void onClose( WebSocket conn, int code, String reason, boolean remote ) {
-				wasOpenServer = conn.isOpen();
 			}
 
 			@Override
-			public void onMessage( WebSocket conn, String message ) {
+			public void onMessage( String message ) {
 
 			}
 
 			@Override
-			public void onError( WebSocket conn, Exception ex ) {
-
+			public void onClose( int code, String reason, boolean remote ) {
+				wasOpenClient = isOpen();
+				countDownLatch.countDown();
 			}
 
 			@Override
-			public void onStart() {
+			public void onError( Exception ex ) {
 
 			}
 		};
-		server.start();
-		WebSocketClient webSocket = new WebSocketClient( new URI( "ws://localhost:" + port ) ) {
+		WebSocketServer server = new WebSocketServer( new InetSocketAddress( port ) ) {
 			@Override
-			public void onOpen( ServerHandshake handshakedata ) {
+			public void onOpen( WebSocket conn, ClientHandshake handshake ) {
+			}
 
+			@Override
+			public void onClose( WebSocket conn, int code, String reason, boolean remote ) {
+				wasOpenServer = conn.isOpen();
 			}
 
 			@Override
-			public void onMessage( String message ) {
+			public void onMessage( WebSocket conn, String message ) {
 
 			}
 
 			@Override
-			public void onClose( int code, String reason, boolean remote ) {
-				wasOpenClient = isOpen();
-				countDownLatch.countDown();
+			public void onError( WebSocket conn, Exception ex ) {
+
 			}
 
 			@Override
-			public void onError( Exception ex ) {
-
+			public void onStart() {
+				countServerDownLatch.countDown();
 			}
 		};
+		server.start();
+		countServerDownLatch.await();
 		webSocket.connectBlocking();
 		assertTrue( "webSocket.isOpen()", webSocket.isOpen() );
 		webSocket.getSocket().close();
