diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/main/java/org/onap/cli/main/OnapCli.java | 2 | ||||
| -rw-r--r-- | main/src/test/java/org/onap/cli/main/OnapCliMainTest.java | 19 | ||||
| -rw-r--r-- | main/src/test/resources/sample-test-schema.yaml | 18 |
3 files changed, 29 insertions, 10 deletions
diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java index e33e54ac..9255da20 100644 --- a/main/src/main/java/org/onap/cli/main/OnapCli.java +++ b/main/src/main/java/org/onap/cli/main/OnapCli.java @@ -74,7 +74,7 @@ public class OnapCli { throwable.printStackTrace(); // NOSONAR } } catch (OnapCommandException e) { - this.print(e.getCause()); + System.out.println(e); } } diff --git a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java index 0a84d268..f052cbd1 100644 --- a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java +++ b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java @@ -129,6 +129,25 @@ public class OnapCliMainTest { } @Test + public void testVersionSampleCommandShort() { + this.handle(new String[] { "sample-test", "-v" }); + } + + @Test + public void testHandleSampleCommandSet() throws OnapCommandException { + OnapCommandRegistrar.getRegistrar().addParamCache("sample:string-param", "paramValue"); + OnapCommandRegistrar.getRegistrar().addParamCache("onap-username", "paramValue"); + OnapCommandRegistrar.getRegistrar().addParamCache("onap-password", "paramValue"); + OnapCommandRegistrar.getRegistrar().addParamCache("host-url", "paramValue"); + this.handle(new String[] { "sample-test", "--string-param", "test"}); + } + + @Test + public void testHandleSampleCommandFailure() throws OnapCommandException { + this.handle(new String[] { "sample-test", "--string-param"}); + } + + @Test public void interactiveTest() { cli = new OnapCli(new String[] {}); diff --git a/main/src/test/resources/sample-test-schema.yaml b/main/src/test/resources/sample-test-schema.yaml index ac601c86..36edc7de 100644 --- a/main/src/test/resources/sample-test-schema.yaml +++ b/main/src/test/resources/sample-test-schema.yaml @@ -19,60 +19,60 @@ parameters: short_option: x long_option: secure is_secured: true - is_optional: false + is_optional: true default_Value: pass123# - name: string-param type: string description: Onap string param long_option: string-param short_option: c - is_optional: false + is_optional: true default_Value: test - name: yaml-param type: json description: Onap yaml file location param long_option: yaml-param short_option: y - is_optional: false + is_optional: true - name: json-param type: json description: Onap json file location param long_option: json-param short_option: j - is_optional: false + is_optional: true - name: long-param type: digit description: Onap long param short_option: l long_option: long-opt - is_optional: false + is_optional: true default_value: 10 - name: url-param type: url description: Onap url param short_option: r long_option: url - is_optional: false + is_optional: true default_value: http://localhost:8082/file.txt - name: env-param type: string description: Onap env param. short_option: z long_option: env - is_optional: false + is_optional: true default_value: ${ENV_VAR} default_value: http://localhost:8082/file.txt - name: positional-args type: string description: Onap positional args, if no short option and no long option given for it - is_optional: false + is_optional: true default_value: http://localhost:8082/file.txt - name: text-param type: text description: Onap text file location param long_option: text-param short_option: e - is_optional: false + is_optional: true results: direction: portrait attributes: |