1 files changed, 43 insertions, 86 deletions
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArgumentsTest.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArgumentsTest.java
index 09fbe91fe..09663c0bf 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArgumentsTest.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArgumentsTest.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2020 Nordix Foundation
+ *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,99 +44,62 @@ public class ApexCommandLineArgumentsTest {
     public void testCommandLineArguments() throws ApexException {
         final ApexCommandLineArguments apexArguments = new ApexCommandLineArguments();
 
-        final String[] args00 =
-            { "" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args00);
-            apexArguments.validate();
-        }).hasMessage("Apex configuration file was not specified as an argument");
-        final String[] args01 =
-            { "-h" };
+        final String[] args00 = {""};
+        apexArguments.parse(args00);
+        assertThatThrownBy(() -> apexArguments.validate())
+            .hasMessage("Tosca Policy file was not specified as an argument");
 
+        final String[] args01 = {"-h"};
         final String result = apexArguments.parse(args01);
         assertTrue(result.startsWith("usage: org.onap.policy.apex.service.engine.main.ApexMain [options...]"));
 
-        final String[] args02 =
-            { "-v" };
+        final String[] args02 = {"-v"};
         final String result02 = apexArguments.parse(args02);
         assertTrue(result02.startsWith("Apex Adaptive Policy Engine"));
 
-        final String[] args03 =
-            { "-v", "-h" };
-
+        final String[] args03 = {"-v", "-h"};
         final String result03 = apexArguments.parse(args03);
         assertTrue(result03.startsWith("usage: org.onap.policy.apex.service.engine.main.ApexMain [options...]"));
 
-        final String[] args04 =
-            { "-h", "-v" };
-
+        final String[] args04 = {"-h", "-v"};
         final String result04 = apexArguments.parse(args04);
         assertTrue(result04.startsWith("usage: org.onap.policy.apex.service.engine.main.ApexMain [options...]"));
 
-        final String[] args05 =
-            { "-a" };
+        final String[] args05 = {"-a"};
         assertThatThrownBy(() -> apexArguments.parse(args05))
             .hasMessage("invalid command line arguments specified : Unrecognized option: -a");
-        final String[] args06 =
-            { "-c", "hello", "-m", "goodbye", "-h", "-v" };
+
+        final String[] args06 = {"-p", "goodbye", "-h", "-v"};
         final String result06 = apexArguments.parse(args06);
         assertTrue(result06.startsWith("usage: org.onap.policy.apex.service.engine.main.ApexMain [options...]"));
 
-        final String[] args07 =
-            { "-c", "hello", "-m", "goodbye", "-h", "aaa" };
+        final String[] args07 = {"-p", "goodbye", "-h", "aaa"};
         assertThatThrownBy(() -> apexArguments.parse(args07))
-            .hasMessage("too many command line arguments specified : [-c, hello, -m, goodbye, -h, aaa]");
+            .hasMessage("too many command line arguments specified : [-p, goodbye, -h, aaa]");
     }
 
     @Test
     public void testCommandLineFileParameters() throws ApexException {
         final ApexCommandLineArguments apexArguments = new ApexCommandLineArguments();
 
-        final String[] args00 =
-            { "-c", "zooby" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args00);
-            apexArguments.validate();
-        }).hasMessage("Apex configuration file \"zooby\" does not exist");
-        final String[] args01 =
-            { "-c" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args01);
-            apexArguments.validate();
-        }).hasMessage("invalid command line arguments specified : Missing argument for option: c");
-        final String[] args02 =
-            { "-c", "src/test/resources/parameters/goodParams.json" };
-        apexArguments.parse(args02);
-        apexArguments.validate();
+        final String[] args00 = {"-c", "zooby"};
+        assertThatThrownBy(() -> apexArguments.parse(args00))
+            .hasMessage("invalid command line arguments specified : Unrecognized option: -c");
 
-        final String[] args03 =
-            { "-c", "src/test/resources/parameters/goodParams.json", "-m", "zooby" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args03);
-            apexArguments.validate();
-        }).hasMessage("Apex model file \"zooby\" does not exist");
-        final String[] args04 =
-            { "-m" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args04);
-            apexArguments.validate();
-        }).hasMessage("invalid command line arguments specified : Missing argument for option: m");
-        final String[] args05 =
-            { "-c", "src/test/resources/parameters/goodParams.json", "-m" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args05);
-            apexArguments.validate();
-        }).hasMessage("invalid command line arguments specified : Missing argument for option: m");
-        final String[] args06 =
-            { "-c", "src/test/resources/parameters/goodParams.json", "-m",
-                "src/test/resources/main/DummyModelFile.json" };
-        apexArguments.parse(args06);
+        final String[] args01 = {"-p"};
+        assertThatThrownBy(() -> apexArguments.parse(args01))
+            .hasMessage("invalid command line arguments specified : Missing argument for option: p");
+
+        final String[] args02 = {"-p", "src/test/resources/parameters/goodParams.json"};
+        apexArguments.parse(args02);
         apexArguments.validate();
 
-        final String[] args07 =
-            { "-c", "parameters/goodParams.json", "-m", "main/DummyModelFile.json" };
+        final String[] args03 = {"-p", "src/test/resources/parameters/goodParams.json", "-m", "zooby"};
+        assertThatThrownBy(() -> apexArguments.parse(args03))
+            .hasMessage("invalid command line arguments specified : Unrecognized option: -m");
 
-        apexArguments.parse(args07);
+        final String[] args06 = {"-p", "src/test/resources/parameters/goodParams.json"};
+        apexArguments.parse(args06);
         apexArguments.validate();
     }
 
@@ -143,33 +107,26 @@ public class ApexCommandLineArgumentsTest {
     public void testCommandLineRelativeRootParameters() throws ApexException {
         final ApexCommandLineArguments apexArguments = new ApexCommandLineArguments();
 
-        final String[] args00 =
-            { "-c", "src/test/resources/parameters/goodParams.json", "-rfr", "zooby" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args00);
-            apexArguments.validate();
-        }).hasMessageContaining("zooby\" does not exist or is not a directory");
-        final String[] args01 =
-            { "-rfr" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args01);
-            apexArguments.validate();
-        }).hasMessage("invalid command line arguments specified : Missing argument for option: rfr");
-        final String[] args02 =
-            { "-c", "src/test/resources/parameters/goodParams.json", "-rfr", "pom.xml" };
-        assertThatThrownBy(() -> {
-            apexArguments.parse(args02);
-            apexArguments.validate();
-        }).hasMessageContaining("pom.xml\" does not exist or is not a directory");
-        final String[] args03 =
-            { "-c", "src/test/resources/parameters/goodParams.json", "-rfr", "target" };
+        final String[] args00 = {"-p", "src/test/resources/parameters/goodParams.json", "-rfr", "zooby"};
+        apexArguments.parse(args00);
+        assertThatThrownBy(() -> apexArguments.validate())
+            .hasMessageContaining("zooby\" does not exist or is not a directory");
+
+        final String[] args01 = {"-rfr"};
+        assertThatThrownBy(() -> apexArguments.parse(args01))
+            .hasMessage("invalid command line arguments specified : Missing argument for option: rfr");
 
+        final String[] args02 = {"-p", "src/test/resources/parameters/goodParams.json", "-rfr", "pom.xml"};
+        apexArguments.parse(args02);
+        assertThatThrownBy(() -> apexArguments.validate())
+            .hasMessageContaining("pom.xml\" does not exist or is not a directory");
+
+        final String[] args03 = {"-p", "src/test/resources/parameters/goodParams.json", "-rfr", "target"};
         apexArguments.parse(args03);
         apexArguments.validate();
 
         final String[] args04 =
-            { "-c", "src/test/resources/parameters/goodParamsRelative.json", "-rfr", "src/test/resources" };
-
+            {"-p", "src/test/resources/parameters/goodParamsRelative.json", "-rfr", "src/test/resources"};
         apexArguments.parse(args04);
         apexArguments.validate();