1 files changed, 30 insertions, 17 deletions

diff --git a/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java
index a9fa3f5fe..42df545d2 100644
--- a/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java
@@ -26,7 +26,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
-
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import org.java_websocket.WebSocket;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
@@ -35,16 +36,16 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.api.NotificationScheme;
 import org.onap.policy.std.ManualClientEnd;
-import org.springframework.util.SocketUtils;
 
 /**
- * The class <code>ManualClientEndTest</code> contains tests for the class <code>{@link ManualClientEnd}</code>.
+ * The class <code>ManualClientEndTest</code> contains tests for the class
+ * <code>{@link ManualClientEnd}</code>.
  *
  */
 public class ManualClientEndTest {
     private static WebSocketServer ws;
 
-    private static final int port = SocketUtils.findAvailableTcpPort();
+    private static int port;
     private static volatile String recvMsg = null;
     private static volatile Exception webEx = null;
 
@@ -55,7 +56,10 @@ public class ManualClientEndTest {
      */
     @BeforeClass
     public static void startServer() throws Exception {
-        ws = new WebSocketServer(new InetSocketAddress(port), 1) {
+
+        CountDownLatch latch = new CountDownLatch(1);
+
+        ws = new WebSocketServer(new InetSocketAddress(0), 1) {
             @Override
             public void onOpen(WebSocket conn, ClientHandshake handshake) {}
 
@@ -64,39 +68,48 @@ public class ManualClientEndTest {
 
             @Override
             public void onMessage(WebSocket conn, String message) {
-            	
-            	// NOTE: must copy to recvMsg BEFORE invoking conn.send()
+
+                // NOTE: must copy to recvMsg BEFORE invoking conn.send()
                 recvMsg = message;
-                
+
                 conn.send("{\"removedPolicies\": [],\"loadedPolicies\":"
-                        + "[{\"policyName\": \"Test.Config_BRMS_Param_BrmsParamTestPa.1.xml\","
-                        + "\"versionNo\": \"1\",\"matches\": {\"ECOMPName\": \"DROOLS\","
-                        + "\"ONAPName\": \"DROOLS\",\"ConfigName\": \"BRMS_PARAM_RULE\","
-                        + "\"guard\": \"false\",\"TTLDate\": \"NA\",\"RiskLevel\": \"5\","
-                        + "\"RiskType\": \"default\"},\"updateType\": \"NEW\"}],\"notificationType\": \"UPDATE\"}");
+                                + "[{\"policyName\": \"Test.Config_BRMS_Param_BrmsParamTestPa.1.xml\","
+                                + "\"versionNo\": \"1\",\"matches\": {\"ECOMPName\": \"DROOLS\","
+                                + "\"ONAPName\": \"DROOLS\",\"ConfigName\": \"BRMS_PARAM_RULE\","
+                                + "\"guard\": \"false\",\"TTLDate\": \"NA\",\"RiskLevel\": \"5\","
+                                + "\"RiskType\": \"default\"},\"updateType\": \"NEW\"}],\"notificationType\": \"UPDATE\"}");
             }
 
             @Override
             public void onError(WebSocket conn, Exception ex) {
-            	webEx = ex;
+                webEx = ex;
                 ex.printStackTrace();
+                latch.countDown();
             }
 
             @Override
-            public void onStart() {}
+            public void onStart() {
+                latch.countDown();
+            }
         };
 
         ws.setConnectionLostTimeout(0);
         ws.setReuseAddr(true);
         ws.start();
+
+        // ensure port connected (or error) before running the actual test
+        latch.await(20, TimeUnit.SECONDS);
+
+        // ensure no error during start-up
+        assertNull(webEx);
+
+        port = ws.getPort();
     }
 
     @Test
     public void testManualClient() throws Exception {
-    	
         ManualClientEnd.start("http://localhost:" + port + "/");
 
-        assertNull(webEx);
         assertNotNull(ManualClientEnd.result(NotificationScheme.MANUAL_ALL_NOTIFICATIONS));
         assertTrue("Manual".equalsIgnoreCase(recvMsg));
     }