Merge "Sonar violation fixes for Parameterized tests and Lambda Expressions"

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);
     }
 }