remove explicit call to shutdown in junits

since it will exit the process immediately in
a graceful case and affect junit execution.

Change-Id: Ibcbb65269203e189515f68c557686c29667307e2
Issue-ID: POLICY-386
Signed-off-by: Jorge Hernandez <jh1730@att.com>

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
index 9b3fbfe..869a1a6 100644 (file)
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
@@ -52,6 +52,7 @@ import org.onap.policy.drools.http.server.HttpServletServer;
 import org.onap.policy.drools.properties.PolicyProperties;
 import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
 import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -120,10 +121,10 @@ public class ControlLoopFailureTest implements TopicListener {
          */
         kieSession.dispose();
         
+        PolicyEngine.manager.stop();
         HttpServletServer.factory.destroy();
-        PolicyEngine.manager.shutdown();
+        PolicyController.factory.shutdown();
         TopicEndpoint.manager.shutdown();
-        PolicyEngine.manager.stop();
     }
     
     /**

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/Util.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/Util.java
index ab365af..2149bc7 100644 (file)
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/Util.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/Util.java
@@ -31,7 +31,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
index 8885a23..aaa40d1 100644 (file)
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
@@ -52,7 +52,9 @@ import org.onap.policy.drools.http.server.HttpServletServer;
 import org.onap.policy.drools.properties.PolicyProperties;
 import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
 import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.utils.LoggerUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,6 +73,7 @@ public class VCPEControlLoopTest implements TopicListener {
         Util.setAAIProps();
         Util.setGuardProps();
         Util.setPUProp();
+        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");       
     }
     
     @BeforeClass
@@ -116,10 +119,10 @@ public class VCPEControlLoopTest implements TopicListener {
          */
         kieSession.dispose();
         
+        PolicyEngine.manager.stop();
         HttpServletServer.factory.destroy();
-        PolicyEngine.manager.shutdown();
+        PolicyController.factory.shutdown();
         TopicEndpoint.manager.shutdown();
-        PolicyEngine.manager.stop();
     }
     
     @Test

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
index 9b9c2fe..3e1785d 100644 (file)
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
@@ -51,7 +51,9 @@ import org.onap.policy.drools.http.server.HttpServletServer;
 import org.onap.policy.drools.properties.PolicyProperties;
 import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
 import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.utils.LoggerUtil;
 import org.onap.policy.so.SORequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,6 +74,7 @@ public class VDNSControlLoopTest implements TopicListener {
         Util.setSOProps();
         Util.setGuardProps();
         Util.setPUProp();
+        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO"); 
     }
     
        @BeforeClass
@@ -118,10 +121,10 @@ public class VDNSControlLoopTest implements TopicListener {
          */
         kieSession.dispose();
         
-               HttpServletServer.factory.destroy();
-               PolicyEngine.manager.shutdown();
-               TopicEndpoint.manager.shutdown();
-           PolicyEngine.manager.stop();
+        PolicyEngine.manager.stop();
+        HttpServletServer.factory.destroy();
+        PolicyController.factory.shutdown();
+        TopicEndpoint.manager.shutdown();
        }
 
     @Test

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
index 4a2b813..2581e3d 100644 (file)
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
@@ -52,7 +52,9 @@ import org.onap.policy.drools.http.server.HttpServletServer;
 import org.onap.policy.drools.properties.PolicyProperties;
 import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
 import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.utils.LoggerUtil;
 import org.onap.policy.vfc.VFCRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,6 +76,7 @@ public class VFCControlLoopTest implements TopicListener {
         Util.setVFCProps();
         Util.setGuardProps();
         Util.setPUProp();
+        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");
        }
        
        @BeforeClass
@@ -120,10 +123,10 @@ public class VFCControlLoopTest implements TopicListener {
          */
         kieSession.dispose();
         
-               HttpServletServer.factory.destroy();
-               PolicyEngine.manager.shutdown();
-               TopicEndpoint.manager.shutdown();
-           PolicyEngine.manager.stop();
+        PolicyEngine.manager.stop();
+        HttpServletServer.factory.destroy();
+        PolicyController.factory.shutdown();
+        TopicEndpoint.manager.shutdown();
        }
 
        @Test

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
index 0157984..601eef0 100644 (file)
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
@@ -54,7 +54,9 @@ import org.onap.policy.drools.http.server.HttpServletServer;
 import org.onap.policy.drools.properties.PolicyProperties;
 import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
 import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.utils.LoggerUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,6 +75,7 @@ public class VFWControlLoopTest implements TopicListener {
         Util.setAAIProps();
         Util.setGuardProps();
         Util.setPUProp();
+        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");
     }
     
     @BeforeClass
@@ -120,10 +123,10 @@ public class VFWControlLoopTest implements TopicListener {
          */
         kieSession.dispose();
         
+        PolicyEngine.manager.stop();
         HttpServletServer.factory.destroy();
-        PolicyEngine.manager.shutdown();
+        PolicyController.factory.shutdown();
         TopicEndpoint.manager.shutdown();
-        PolicyEngine.manager.stop();
     }
     
     @Test