Fix sonar issues for vnfsdk

Issue-ID: VNFSDK-608

Signed-off-by: jitendra007 <jitendra.sharma1@huawei.com>
Change-Id: I7a64c18fb9889f06dcd52a1baaf91c7b312657bb

3 files changed, 18 insertions, 18 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestCaseTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestCaseTest.java
index 5e469640..d55f16b3 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestCaseTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestCaseTest.java
@@ -44,12 +44,12 @@ public class VTPTestCaseTest {
         vtpTestCase.setScenario("abc");
         vtpTestCase.setTestCaseName("abc");
         vtpTestCase.setTestSuiteName("abc");
-        assertEquals(vtpTestCase.getAuthor(),"abc");
-        assertEquals(vtpTestCase.getDescription(),"abc");
+        assertEquals("abc",vtpTestCase.getAuthor());
+        assertEquals("abc",vtpTestCase.getDescription());
         assertNull(vtpTestCase.getInputs());
         assertNull(vtpTestCase.getOutputs());
-        assertEquals(vtpTestCase.getTestCaseName(),"abc");
-        assertEquals(vtpTestCase.getTestSuiteName(),"abc");
+        assertEquals("abc",vtpTestCase.getTestCaseName());
+        assertEquals("abc",vtpTestCase.getTestSuiteName());
 
         VTPTestCase.VTPTestCaseInput vtpTestCaseInput=new VTPTestCase.VTPTestCaseInput();
         vtpTestCaseInput.setDefaultValue("abc");
@@ -59,20 +59,20 @@ public class VTPTestCaseTest {
         vtpTestCaseInput.setMetadata(actualObj);
         vtpTestCaseInput.setName("abc");
         vtpTestCaseInput.setType("abc");
-        assertEquals(vtpTestCaseInput.getDefaultValue(),"abc");
-        assertEquals(vtpTestCaseInput.getDescription(),"abc");
-        assertEquals(vtpTestCaseInput.getIsOptional(),true);
+        assertEquals("abc",vtpTestCaseInput.getDefaultValue());
+        assertEquals("abc",vtpTestCaseInput.getDescription());
+        assertEquals(true,vtpTestCaseInput.getIsOptional());
         assertEquals(vtpTestCaseInput.getMetadata(),actualObj);
-        assertEquals(vtpTestCaseInput.getName(),"abc");
-        assertEquals(vtpTestCaseInput.getType(),"abc");
+        assertEquals("abc",vtpTestCaseInput.getName());
+        assertEquals("abc",vtpTestCaseInput.getType());
 //
         VTPTestCase.VTPTestCaseOutput vtpTestCaseOutput=new VTPTestCase.VTPTestCaseOutput();
         vtpTestCaseOutput.setDescription("abc");
         vtpTestCaseOutput.setName("abc");
         vtpTestCaseOutput.setType("abc");
-        assertEquals(vtpTestCaseOutput.getDescription(),"abc");
-        assertEquals(vtpTestCaseOutput.getName(),"abc");
-        assertEquals(vtpTestCaseOutput.getType(),"abc");
+        assertEquals("abc",vtpTestCaseOutput.getDescription());
+        assertEquals("abc",vtpTestCaseOutput.getName());
+        assertEquals("abc",vtpTestCaseOutput.getType());
 
     }
 }
\ No newline at end of file
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestScenarioTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestScenarioTest.java
index 6e715647..513b30a5 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestScenarioTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestScenarioTest.java
@@ -16,8 +16,8 @@
 package org.onap.vtp.scenario.model;
 
 import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
+import static org.junit.Assert.assertNull;
 
 public class VTPTestScenarioTest {
     VTPTestScenario vtpTestScenario= new VTPTestScenario();
@@ -26,11 +26,11 @@ public class VTPTestScenarioTest {
     {
         vtpTestScenario.setDescription("abc");
         vtpTestScenario.setName("abc");
-        assertEquals(vtpTestScenario.getDescription(),"abc");
-       assertEquals(vtpTestScenario.getName(),"abc");
+        assertEquals("abc", vtpTestScenario.getDescription());
+        assertEquals("abc", vtpTestScenario.getName());
         VTPTestScenario.VTPTestScenarioList vtpTestScenarioList= new VTPTestScenario.VTPTestScenarioList();
         vtpTestScenarioList.setScenarios(null);
-        assertEquals(vtpTestScenarioList.getScenarios(),null);
+        assertNull(vtpTestScenarioList.getScenarios());
     }
 
 }
\ No newline at end of file
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestSuiteTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestSuiteTest.java
index 0fc0eeb8..452d25aa 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestSuiteTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestSuiteTest.java
@@ -26,8 +26,8 @@ VTPTestSuite vtpTestSuite= new VTPTestSuite();
 {
     vtpTestSuite.setDescription("abc");
     vtpTestSuite.setName("abc");
-    assertEquals(vtpTestSuite.getDescription(),"abc");
-    assertEquals(vtpTestSuite.getName(),"abc");
+    assertEquals("abc",vtpTestSuite.getDescription());
+    assertEquals("abc",vtpTestSuite.getName());
     VTPTestSuite.VTPTestSuiteList vtpTestSuiteList=new VTPTestSuite.VTPTestSuiteList();
     vtpTestSuiteList.setSuites(null);
     assertNull(vtpTestSuiteList.getSuites());