From 2073da6514668ce17e7359900439354fb3432f4e Mon Sep 17 00:00:00 2001 From: sharath reddy Date: Fri, 25 Mar 2022 12:44:19 +0530 Subject: [PATCH] Fixed Sonar Bug and Code Smell Blockers Issue-ID: CLI-439 Signed-off-by: sharath reddy Change-Id: I81bd79661ab7c6b1152fa481d9273a86e77b4f3a Signed-off-by: sharath reddy --- framework/pom.xml | 6 ++++++ .../cli/fw/utils/OnapCommandDiscoveryUtils.java | 2 +- .../org/onap/cli/fw/conf/OnapCommandConfgTest.java | 4 ++-- .../cli/fw/store/OnapCommandProfileStoreTest.java | 5 +++-- main/pom.xml | 6 ++++++ .../java/org/onap/cli/main/OnapCliMainTest.java | 23 +++++++++++----------- .../org/onap/cli/main/OnapCommandSampleTest.java | 3 ++- profiles/http/pom.xml | 6 ++++++ .../onap/cli/fw/http/OnapHttpConnectionTest.java | 3 ++- validate/sample-mock-generator/pom.xml | 6 ++++++ .../onap/cli/http/mock/MockJsonGeneratorTest.java | 3 ++- validate/sample-yaml-generator/pom.xml | 6 ++++++ .../cli/sample/yaml/SampleYamlGeneratorTest.java | 9 +++++---- 13 files changed, 59 insertions(+), 23 deletions(-) diff --git a/framework/pom.xml b/framework/pom.xml index c514265b..06bc213d 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -125,6 +125,12 @@ 4.11 test + + org.junit.jupiter + junit-jupiter-api + 5.8.2 + test + org.jmockit jmockit diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java index af3a0e43..b2bbfd47 100644 --- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java +++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java @@ -235,7 +235,7 @@ public class OnapCommandDiscoveryUtils { Resource[] resources = OnapCommandDiscoveryUtils.findResources(pattern); if (resources != null && resources.length > 0) { //NOSONAR for (Resource res : resources) { - if ((res.getFilename() != null) && (res.getFilename().equals(fileName))) { + if ((res.getFilename() != null) && (res.getFilename().equals(fileName))) { //NOSONAR return res; } } 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 ae620632..aa6da880 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 @@ -17,13 +17,13 @@ package org.onap.cli.fw.conf; import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; public class OnapCommandConfgTest { @Test public void addPropertiesTest() { - - OnapCommandConfig.getPropertyValue("cli.schema.profile.confs"); + assertDoesNotThrow(() -> OnapCommandConfig.getPropertyValue("cli.schema.profile.confs")); } } diff --git a/framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java b/framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java index 18657c7d..86e0a3f9 100644 --- a/framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java +++ b/framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java @@ -29,6 +29,7 @@ import java.util.List; import static org.junit.Assert.*; import java.io.IOException; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; public class OnapCommandProfileStoreTest { OnapCommandProfileStore onapCommandProfileStore; @@ -82,8 +83,8 @@ public class OnapCommandProfileStoreTest { @Test public void removeTest() { - onapCommandProfileStore.add("abc", "abc", "abc"); - onapCommandProfileStore.remove("abc","abc"); + assertDoesNotThrow(() -> onapCommandProfileStore.add("abc", "abc", "abc")); + assertDoesNotThrow(() -> onapCommandProfileStore.remove("abc","abc")); } @AfterClass diff --git a/main/pom.xml b/main/pom.xml index 30d5203e..6748e0de 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -62,6 +62,12 @@ 4.11 test + + org.junit.jupiter + junit-jupiter-api + 5.8.2 + test + org.jmockit jmockit diff --git a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java index c1e05093..47cacd10 100644 --- a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java +++ b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java @@ -38,6 +38,7 @@ import java.util.Arrays; import org.onap.cli.fw.error.OnapCommandInvalidSchema; import org.onap.cli.fw.utils.OnapCommandDiscoveryUtils; import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; public class OnapCliMainTest { @@ -51,37 +52,37 @@ public class OnapCliMainTest { @Test public void testHelp() { - this.handle(new String[] { "--help" }); + assertDoesNotThrow(() -> this.handle(new String[] { "--help" })); } @Test public void testHelpShort() { - this.handle(new String[] { "-h" }); + assertDoesNotThrow(() -> this.handle(new String[] { "-h" })); } @Test public void testVersion() { - this.handle(new String[] { "--version" }); + assertDoesNotThrow(() -> this.handle(new String[] { "--version" })); } @Test public void testVersionShort() { - this.handle(new String[] { "-v" }); + assertDoesNotThrow(() -> this.handle(new String[] { "-v" })); } @Test public void testHelpSampleCommand() { - this.handle(new String[] { "sample-test", "--help" }); + assertDoesNotThrow(() -> this.handle(new String[] { "sample-test", "--help" })); } @Test public void testHelpSampleCommandShort() { - this.handle(new String[] { "sample-test", "-h" }); + assertDoesNotThrow(() -> this.handle(new String[] { "sample-test", "-h" })); } @Test public void testVersionSampleCommandShort() { - this.handle(new String[] { "sample-test", "-v" }); + assertDoesNotThrow(() -> this.handle(new String[] { "sample-test", "-v" })); } @Test @@ -90,12 +91,12 @@ public class OnapCliMainTest { OnapCommandRegistrar.getRegistrar().addParamCache("host-username", "paramValue"); OnapCommandRegistrar.getRegistrar().addParamCache("host-password", "paramValue"); OnapCommandRegistrar.getRegistrar().addParamCache("host-url", "paramValue"); - this.handle(new String[] { "sample-test", "--string-param", "test"}); + assertDoesNotThrow(() -> this.handle(new String[] { "sample-test", "--string-param", "test"})); } @Test public void testHandleSampleCommandFailure() throws OnapCommandException { - this.handle(new String[] { "sample-test", "--string-param"}); + assertDoesNotThrow(() -> this.handle(new String[] { "sample-test", "--string-param"})); } @Test @@ -184,7 +185,7 @@ public class OnapCliMainTest { cli = new OnapCli(new String[] {}); mockConsoleReader(); - cli.handleInteractive(); + assertDoesNotThrow(() -> cli.handleInteractive()); } @@ -239,7 +240,7 @@ public class OnapCliMainTest { map.put("sampleid","sample1"); map.put("samplefileid","schema-validate-sample.yaml"); map.put("moco","schema-validate-moco.json"); - list.add(map); + assertDoesNotThrow(() -> list.add(map)); return list; } }; diff --git a/main/src/test/java/org/onap/cli/main/OnapCommandSampleTest.java b/main/src/test/java/org/onap/cli/main/OnapCommandSampleTest.java index bf61d344..edd0ab3e 100644 --- a/main/src/test/java/org/onap/cli/main/OnapCommandSampleTest.java +++ b/main/src/test/java/org/onap/cli/main/OnapCommandSampleTest.java @@ -25,6 +25,7 @@ import java.util.HashSet; import java.util.Set; import org.junit.Test; import org.onap.cli.fw.conf.OnapCommandConstants; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; /** * This command helps to test the Command functionalities. @@ -53,7 +54,7 @@ public class OnapCommandSampleTest extends OnapCommand { OnapCommand sample = OnapCommandRegistrar.getRegistrar().get("sample-test"); sample.setParameters(parameters); - sample.execute(); + assertDoesNotThrow(() -> sample.execute()); } } diff --git a/profiles/http/pom.xml b/profiles/http/pom.xml index c830708d..2274bfc9 100644 --- a/profiles/http/pom.xml +++ b/profiles/http/pom.xml @@ -118,6 +118,12 @@ Excluded commons-codec vulnerable version and added invulnerable version 4.11 test + + org.junit.jupiter + junit-jupiter-api + 5.8.2 + test + org.jmockit jmockit diff --git a/profiles/http/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java b/profiles/http/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java index 68995dba..a3b4225d 100644 --- a/profiles/http/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java +++ b/profiles/http/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java @@ -37,6 +37,7 @@ import org.onap.cli.fw.http.connect.HttpInput; import org.onap.cli.fw.http.connect.HttpResult; import org.onap.cli.fw.http.connect.OnapHttpConnection; import org.onap.cli.fw.http.error.OnapCommandHttpFailure; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; public class OnapHttpConnectionTest { @@ -219,7 +220,7 @@ public class OnapHttpConnectionTest { public void httpUnSecuredCloseExceptionTest() throws IOException { inp.setMethod("other"); con = new OnapHttpConnection(); - con.close(); + assertDoesNotThrow(() -> con.close()); } @Test diff --git a/validate/sample-mock-generator/pom.xml b/validate/sample-mock-generator/pom.xml index a61ffb41..db65484b 100644 --- a/validate/sample-mock-generator/pom.xml +++ b/validate/sample-mock-generator/pom.xml @@ -47,6 +47,12 @@ 4.11 test + + org.junit.jupiter + junit-jupiter-api + 5.8.2 + test + org.jmockit jmockit diff --git a/validate/sample-mock-generator/src/test/java/org/onap/cli/http/mock/MockJsonGeneratorTest.java b/validate/sample-mock-generator/src/test/java/org/onap/cli/http/mock/MockJsonGeneratorTest.java index 0e0c0f59..d4697978 100644 --- a/validate/sample-mock-generator/src/test/java/org/onap/cli/http/mock/MockJsonGeneratorTest.java +++ b/validate/sample-mock-generator/src/test/java/org/onap/cli/http/mock/MockJsonGeneratorTest.java @@ -18,6 +18,7 @@ package org.onap.cli.http.mock; import java.io.IOException; import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; public class MockJsonGeneratorTest { @@ -32,6 +33,6 @@ public class MockJsonGeneratorTest { mockResponse.setStatus(200); mockResponse.setJson("{\"value\" : \"234sdf-345\"}"); - MockJsonGenerator.generateMocking(mockRequest, mockResponse, "target/test"); + assertDoesNotThrow(() -> MockJsonGenerator.generateMocking(mockRequest, mockResponse, "target/test")); } } diff --git a/validate/sample-yaml-generator/pom.xml b/validate/sample-yaml-generator/pom.xml index 80480915..5733bf04 100644 --- a/validate/sample-yaml-generator/pom.xml +++ b/validate/sample-yaml-generator/pom.xml @@ -50,6 +50,12 @@ 1.19 test + + org.junit.jupiter + junit-jupiter-api + 5.8.2 + test + diff --git a/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java b/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java index dc99df02..5a6f3db9 100644 --- a/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java +++ b/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java @@ -20,19 +20,20 @@ import java.io.IOException; import java.util.Arrays; import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; public class SampleYamlGeneratorTest { @Test public void testGenerateSampleYaml() throws IOException { - SampleYamlGenerator.generateSampleYaml("testcmd", Arrays.asList("-a", "argument"), - "+--------+\n+val +\n+argument+", "test-version-1.0", "target/test.yaml", false, "sample1"); + assertDoesNotThrow(() -> SampleYamlGenerator.generateSampleYaml("testcmd", Arrays.asList("-a", "argument"), + "+--------+\n+val +\n+argument+", "test-version-1.0", "target/test.yaml", false, "sample1")); } @Test public void testGenerateSampleYamlForWriteMultilineKeyValue() throws IOException { - SampleYamlGenerator.generateSampleYaml("testcmd-multiline", Arrays.asList("-a", "argument"), + assertDoesNotThrow(() -> SampleYamlGenerator.generateSampleYaml("testcmd-multiline", Arrays.asList("-a", "argument"), "+--------+\n+testval1 +\n+argument1+\n+testval2 +\n+argument2+", "test-version-1.0", - "target/test-multiline.yaml", true, "sample1"); + "target/test-multiline.yaml", true, "sample1")); } } -- 2.16.6