From 3387ffb892b85a20ae44ec58a41e1f3f2cb084f0 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Wed, 4 Oct 2017 18:21:52 +0530
Subject: Modify validate to include sample plugin

Issue-Id: CLI-66

Change-Id: I3397cd29835c5ac3a95a7f0f80fcee5d1e49de99
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 validate/validation/pom.xml                            | 18 ++----------------
 .../org/onap/cli/validation/OnapValidationTest.java    | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 21 deletions(-)

(limited to 'validate/validation')

diff --git a/validate/validation/pom.xml b/validate/validation/pom.xml
index 3e0cf59d..8c204d87 100644
--- a/validate/validation/pom.xml
+++ b/validate/validation/pom.xml
@@ -50,24 +50,10 @@
         </dependency>
         <dependency>
             <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-msb</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-sdc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-aai</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-so</artifactId>
+            <artifactId>cli-plugins-sample</artifactId>
             <version>${project.version}</version>
         </dependency>
+
   </dependencies>
 <!--   <build>
         <plugins>
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
index 71d015b5..6a6d3823 100644
--- a/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java
+++ b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java
@@ -57,12 +57,19 @@ public class OnapValidationTest {
     }
 
     @Test
-    public void validateCommandSchemas() throws IOException, OnapCommandException {
-        OnapCommandRegistrar.getRegistrar().setEnabledProductVersion("cli-1.0");
-        for (ExternalSchema sch : OnapCommandRegistrar.getRegistrar().listCommandInfo()) {
-            System.out.println(
+    public void validateCommandsResult() throws IOException, OnapCommandException {
+        for (String version: OnapCommandRegistrar.getRegistrar().getAvailableProductVersions()) {
+            OnapCommandRegistrar.getRegistrar().setEnabledProductVersion(version);
+            System.out.println(version);
+            System.out.println("==========================\n\n");
+            for (ExternalSchema sch : OnapCommandRegistrar.getRegistrar().listCommandInfo()) {
+                if (sch.getCmdVersion().equals(version)) {
+                    System.out.println(
                     "************************* validate '" + sch.getCmdName() + "' *******************************");
-            this.handle(new String[] { "schema-validate", "-l", sch.getSchemaName(), "-i"});
+                    OnapCommandRegistrar.getRegistrar().setEnabledProductVersion("cli-1.0");
+                    this.handle(new String[] { "schema-validate", "-l", sch.getSchemaName(), "-i"});
+                }
+            }
         }
     }
 
-- 
cgit 1.2.3-korg