1 files changed, 59 insertions, 97 deletions
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/ExecutorParameterTests.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/ExecutorParameterTests.java
index 16a892f93..5d1b3f726 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/ExecutorParameterTests.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/ExecutorParameterTests.java
@@ -21,9 +21,9 @@
 
 package org.onap.policy.apex.service.engine.parameters;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import org.junit.After;
 import org.junit.Test;
@@ -44,17 +44,14 @@ public class ExecutorParameterTests {
     }
 
     @Test
-    public void testNoParamsTest() {
+    public void testNoParamsTest() throws ParameterException {
         final String[] args = {"-c", "src/test/resources/parameters/serviceExecutorNoParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            final ApexParameters parameters = new ApexParameterHandler().getParameters(arguments);
-            assertEquals(0,
-                    parameters.getEngineServiceParameters().getEngineParameters().getExecutorParameterMap().size());
-        } catch (final ParameterException e) {
-            fail("This test should not throw any exception: " + e.getMessage());
-        }
+        final ApexParameters parameters = new ApexParameterHandler().getParameters(arguments);
+        assertEquals(0,
+               parameters.getEngineServiceParameters().getEngineParameters().getExecutorParameterMap().size());
+
     }
 
     @Test
@@ -62,15 +59,11 @@ public class ExecutorParameterTests {
         final String[] args = {"-c", "src/test/resources/parameters/serviceExecutorBadParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            new ApexParameterHandler().getParameters(arguments);
-            fail("This test should throw an exception");
-        } catch (final ParameterException e) {
-            assertEquals("error reading parameters from "
+        assertThatThrownBy(() -> new ApexParameterHandler().getParameters(arguments))
+            .hasMessage("error reading parameters from "
                     + "\"src/test/resources/parameters/serviceExecutorBadParams.json\"\n"
                     + "(ParameterRuntimeException):value of \"executorParameters:ZOOBY\" entry is not "
-                    + "a parameter JSON object", e.getMessage());
-        }
+                    + "a parameter JSON object");
     }
 
     @Test
@@ -78,15 +71,11 @@ public class ExecutorParameterTests {
         final String[] args = {"-c", "src/test/resources/parameters/serviceExecutorNoExecutorParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            new ApexParameterHandler().getParameters(arguments);
-            fail("This test should throw an exception");
-        } catch (final ParameterException e) {
-            assertEquals("error reading parameters from "
-                    + "\"src/test/resources/parameters/serviceExecutorNoExecutorParams.json\"\n"
-                    + "(ParameterRuntimeException):no \"executorParameters\" entry found in parameters,"
-                    + " at least one executor parameter entry must be specified", e.getMessage());
-        }
+        assertThatThrownBy(() -> new ApexParameterHandler().getParameters(arguments))
+            .hasMessage("error reading parameters from "
+                + "\"src/test/resources/parameters/serviceExecutorNoExecutorParams.json\"\n"
+                + "(ParameterRuntimeException):no \"executorParameters\" entry found in parameters,"
+                + " at least one executor parameter entry must be specified");
     }
 
     @Test
@@ -94,15 +83,11 @@ public class ExecutorParameterTests {
         final String[] args = {"-c", "src/test/resources/parameters/serviceExecutorEmptyParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            new ApexParameterHandler().getParameters(arguments);
-            fail("This test should throw an exception");
-        } catch (final ParameterException e) {
-            assertEquals("error reading parameters from "
-                    + "\"src/test/resources/parameters/serviceExecutorEmptyParams.json\"\n"
-                    + "(ParameterRuntimeException):could not find field \"parameterClassName\" "
-                    + "in \"executorParameters:ZOOBY\" entry", e.getMessage());
-        }
+        assertThatThrownBy(() -> new ApexParameterHandler().getParameters(arguments))
+            .hasMessage("error reading parameters from "
+                + "\"src/test/resources/parameters/serviceExecutorEmptyParams.json\"\n"
+                + "(ParameterRuntimeException):could not find field \"parameterClassName\" "
+                + "in \"executorParameters:ZOOBY\" entry");
     }
 
     @Test
@@ -110,15 +95,11 @@ public class ExecutorParameterTests {
         final String[] args = {"-c", "src/test/resources/parameters/serviceExecutorBadPluginNameParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            new ApexParameterHandler().getParameters(arguments);
-            fail("This test should throw an exception");
-        } catch (final ParameterException e) {
-            assertEquals("error reading parameters from "
-                    + "\"src/test/resources/parameters/serviceExecutorBadPluginNameParams.json\"\n"
-                    + "(ParameterRuntimeException):could not find field \"parameterClassName\" "
-                    + "in \"executorParameters:ZOOBY\" entry", e.getMessage());
-        }
+        assertThatThrownBy(() -> new ApexParameterHandler().getParameters(arguments))
+            .hasMessage("error reading parameters from "
+                + "\"src/test/resources/parameters/serviceExecutorBadPluginNameParams.json\"\n"
+                + "(ParameterRuntimeException):could not find field \"parameterClassName\" "
+                + "in \"executorParameters:ZOOBY\" entry");
     }
 
     @Test
@@ -126,15 +107,11 @@ public class ExecutorParameterTests {
         final String[] args = {"-c", "src/test/resources/parameters/serviceExecutorBadPluginValueObjectParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            new ApexParameterHandler().getParameters(arguments);
-            fail("This test should throw an exception");
-        } catch (final ParameterException e) {
-            assertEquals("error reading parameters from "
-                    + "\"src/test/resources/parameters/serviceExecutorBadPluginValueObjectParams.json\"\n"
-                    + "(ParameterRuntimeException):value for field \"parameterClassName\" "
-                    + "of \"executorParameters:LOOBY\" entry is not a plain string", e.getMessage());
-        }
+        assertThatThrownBy(() -> new ApexParameterHandler().getParameters(arguments))
+            .hasMessage("error reading parameters from "
+                + "\"src/test/resources/parameters/serviceExecutorBadPluginValueObjectParams.json\"\n"
+                + "(ParameterRuntimeException):value for field \"parameterClassName\" "
+                + "of \"executorParameters:LOOBY\" entry is not a plain string");
     }
 
     @Test
@@ -142,15 +119,11 @@ public class ExecutorParameterTests {
         final String[] args = {"-c", "src/test/resources/parameters/serviceExecutorBadPluginValueBlankParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            new ApexParameterHandler().getParameters(arguments);
-            fail("This test should throw an exception");
-        } catch (final ParameterException e) {
-            assertEquals("error reading parameters from "
-                    + "\"src/test/resources/parameters/serviceExecutorBadPluginValueBlankParams.json\"\n"
-                    + "(ParameterRuntimeException):value for field \"parameterClassName\" "
-                    + "in \"executorParameters:LOOBY\" entry is not specified or is blank", e.getMessage());
-        }
+        assertThatThrownBy(() -> new ApexParameterHandler().getParameters(arguments))
+            .hasMessage("error reading parameters from "
+                + "\"src/test/resources/parameters/serviceExecutorBadPluginValueBlankParams.json\"\n"
+                + "(ParameterRuntimeException):value for field \"parameterClassName\" "
+                + "in \"executorParameters:LOOBY\" entry is not specified or is blank");
     }
 
     @Test
@@ -158,38 +131,31 @@ public class ExecutorParameterTests {
         final String[] args = {"-c", "src/test/resources/parameters/serviceExecutorBadPluginValueParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            new ApexParameterHandler().getParameters(arguments);
-            fail("This test should throw an exception");
-        } catch (final ParameterException e) {
-            assertEquals("error reading parameters from"
-                    + " \"src/test/resources/parameters/serviceExecutorBadPluginValueParams.json\"\n"
-                    + "(ParameterRuntimeException):failed to deserialize the parameters "
-                    + "for \"executorParameters:LOOBY\" to parameter class \"helloworld\"\n"
-                    + "java.lang.ClassNotFoundException: helloworld", e.getMessage());
-        }
+        assertThatThrownBy(() -> new ApexParameterHandler().getParameters(arguments))
+            .hasMessage("error reading parameters from"
+                + " \"src/test/resources/parameters/serviceExecutorBadPluginValueParams.json\"\n"
+                + "(ParameterRuntimeException):failed to deserialize the parameters "
+                + "for \"executorParameters:LOOBY\" to parameter class \"helloworld\"\n"
+                + "java.lang.ClassNotFoundException: helloworld");
     }
 
     @Test
-    public void testGoodParametersTest() {
+    public void testGoodParametersTest() throws ParameterException {
         final String[] args = {"-c", "src/test/resources/parameters/goodParams.json"};
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            final ApexParameters parameters = new ApexParameterHandler().getParameters(arguments);
-
-            assertEquals("MyApexEngine", parameters.getEngineServiceParameters().getName());
-            assertEquals("0.0.1", parameters.getEngineServiceParameters().getVersion());
-            assertEquals(45, parameters.getEngineServiceParameters().getId());
-            assertEquals(19, parameters.getEngineServiceParameters().getInstanceCount());
-            assertEquals(65522, parameters.getEngineServiceParameters().getDeploymentPort());
-        } catch (final ParameterException e) {
-            fail("This test should not throw any exception: " + e.getMessage());
-        }
+        final ApexParameters parameters = new ApexParameterHandler().getParameters(arguments);
+
+        assertEquals("MyApexEngine", parameters.getEngineServiceParameters().getName());
+        assertEquals("0.0.1", parameters.getEngineServiceParameters().getVersion());
+        assertEquals(45, parameters.getEngineServiceParameters().getId());
+        assertEquals(19, parameters.getEngineServiceParameters().getInstanceCount());
+        assertEquals(65522, parameters.getEngineServiceParameters().getDeploymentPort());
+
     }
 
     @Test
-    public void testRelativeParametersTest() {
+    public void testRelativeParametersTest() throws ParameterException {
         // @formatter:off
         final String[] args = {
             "-rfr",
@@ -200,18 +166,14 @@ public class ExecutorParameterTests {
         // @formatter:on
         final ApexCommandLineArguments arguments = new ApexCommandLineArguments(args);
 
-        try {
-            final ApexParameters parameters = new ApexParameterHandler().getParameters(arguments);
-
-            assertEquals("MyApexEngine", parameters.getEngineServiceParameters().getName());
-            assertEquals("0.0.1", parameters.getEngineServiceParameters().getVersion());
-            assertEquals(45, parameters.getEngineServiceParameters().getId());
-            assertEquals(19, parameters.getEngineServiceParameters().getInstanceCount());
-            assertEquals(65522, parameters.getEngineServiceParameters().getDeploymentPort());
-            assertTrue(parameters.getEngineServiceParameters().getPolicyModelFileName()
-                    .endsWith("policymodels/SmallModel.json"));
-        } catch (final ParameterException e) {
-            fail("This test should not throw any exception: " + e.getMessage());
-        }
+        final ApexParameters parameters = new ApexParameterHandler().getParameters(arguments);
+
+        assertEquals("MyApexEngine", parameters.getEngineServiceParameters().getName());
+        assertEquals("0.0.1", parameters.getEngineServiceParameters().getVersion());
+        assertEquals(45, parameters.getEngineServiceParameters().getId());
+        assertEquals(19, parameters.getEngineServiceParameters().getInstanceCount());
+        assertEquals(65522, parameters.getEngineServiceParameters().getDeploymentPort());
+        assertTrue(parameters.getEngineServiceParameters().getPolicyModelFileName()
+                .endsWith("policymodels/SmallModel.json"));
     }
 }