1 files changed, 21 insertions, 7 deletions
diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyNotificationMailTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyNotificationMailTest.java
index 95296f4b0..5111ef2a8 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyNotificationMailTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyNotificationMailTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Modifications Copyright (C) 2019 Samsung
  * ================================================================================
@@ -19,16 +19,20 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.admin;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
-import static org.mockito.Mockito.when;
+import org.onap.policy.common.utils.network.NetworkUtil;
 import org.onap.policy.controller.PolicyController;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.PolicyVersion;
@@ -41,16 +45,27 @@ public class PolicyNotificationMailTest {
     private CommonClassDao commonClassDao;
     private List<Object> data = null;
 
+    /**
+     * setUp.
+     *
+     * @throws Exception should not throw one
+     */
     @Before
     public void setUp() throws Exception {
         PolicyController.setjUnit(true);
         PolicyController.setSmtpApplicationName("Test");
         PolicyController.setSmtpEmailExtension("test.com");
-        PolicyController.setSmtpHost("test");
-        PolicyController.setSmtpPort("23");
+        PolicyController.setSmtpHost("localhost");
         PolicyController.setSmtpPassword("test");
         PolicyController.setSmtpUsername("test");
 
+        /*
+         * Allocate a port to which the mail sender should connect, but don't actually
+         * start a listener on the port so that connection attempts will be immediately
+         * rejected.
+         */
+        PolicyController.setSmtpPort(String.valueOf(NetworkUtil.allocPort()));
+
         version = new PolicyVersion();
         version.setPolicyName("com/Config_Test");
         version.setModifiedBy("xyz");
@@ -62,9 +77,8 @@ public class PolicyNotificationMailTest {
 
         commonClassDao = mock(CommonClassDao.class);
         PolicyController.setCommonClassDao(commonClassDao);
-        when(commonClassDao.getDataByQuery(
-                "from WatchPolicyNotificationTable where policyName like:policyFileName", null))
-                        .thenReturn(data);
+        when(commonClassDao.getDataByQuery("from WatchPolicyNotificationTable where policyName like:policyFileName",
+                null)).thenReturn(data);
     }
 
     @Test