diff options
author | 2022-04-28 17:57:41 +0530 | |
---|---|---|
committer | 2022-05-09 11:59:28 +0000 | |
commit | f3bea1cd0fd251b1d8b4bfde0ec8d88a486df9de (patch) | |
tree | 1752115171fd3906ab156d726d50619b1f13afff /framework/src/test/java/org/onap | |
parent | 82af57b3b997c975ac436b9ab2e6ba5b3cf90ea3 (diff) |
Sonar violation fixes for Parameterized tests and Lambda Expressions
Violations : Parameterized tests for OnapCommandprintTest
Use lambda expression for OnapCommandSchemaCmdLoader
Refactor method in OnapCli
Signed-off-by: abhishek.c92 <abhishek.c92@samsung.com>
Issue-ID: CLI-446
Change-Id: I8e8337d2b5993983d8ea105b2d1882952a3783a3
Diffstat (limited to 'framework/src/test/java/org/onap')
-rw-r--r-- | framework/src/test/java/org/onap/cli/fw/output/print/OnapCommandPrintTest.java | 60 |
1 files changed, 33 insertions, 27 deletions
diff --git a/framework/src/test/java/org/onap/cli/fw/output/print/OnapCommandPrintTest.java b/framework/src/test/java/org/onap/cli/fw/output/print/OnapCommandPrintTest.java index ff728a33..0dfcdfb1 100644 --- a/framework/src/test/java/org/onap/cli/fw/output/print/OnapCommandPrintTest.java +++ b/framework/src/test/java/org/onap/cli/fw/output/print/OnapCommandPrintTest.java @@ -20,57 +20,63 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import org.junit.Ignore; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; import org.onap.cli.fw.error.OnapCommandOutputPrintingFailed; import org.onap.cli.fw.output.OnapCommandPrintDirection; +@RunWith(Parameterized.class) public class OnapCommandPrintTest { + private String expected; + private String colValue1; + private String colValue2; - @Test - @Ignore - public void printCsvTest() throws OnapCommandOutputPrintingFailed { //NOSONAR - OnapCommandPrint pr = new OnapCommandPrint(); - pr.setDirection(OnapCommandPrintDirection.LANDSCAPE); - pr.setPrintTitle(true); - pr.addColumn("name1", new ArrayList<String>(Arrays.asList(new String[] { "value1" }))); - String exp = "name1\r\n"; - String result = pr.printCsv(); - assertEquals(exp, result); - } - @Test - public void printTableTest() throws OnapCommandOutputPrintingFailed { - OnapCommandPrint pr = new OnapCommandPrint(); + public OnapCommandPrintTest(String expected, String colValue1, String colValue2) { + this.expected = expected; + this.colValue1 = colValue1; + this.colValue2 = colValue2; + } - pr.setDirection(OnapCommandPrintDirection.LANDSCAPE); - pr.setPrintTitle(true); - pr.addColumn("name2", new ArrayList<String>(Arrays.asList(new String[] { "value2" }))); - String exp = "+--------+\n|name2 |\n+--------+\n|value2 |\n+--------+\n"; - String result = pr.printTable(true); - assertEquals(exp, result); + @Parameterized.Parameters + public static Collection testUtilParams() { + return Arrays.asList(new Object[][]{ {"+--------+\n|name2 |\n+--------+\n|value2 |\n+--------+\n", "name2", "value2"}, + {"+--------+\n|name2 |\n+--------+\n|value2 |\n+--------+\n", "name2", "value2"}, + {"+--------+\n|name2 |\n+--------+\n| |\n+--------+\n", "name2", ""} }); } + + /** + * Tests involved: + * 1. printTableTest + * 2. printTableNullColumnHeaderTest + * 3. printTableEmptyColumnValuesTest + * @throws OnapCommandOutputPrintingFailed + */ @Test - public void printTableNullColumnHeaderTest() throws OnapCommandOutputPrintingFailed { + public void printableTests() throws OnapCommandOutputPrintingFailed { OnapCommandPrint pr = new OnapCommandPrint(); pr.setDirection(OnapCommandPrintDirection.LANDSCAPE); pr.setPrintTitle(true); - pr.addColumn("name2", new ArrayList<String>(Arrays.asList(new String[] { "value2" }))); - String exp = "+--------+\n|name2 |\n+--------+\n|value2 |\n+--------+\n"; + pr.addColumn(this.colValue1, new ArrayList<String>(Arrays.asList(new String[] { this.colValue2 }))); + String exp = this.expected; String result = pr.printTable(true); assertEquals(exp, result); } @Test - public void printTableEmptyColumnValuesTest() throws OnapCommandOutputPrintingFailed { + @Ignore + public void printCsvTest() throws OnapCommandOutputPrintingFailed { //NOSONAR OnapCommandPrint pr = new OnapCommandPrint(); pr.setDirection(OnapCommandPrintDirection.LANDSCAPE); pr.setPrintTitle(true); - pr.addColumn("name2", new ArrayList<String>(Arrays.asList(new String[] { "" }))); - String exp = "+--------+\n|name2 |\n+--------+\n| |\n+--------+\n"; - String result = pr.printTable(true); + pr.addColumn("name1", new ArrayList<String>(Arrays.asList(new String[] { "value1" }))); + String exp = "name1\r\n"; + String result = pr.printCsv(); assertEquals(exp, result); } } |