X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=PolicyEngineAPI%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fstd%2Ftest%2FManualClientEndTest.java;h=0872c23879348e802fd9453424935f6eb2a9308b;hb=2ae7194f9b915e42bba68537eec9426baa5ae456;hp=a9fa3f5fedc010db269291156788c7f57c8ef51e;hpb=01a357b4e27480844686eb83ef81809a28056e41;p=policy%2Fengine.git

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..0872c2387 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
@@ -1,15 +1,17 @@
-/*
+/*-
  * ============LICENSE_START=======================================================
  * PolicyEngineAPI
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (C) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,10 +25,10 @@ package org.onap.policy.std.test;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 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 +37,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 +57,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 +69,49 @@ 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\"}");
+                        + "\"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));
     }