Fixing sonar Exception Handling

Change-Id: I04eb047973a3f5c07dd9dc410cb13af974e8ded1
Issue-ID: SDC-810
Signed-off-by: avigaffa <avi.gaffa@amdocs.com>
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

1 files changed, 89 insertions, 3 deletions

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/CommonMethodsTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/CommonMethodsTest.java
index c675f8927f..ff3584a8a1 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/CommonMethodsTest.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/CommonMethodsTest.java
@@ -18,14 +18,100 @@ package org.openecomp.core.utilities;
 
 import org.testng.annotations.Test;
 
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
 public class CommonMethodsTest {
+
+  private static final String[] ARRAY = { "A", "B", "C" };
+
   @Test
-  public void testPrintStackTrace() throws Exception {
-    assertTrue(CommonMethods.printStackTrace().contains("org.openecomp.core.utilities" +
+  public void testPrintStackTrace() {
+
+    String trace = CommonMethods.printStackTrace();
+    assertTrue(trace.contains("org.openecomp.core.utilities" +
         ".CommonMethods.printStackTrace(CommonMethods.java:"));
-    assertTrue(CommonMethods.printStackTrace().contains("org.openecomp.core.utilities" +
+    assertTrue(trace.contains("org.openecomp.core.utilities" +
         ".CommonMethodsTest.testPrintStackTrace(CommonMethodsTest.java"));
   }
+
+  @Test
+  public void testArrayToCommaSeparatedString() {
+    assertEquals(CommonMethods.arrayToCommaSeparatedString(ARRAY), "A,B,C");
+  }
+
+  @Test
+  public void testArrayToCommaSeparatedStringEmpty() {
+    assertEquals(CommonMethods.arrayToCommaSeparatedString(new String[0]), "");
+  }
+
+  @Test
+  public void testArrayToCommaSeparatedStringNulls() {
+    assertEquals(CommonMethods.arrayToCommaSeparatedString(new String[] { null, null }), "null,null");
+  }
+
+  @Test
+  public void testArrayToCommaSeparatedStringEmptyStrings() {
+    assertEquals(CommonMethods.arrayToCommaSeparatedString(new String[] { "", "" }), ",");
+  }
+
+  @Test(expectedExceptions = NullPointerException.class)
+  public void testArrayToCommaSeparatedStringNull() {
+    CommonMethods.arrayToCommaSeparatedString(null);
+  }
+
+  @Test
+  public void testArrayToSeparatedString() {
+    assertEquals(CommonMethods.arrayToSeparatedString(ARRAY, '/'),"A/B/C");
+  }
+
+  @Test
+  public void testArrayToSeparatedStringEmpty() {
+    assertEquals(CommonMethods.arrayToSeparatedString(new String[0], '/'),"");
+  }
+
+  @Test
+  public void testArrayToSeparatedStringNulls() {
+    assertEquals(CommonMethods.arrayToSeparatedString(new String[] {null, null}, '/'),"null/null");
+  }
+
+  @Test
+  public void testArrayToSeparatedStringEmptyStrings() {
+    assertEquals(CommonMethods.arrayToSeparatedString(new String[] {"", ""}, '/'),"/");
+  }
+
+  @Test(expectedExceptions = NullPointerException.class)
+  public void testArrayToSeparatedStringNull() {
+    CommonMethods.arrayToSeparatedString(null, '/');
+  }
+
+  @Test
+  public void testCollectionToCommaSeparatedString() {
+    assertEquals(CommonMethods.collectionToCommaSeparatedString(Arrays.asList(ARRAY)), "A,B,C");
+  }
+
+  @Test
+  public void testCollectionToCommaSeparatedStringNulls() {
+    assertEquals(CommonMethods.collectionToCommaSeparatedString(Arrays.asList(null, null)), "null,null");
+  }
+
+  @Test
+  public void testCollectionToCommaSeparatedStringEmptyStrings() {
+    assertEquals(CommonMethods.collectionToCommaSeparatedString(Arrays.asList("", "")), ",");
+  }
+
+  @Test
+  public void testCollectionToCommaSeparatedStringEmtpy() {
+    assertEquals(CommonMethods.collectionToCommaSeparatedString(Collections.emptySet()), "");
+  }
+
+  @Test(expectedExceptions = NullPointerException.class)
+  public void testCollectionToCommaSeparatedStringNull() {
+    assertNull(CommonMethods.collectionToCommaSeparatedString(null));
+  }
+
 }