From 208be2505b56df39aad52df15983d03517b17595 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Thu, 2 Nov 2017 19:12:33 +0530 Subject: Improve validation test cases CLI-57 Change-Id: I1c44db4d71893af0093598ac4d539774360d1ab6 Signed-off-by: Kanagaraj Manickam k00365106 --- .../onap/cli/moco/OnapCommandHttpMocoServer.java | 5 +- .../org/onap/cli/validation/OnapCliMainTest.java | 84 --------------------- .../onap/cli/validation/OnapValidationTest.java | 86 ++++++++++++++++++++++ 3 files changed, 88 insertions(+), 87 deletions(-) delete mode 100644 validate/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java create mode 100644 validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java (limited to 'validate/validation/src/test') diff --git a/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java b/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java index 7f84704c..a3e23a64 100644 --- a/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java +++ b/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java @@ -147,10 +147,9 @@ public class OnapCommandHttpMocoServer { String output = new String(bo.toByteArray()); - //mrkanag uncomment following lines once moco server setup is done - //assert cli.getExitCode() == 0; + assert cli.getExitCode() == 0; - //assert sample.getOutput().equals(output); + assert sample.getOutput().equals(output); } public void verifySamples() throws OnapCommandException { diff --git a/validate/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java b/validate/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java deleted file mode 100644 index cfccef62..00000000 --- a/validate/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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.validation; - -import java.io.IOException; - -import org.aspectj.lang.annotation.After; -import org.junit.Test; -import org.onap.cli.fw.OnapCommandRegistrar; -import org.onap.cli.fw.error.OnapCommandException; -import org.onap.cli.fw.utils.ExternalSchema; -import org.onap.cli.main.OnapCli; -import org.onap.cli.moco.OnapCommandHttpMocoServer; - -public class OnapCliMainTest { - - OnapCli cli = null; - - /** - * Clean up. - */ - @After(value = "") - public void cleanup() { - if (this.cli != null) { - if (cli.getExitCode() != 0) { - // Fail test case - } - } - } - - private void handle(String[] args) { - cli = new OnapCli(args); - cli.handle(); - } - - @Test - public void validateCommandSchemas() throws IOException, OnapCommandException { - OnapCommandRegistrar.getRegistrar().setEnabledProductVersion("cli-1.0"); - for (ExternalSchema sch : OnapCommandRegistrar.getRegistrar().listCommandInfo()) { - System.out.println( - "************************* validate '" + sch.getCmdName() + "' *******************************"); - this.handle(new String[] { "schema-validate", "-l", sch.getSchemaName(), "-i"}); - } - } - - @Test - public void usageReadTheDocsTest() throws OnapCommandException { - for (String version: OnapCommandRegistrar.getRegistrar().getAvailableProductVersions()) { - OnapCommandRegistrar.getRegistrar().setEnabledProductVersion(version); - System.out.println(version); - System.out.println("==========================\n\n"); - int i = 1; - for (ExternalSchema sch : OnapCommandRegistrar.getRegistrar().listCommandInfo()) { - if (sch.getCmdVersion().equals(version)) { - System.out.println("[" + i++ + "] " + sch.getCmdName()); - System.out.println("-----------------------------------------------\n\n"); - this.handle(new String[] { sch.getCmdName(), "-h"}); - System.out.println("\n"); - } - } - } - } - - @Test - public void validateCommands() throws OnapCommandException { - OnapCommandHttpMocoServer server = new OnapCommandHttpMocoServer(); - server.verifySamples(); - } - - } diff --git a/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java new file mode 100644 index 00000000..f2c27fc7 --- /dev/null +++ b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java @@ -0,0 +1,86 @@ +/* + * 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.validation; + +import java.io.IOException; + +import org.aspectj.lang.annotation.After; +import org.junit.Ignore; +import org.junit.Test; +import org.onap.cli.fw.OnapCommandRegistrar; +import org.onap.cli.fw.error.OnapCommandException; +import org.onap.cli.fw.utils.ExternalSchema; +import org.onap.cli.main.OnapCli; +import org.onap.cli.moco.OnapCommandHttpMocoServer; + +public class OnapValidationTest { + + OnapCli cli = null; + + /** + * Clean up. + */ + @After(value = "") + public void cleanup() { + if (this.cli != null) { + if (cli.getExitCode() != 0) { + // Fail test case + } + } + } + + private void handle(String[] args) { + cli = new OnapCli(args); + cli.handle(); + } + + @Test + public void validateCommandSchemas() throws IOException, OnapCommandException { + OnapCommandRegistrar.getRegistrar().setEnabledProductVersion("cli-1.0"); + for (ExternalSchema sch : OnapCommandRegistrar.getRegistrar().listCommandInfo()) { + System.out.println( + "************************* validate '" + sch.getCmdName() + "' *******************************"); + this.handle(new String[] { "schema-validate", "-l", sch.getSchemaName(), "-i"}); + } + } + + @Test + public void genReadTheDocs() throws OnapCommandException { + for (String version: OnapCommandRegistrar.getRegistrar().getAvailableProductVersions()) { + OnapCommandRegistrar.getRegistrar().setEnabledProductVersion(version); + System.out.println(version); + System.out.println("==========================\n\n"); + int i = 1; + for (ExternalSchema sch : OnapCommandRegistrar.getRegistrar().listCommandInfo()) { + if (sch.getCmdVersion().equals(version)) { + System.out.println("[" + i++ + "] " + sch.getCmdName()); + System.out.println("-----------------------------------------------\n\n"); + this.handle(new String[] { sch.getCmdName(), "-h"}); + System.out.println("\n"); + } + } + } + } + + @Ignore + @Test + public void validateCommands() throws OnapCommandException { + OnapCommandHttpMocoServer server = new OnapCommandHttpMocoServer(); + server.verifySamples(); + } + + } -- cgit 1.2.3-korg