From 5b47cbd64e726393858f833443097303f1746d7b Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 11 Oct 2017 10:52:16 +0530 Subject: Fix registrar test command registration UT CLI-2 Change-Id: Idf2aa6f8cc4f8c0110cc4293e3dde584edc4eca8 Signed-off-by: Kanagaraj Manickam k00365106 --- .../src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'framework') diff --git a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java index 16c3f2f3..4f5c95e2 100644 --- a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java +++ b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java @@ -60,19 +60,18 @@ public class OnapCommandRegistrarTest { public void registerTest() throws OnapCommandException { OnapCommand test = new OnapCommandTest(); Class cmd = (Class) test.getClass(); - registerar.register("Test", "cli-1.0", cmd); - OnapCommand cc = registerar.get("Test"); + registerar.register("test", "cli-1.0", cmd); + OnapCommand cc = registerar.get("test"); assertTrue(cmd == cc.getClass()); } @Test - // For Coverage public void cmdTestSchema() throws OnapCommandException { OnapCommand test = new OnapCommandTest(); Class cmd = (Class) test.getClass(); - registerar.register("Test", "cli-1.0", cmd); - OnapCommand cc = registerar.get("Test"); + registerar.register("test", "cli-1.0", cmd); + OnapCommand cc = registerar.get("test"); } @Test -- cgit From 1ec7ee637367ed680df9cbf2dfc14bb283ec1583 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 11 Oct 2017 10:51:16 +0530 Subject: Enhance validation with moco server CLI-2 Change-Id: Ie8a98a2a20137610634b3450d1076bec1790e9b1 Signed-off-by: Kanagaraj Manickam k00365106 --- .../onap/cli/fw/error/OnapCommandException.java | 1 + .../cli/fw/error/OnapCommandInvalidSample.java | 43 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java (limited to 'framework') diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandException.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandException.java index 8e99b9a1..3fecad02 100644 --- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandException.java +++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandException.java @@ -35,6 +35,7 @@ schema 0xb00 profile 0xc00 product/service 0xd00 catalog 0xe00 +sample 0xf00 */ public class OnapCommandException extends Exception { diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java new file mode 100644 index 00000000..8d2d7c7a --- /dev/null +++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java @@ -0,0 +1,43 @@ +/* + * Copyright 2017 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.cli.fw.error; + +/** + * Command sample is invalid. + * + */ +public class OnapCommandInvalidSample extends OnapCommandException { + + private static final long serialVersionUID = -3387652326582792835L; + + private static final String ERROR_CODE = "0xf001"; + + private static final String ERROR_MSG = "Invalid command sample "; + + public OnapCommandInvalidSample(String error) { + this(ERROR_CODE, error); + } + + public OnapCommandInvalidSample(String schema, String error) { + super(ERROR_CODE, ERROR_MSG + schema + ", " + error); + } + + public OnapCommandInvalidSample(String schema, Throwable throwable) { + super(ERROR_CODE, ERROR_MSG + schema , throwable); + } + +} -- cgit From bed220d657959425cd358108e5c1a410a3cbbb89 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 11 Oct 2017 11:14:58 +0530 Subject: Verfiy Invalid samples CLI-2 Change-Id: I7388da38841d07bacf64d10a2c11620dfb781c12 Signed-off-by: Kanagaraj Manickam k00365106 --- .../java/org/onap/cli/fw/error/OnapCommandInvalidSample.java | 4 ---- .../test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java | 11 +++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'framework') diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java index 8d2d7c7a..32e5cf65 100644 --- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java +++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java @@ -28,10 +28,6 @@ public class OnapCommandInvalidSample extends OnapCommandException { private static final String ERROR_MSG = "Invalid command sample "; - public OnapCommandInvalidSample(String error) { - this(ERROR_CODE, error); - } - public OnapCommandInvalidSample(String schema, String error) { super(ERROR_CODE, ERROR_MSG + schema + ", " + error); } diff --git a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java index e56eac03..cc12cfc0 100644 --- a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java +++ b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java @@ -255,6 +255,17 @@ public class OnapCommandErrorTest { assertEquals("0xb002::Command schema is missing for command Test", failed.getMessage()); } + @Test + public void onapCommandSampleInvalidTest() { + OnapCommandInvalidSample failed = new OnapCommandInvalidSample("Test", "error"); + + assertEquals("0xf001::Invalid command sample Test, error", failed.getMessage()); + + failed = new OnapCommandInvalidSample("Test", new Exception("error")); + + assertEquals("0xf001::Invalid command sample Test, error", failed.getMessage()); + } + @Test public void onapCommandServiceNotFoundTest() { OnapCommandServiceNotFound failed = new OnapCommandServiceNotFound("Service"); -- cgit