Code Improvements-Sonar Issue Fixes

Signed-off-by: SravanKumarGunda <sravan.kumar1@huawei.com>
Issue-ID: CLI-270
Change-Id: Iba00ddc8c471bc5990d87ba3729af373e2bd6711

5 files changed, 125 insertions, 1 deletions

diff --git a/framework/src/test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java b/framework/src/test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java
index 3e32f3e1..60aa5e7d 100644
--- a/framework/src/test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java
+++ b/framework/src/test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java
@@ -114,7 +114,7 @@ public class OnapCommandSampleTest {
             UUID.fromString(attrValue.substring(4));
             attr = sample.getResult().getRecordsMap().get("output-2");
             attrValue = attr.getValues().get(0);
-            assertEquals(attrValue, "test");
+            assertEquals("test", attrValue);
         } catch (IllegalArgumentException e) {
             fail("Failed to replace the output default value on output-1");
         } catch (OnapCommandException e) {
diff --git a/framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java b/framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java
index d6ef3a34..ae620632 100644
--- a/framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/conf/OnapCommandConfgTest.java
@@ -16,6 +16,14 @@
 
 package org.onap.cli.fw.conf;
 
+import org.junit.Test;
+
 public class OnapCommandConfgTest {
 
+	@Test
+	public void addPropertiesTest() {
+
+	    OnapCommandConfig.getPropertyValue("cli.schema.profile.confs");
+	}
+
 }
diff --git a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
index 5831c272..4c64ca2a 100644
--- a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
@@ -123,4 +123,18 @@ public class ValidateSchemaTest {
         assertTrue(errorList5.size() == 0);
 
     }
+
+    @Test
+    public void validateAfterRemovingIfElseTest() throws OnapCommandException {
+        OnapCommand cmd2 = new OnapCommand() {
+            @Override
+            protected void run() throws OnapCommandException {
+
+            }
+        };
+        List < String > errorList2 = OnapCommandSchemaLoader.loadSchema(cmd2,
+            "schema-validate-basic-default-attr.yaml", true, true);
+        assertTrue(errorList2.size() > 0);
+    }
+
 }
diff --git a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
index e01c3878..b7da1c2f 100644
--- a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
@@ -533,4 +533,15 @@ public class OnapCommandUtilsTest {
    public void testMd5(){
     assertNotNull(OnapCommandUtils.md5("a"));
     }
+
+   @Test
+   public void replaceLineFromResults() {
+	   Map<String, String> mapExample = new HashMap<String, String>();
+	   mapExample.put("key1", "paramA");
+	   mapExample.put("key2", "paramB");
+	   OnapCommandUtils.replaceLineFromResults("line $r{paramA} line $r{paramB}", mapExample);
+	   assertTrue(mapExample.get("key1").equals("paramA"));
+	   assertTrue(mapExample.get("key2").equals("paramB"));
+   }
+
 }
diff --git a/framework/src/test/resources/schema-validate-basic-default-attr.yaml b/framework/src/test/resources/schema-validate-basic-default-attr.yaml
new file mode 100644
index 00000000..03d06281
--- /dev/null
+++ b/framework/src/test/resources/schema-validate-basic-default-attr.yaml
@@ -0,0 +1,91 @@
+# Copyright 2018 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.
+
+open_cli_schema_version: 1.0
+description: Register microservice into Onap
+name: schema-validate
+info:
+  product: open-cli
+  service: test
+  type: cmd
+  author: Sravan Kumar sravan.kumar1@huawei.com
+parameters:
+  - name: service-name1
+    description: Oclip service name
+    type: string
+    short_option: x
+    long_option: service-name
+    is_optional: false
+  - name: service-version
+    description: Oclip service version
+    type: string
+    short_option: y
+    long_option: service-version
+    is_optional: false
+  - name: service-url
+    description: Oclip service base url
+    type: url1
+    short_option: u
+    long_option: service-url
+    is_optional: false1
+  - name: status
+    description: Oclip service status
+    type: digit
+    short_option: z
+    long_option: service-version
+    is_optional: true
+    default_value: 1
+  - name: node-ip
+    description: Oclip service running node IP
+    type: string
+  - name: node-port
+    description: Oclip service running node port
+    type: string
+  - name: create-or-update
+    description: Oclip service create or update
+    type: cfbcv
+    default_value: true
+results:
+  direction: portrait1
+  attributes:
+    - name: name
+      description: Oclip service name
+      scope: short
+      type: string
+      is_default_attr: true
+    - name: version
+      description: Oclip service version
+      scope: short
+      type: string
+      is_default_attr: true
+    - name: status
+      description: Oclip service base url
+      scope: short
+      type: url
+      is_default_attr: true
+    - name: status
+      description: Oclip service status
+      scope: short1
+      type: digit
+      is_default_attr: true
+    - name: nodes
+      description: Oclip service running nodes
+      scope: long
+      type: string
+      is_default_attr: true
+    - name: location
+      description: Oclip service location
+      scope: long
+      type: url
+      is_default_attr: true
\ No newline at end of file