1 files changed, 7 insertions, 21 deletions
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/processor/ControlLoopProcessorTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/processor/ControlLoopProcessorTest.java
index ae6af6c07..47e7d5344 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/processor/ControlLoopProcessorTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/processor/ControlLoopProcessorTest.java
@@ -159,29 +159,15 @@ public class ControlLoopProcessorTest {
         InputStream is = new FileInputStream(new File("src/test/resources/test.yaml"));
         String yamlString = IOUtils.toString(is, StandardCharsets.UTF_8);
 
-        ControlLoopProcessor clProcessor = new ControlLoopProcessor(yamlString);
-        clProcessor.getCurrentPolicy();
-        clProcessor.nextPolicyForResult(PolicyResult.SUCCESS);
-
-        clProcessor = new ControlLoopProcessor(yamlString);
-        clProcessor.getCurrentPolicy();
-        clProcessor.nextPolicyForResult(PolicyResult.FAILURE);
-
-        clProcessor = new ControlLoopProcessor(yamlString);
-        clProcessor.getCurrentPolicy();
-        clProcessor.nextPolicyForResult(PolicyResult.FAILURE_EXCEPTION);
-
-        clProcessor = new ControlLoopProcessor(yamlString);
-        clProcessor.getCurrentPolicy();
-        clProcessor.nextPolicyForResult(PolicyResult.FAILURE_GUARD);
-
-        clProcessor = new ControlLoopProcessor(yamlString);
-        clProcessor.getCurrentPolicy();
-        clProcessor.nextPolicyForResult(PolicyResult.FAILURE_RETRIES);
+        for (PolicyResult result : PolicyResult.values()) {
+            checkResult(yamlString, result);
+        }
+    }
 
-        clProcessor = new ControlLoopProcessor(yamlString);
+    private void checkResult(String yamlString, PolicyResult result) throws ControlLoopException {
+        ControlLoopProcessor clProcessor = new ControlLoopProcessor(yamlString);
         clProcessor.getCurrentPolicy();
-        clProcessor.nextPolicyForResult(PolicyResult.FAILURE_TIMEOUT);
+        clProcessor.nextPolicyForResult(result);
     }
 
     /**