Sorted out unit-test libraries in onboarding

Fixed scope, removed junit+tesng combinations,
deleted commented-out tests, did minor cleanups.

Change-Id: I71d0adf5c1c95435987dbb8b4077cc43bdf09df8
Issue-ID: SDC-1886
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

12 files changed, 180 insertions, 173 deletions

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
index e2fa2f09d9..5a7d0588ea 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2016-2018 European Support Limited
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -22,7 +38,6 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>${testng.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
index 423c4aa8e1..1eb46dff3a 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml
@@ -1,3 +1,19 @@
+<!--
+  ~ Copyright © 2016-2018 European Support Limited
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -48,13 +64,12 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>${testng.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml
index 9ff599f0d5..3f1b7700cf 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml
@@ -1,3 +1,19 @@
+<!--
+  ~ Copyright © 2016-2018 European Support Limited
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -28,27 +44,13 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-            <version>${mockito.all.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
-            <version>${testng.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>snakeyaml</artifactId>
-                    <groupId>org.yaml</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-            <version>${junit.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc.core</groupId>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/nosqldb/NoSqlDbTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/nosqldb/NoSqlDbTest.java
deleted file mode 100644
index 2bab7e0d67..0000000000
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/nosqldb/NoSqlDbTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.core.nosqldb;
-
-import org.openecomp.core.nosqldb.api.NoSqlDb;
-
-
-public class NoSqlDbTest {
-
-  private NoSqlDb noSqlDb;
-/*
-
-  @Test
-  public void testNoSqlDbFactoryFactoryInit() {
-    this.noSqlDb = NoSqlDbFactory.getInstance().createInterface();
-    Assert.assertNotNull(this.noSqlDb);
-    Assert.assertEquals(this.noSqlDb.getClass().getName(),
-        "org.openecomp.core.nosqldb.impl.cassandra.CassandraNoSqlDbImpl");
-  }
-
-  @Test(dependsOnMethods = {"testNoSqlDbFactoryFactoryInit"})
-  public void testCreateTable() {
-    this.noSqlDb.execute("test.drop", null);
-    this.noSqlDb.execute("test.create", null);
-  }
-
-  @Test(dependsOnMethods = {"testCreateTable"})
-  public void testInsertTable() {
-    this.noSqlDb
-        .insert("test", new String[]{"name", "value"}, new String[]{"TestName", "testValue"});
-    this.noSqlDb.execute("test.insert", new String[]{"TestName2", "testValue2"});
-  }
-
-  @Test(dependsOnMethods = {"testInsertTable"})
-  public void gettestSelectTable() {
-    ResultSet result = this.noSqlDb.execute("test.select.all", null);
-    List<Row> rows = result.all();
-    Assert.assertEquals(rows.size(), 2);
-    for (Row row : rows) {
-      System.out.format("%s %s\n", row.getString("name"), row.getString("value"));
-    }
-  }
-
-  */
-}
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/nosqldb/util/ConfigurationManagerTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/nosqldb/util/ConfigurationManagerTest.java
index 7a6343d15c..86543398a8 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/nosqldb/util/ConfigurationManagerTest.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/test/java/org/openecomp/core/nosqldb/util/ConfigurationManagerTest.java
@@ -1,13 +1,31 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.openecomp.core.nosqldb.util;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.reflect.Field;
-
-import static org.testng.Assert.assertNotNull;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 /**
  * @author EVITALIY
@@ -15,19 +33,24 @@ import static org.testng.Assert.assertNotNull;
  */
 public class ConfigurationManagerTest {
 
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
     private static final String NON_EXISTENT = "unexistentfile";
 
-    @BeforeMethod
+    @Before
     public void resetInstance() throws NoSuchFieldException, IllegalAccessException {
         Field field = ConfigurationManager.class.getDeclaredField("instance");
         field.setAccessible(true);
         field.set(null, null);
     }
 
-    @Test(expectedExceptions = IOException.class,
-            expectedExceptionsMessageRegExp = ".*" + NON_EXISTENT + ".*")
+    @Test
     public void testGetInstanceSystemProperty() throws Throwable {
 
+        expectedException.expect(IOException.class);
+        expectedException.expectMessage(containsString(NON_EXISTENT));
+
         try (ConfigurationSystemPropertyUpdater updater = new ConfigurationSystemPropertyUpdater(NON_EXISTENT)) {
             ConfigurationManager.getInstance();
         } catch (RuntimeException e) {
@@ -37,7 +60,7 @@ public class ConfigurationManagerTest {
     }
 
     @Test()
-    public void testGetInstanceDefault() throws Exception {
+    public void testGetInstanceDefault() {
 
         try (ConfigurationSystemPropertyUpdater property = new ConfigurationSystemPropertyUpdater()) {
             ConfigurationManager manager = ConfigurationManager.getInstance();
@@ -61,7 +84,7 @@ public class ConfigurationManagerTest {
         }
 
         @Override
-        public void close() throws IOException {
+        public void close() {
 
             if (oldValue == null) {
                 System.clearProperty(ConfigurationManager.CONFIGURATION_YAML_FILE);
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml
index 2d98487876..09b5efc223 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml
@@ -27,6 +27,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml
index 4bc6e5617a..684ee54017 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml
@@ -1,3 +1,19 @@
+<!--
+  ~ Copyright © 2016-2018 European Support Limited
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -53,7 +69,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-            <version>${junit.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
@@ -66,18 +81,6 @@
             <version>${org.everit.json.schema.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-            <version>${testng.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>snakeyaml</artifactId>
-                    <groupId>org.yaml</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>openecomp-sdc-logging-api</artifactId>
             <version>${project.version}</version>
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 c6d87def2b..5da9675536 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
@@ -16,10 +16,10 @@
 
 package org.openecomp.core.utilities;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -31,10 +31,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.apache.commons.lang3.ArrayUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 public class CommonMethodsTest {
 
@@ -71,7 +69,7 @@ public class CommonMethodsTest {
         assertEquals(CommonMethods.arrayToCommaSeparatedString(new String[] {"", ""}), ",");
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void testArrayToCommaSeparatedStringNull() {
         CommonMethods.arrayToCommaSeparatedString(null);
     }
@@ -96,7 +94,7 @@ public class CommonMethodsTest {
         assertEquals(CommonMethods.arrayToSeparatedString(new String[] {"", ""}, '/'), "/");
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void testArrayToSeparatedStringNull() {
         CommonMethods.arrayToSeparatedString(null, '/');
     }
@@ -121,7 +119,7 @@ public class CommonMethodsTest {
         assertEquals(CommonMethods.collectionToCommaSeparatedString(Collections.emptySet()), "");
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void testCollectionToCommaSeparatedStringNull() {
         assertNull(CommonMethods.collectionToCommaSeparatedString(null));
     }
@@ -138,8 +136,8 @@ public class CommonMethodsTest {
 
         String []resultArray = CommonMethods.concat(firstArray, secondArray);
 
-        Assert.assertEquals(resultArray.length, 4);
-        Assert.assertTrue(ArrayUtils.contains(resultArray, secondArray[0])
+        assertEquals(resultArray.length, 4);
+        assertTrue(ArrayUtils.contains(resultArray, secondArray[0])
                 && ArrayUtils.contains(resultArray, firstArray[0]));
     }
 
@@ -149,8 +147,8 @@ public class CommonMethodsTest {
 
         String []resultArray = CommonMethods.concat(firstArray, null);
 
-        Assert.assertEquals(resultArray.length, 2);
-        Assert.assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(firstArray)));
+        assertEquals(resultArray.length, 2);
+        assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(firstArray)));
     }
 
     @Test
@@ -159,45 +157,45 @@ public class CommonMethodsTest {
 
         String []resultArray = CommonMethods.concat(null, secondArray);
 
-        Assert.assertEquals(resultArray.length, 2);
-        Assert.assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(secondArray)));
+        assertEquals(resultArray.length, 2);
+        assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(secondArray)));
     }
 
     @Test
     public void testConcatBothValueNull() {
-        Assert.assertNull(CommonMethods.concat(null, null));
+        assertNull(CommonMethods.concat(null, null));
     }
 
     @Test
     public void testNewInstance() {
         Object obj = CommonMethods.newInstance(JAVA_LANG_STRING);
-        Assert.assertNotNull(obj);
-        Assert.assertTrue(obj instanceof String);
+        assertNotNull(obj);
+        assertTrue(obj instanceof String);
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testNewInstanceIncorrectClassProvided() {
-        Assert.assertNull(CommonMethods.newInstance("java.lang.Stringss"));
+        assertNull(CommonMethods.newInstance("java.lang.Stringss"));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testNewInstanceClassNotProvided() {
-        Assert.assertNull(CommonMethods.newInstance(null, Object.class));
+        assertNull(CommonMethods.newInstance(null, Object.class));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testNewInstanceObjectNotProvided() {
-        Assert.assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, null));
+        assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, null));
     }
 
-    @Test(expectedExceptions = ClassCastException.class)
+    @Test(expected = ClassCastException.class)
     public void testNewInstanceClassCastException() {
-        Assert.assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, ArrayList.class));
+        assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, ArrayList.class));
     }
 
-    @Test(expectedExceptions = RuntimeException.class)
+    @Test(expected = RuntimeException.class)
     public void testNewInstanceInvalidClassProvided() {
-        Assert.assertNull(CommonMethods.newInstance(List.class));
+        assertNull(CommonMethods.newInstance(List.class));
     }
 
     @Test
@@ -206,26 +204,26 @@ public class CommonMethodsTest {
         String result = CommonMethods.listToSeparatedString(
                 Stream.of("Concat", "String").collect(Collectors.toList()), ',');
 
-        Assert.assertNotNull(result);
-        Assert.assertEquals(str, result);
+        assertNotNull(result);
+        assertEquals(str, result);
     }
 
     @Test
     public void testDuplicateStringWithDelimiter() {
         String duplicateStr = CommonMethods.duplicateStringWithDelimiter("Duplicate", '#', 4);
 
-        Assert.assertNotNull(duplicateStr);
+        assertNotNull(duplicateStr);
 
         String[] duplicateStrArray = duplicateStr.split("#");
-        Assert.assertTrue(duplicateStr.contains("Duplicate"));
-        Assert.assertEquals(duplicateStrArray.length, 4);
+        assertTrue(duplicateStr.contains("Duplicate"));
+        assertEquals(duplicateStrArray.length, 4);
     }
 
     @Test
     public void testRoSingleElement() {
         Set<String> stringSet = CommonMethods.toSingleElementSet("Set Element");
-        Assert.assertNotNull(stringSet);
-        Assert.assertTrue(stringSet.contains("Set Element"));
+        assertNotNull(stringSet);
+        assertTrue(stringSet.contains("Set Element"));
     }
 
     @Test
@@ -253,7 +251,7 @@ public class CommonMethodsTest {
 
         List<Map<String, String>> resultList = CommonMethods.mergeListsOfMap(list1, list2);
 
-        Assert.assertEquals(resultList.size(), 6);
+        assertEquals(resultList.size(), 6);
 
         //Verify for duplicate key
         int count = 0;
@@ -262,7 +260,7 @@ public class CommonMethodsTest {
                 count++;
         }
 
-        Assert.assertEquals(1, count);
+        assertEquals(1, count);
     }
 
     @Test
@@ -272,9 +270,9 @@ public class CommonMethodsTest {
 
         List<String> resultList = CommonMethods.mergeLists(list1, list2);
 
-        Assert.assertEquals(resultList.size(), 4);
-        Assert.assertTrue(resultList.containsAll(list1));
-        Assert.assertTrue(resultList.containsAll(list2));
+        assertEquals(resultList.size(), 4);
+        assertTrue(resultList.containsAll(list1));
+        assertTrue(resultList.containsAll(list2));
     }
 
     @Test
@@ -294,7 +292,7 @@ public class CommonMethodsTest {
 
         Map<String, String> resultMap = CommonMethods.mergeMaps(map1, map2);
 
-        Assert.assertEquals(resultMap.size(), 4);
-        Assert.assertEquals(resultMap.get("Port"), "VMI");
+        assertEquals(resultMap.size(), 4);
+        assertEquals(resultMap.get("Port"), "VMI");
     }
 }
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java
index 1b06f37a16..8fe9d40536 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java
@@ -1,8 +1,24 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.openecomp.core.utilities.file;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -12,9 +28,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * @author EVITALIY
@@ -82,9 +97,9 @@ public class FileContentHandlerTest {
 
         Assert.assertEquals(contentHandler.getFiles().size(), 2);
         Assert.assertEquals(contentHandler.getFileList().size(), 2);
-        Assert.assertFalse(contentHandler.isEmpty());
+        assertFalse(contentHandler.isEmpty());
         contentHandler.remove("file1");
-        Assert.assertFalse(contentHandler.containsFile("file1"));
+        assertFalse(contentHandler.containsFile("file1"));
     }
 
     @Test
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileUtilsTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileUtilsTest.java
index 74c1b1424d..187f6c35a8 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileUtilsTest.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileUtilsTest.java
@@ -16,9 +16,9 @@
 
 package org.openecomp.core.utilities.file;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,10 +31,9 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.apache.commons.io.IOUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * @author EVITALIY
@@ -64,12 +63,12 @@ public class FileUtilsTest {
         assertTrue(FileUtils.readViaInputStream(TEST_RESOURCE, TEST_FUNCTION) > 0);
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void testReadViaInputStreamNull() {
         FileUtils.readViaInputStream((String) null, TEST_FUNCTION);
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testReadViaInputStreamNotFound() {
         FileUtils.readViaInputStream("notfound.txt", TEST_FUNCTION);
     }
@@ -176,7 +175,7 @@ public class FileUtilsTest {
         Assert.assertNotNull(inputStream);
     }
 
-    @Test(expectedExceptions = RuntimeException.class)
+    @Test(expected = RuntimeException.class)
     public void testLoadFileToInputStreamIncorrectFilePath() {
         FileUtils.loadFileToInputStream("invalidfilepath");
     }
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java
index e57cdc2a80..918d7beea7 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java
@@ -22,9 +22,9 @@ package org.openecomp.core.utilities.json;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
 import org.openecomp.core.utilities.file.FileUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 public class JsonSchemaDataGeneratorTest {
 
@@ -53,7 +53,7 @@ public class JsonSchemaDataGeneratorTest {
                         + "\"phoneNumber\":[{\"code\":1,\"location\":\"Home\"},{\"code\":2,\"location\":\"Office\"}]}"));
     }
 
-    @Test(expectedExceptions = JSONException.class)
+    @Test(expected = JSONException.class)
     public void testSchemaWithInvalidDefault() {
         testGenerate(SCHEMA_WITH_INVALID_DEFAULT, null);
     }
@@ -64,7 +64,7 @@ public class JsonSchemaDataGeneratorTest {
                 new JSONObject("{\"ipConfiguration\":{\"ipv4Required\":true,\"ipv6Required\":false}}"));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testConstructorException() {
         Assert.assertNull(new JsonSchemaDataGenerator(null));
     }
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java
index 02bc568c39..17e48ca69c 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java
@@ -26,10 +26,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
+import org.junit.Assert;
+import org.junit.Test;
 import org.openecomp.core.utilities.file.FileUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 public class JsonUtilTest {
 
@@ -70,7 +69,7 @@ public class JsonUtilTest {
                 + "It does not match pattern (0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/((19|20)\\d\\d)");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testInValidJsonValidateNullJson() {
         JsonUtil.validate(null, null);
     }
@@ -102,7 +101,7 @@ public class JsonUtilTest {
         Assert.assertEquals(list.size(), 3);
     }
 
-    @Test(expectedExceptions = RuntimeException.class)
+    @Test(expected = RuntimeException.class)
     public void testJson2ObjectIncorrectJson() {
         String inputStr = "{[Json, Util, Test]}";
         List list = JsonUtil.json2Object(inputStr, ArrayList.class);
@@ -117,7 +116,7 @@ public class JsonUtilTest {
         Assert.assertEquals(list.size(), 3);
     }
 
-    @Test(expectedExceptions = RuntimeException.class)
+    @Test(expected = RuntimeException.class)
     public void testJson2ObjectIncorrectJsonInputStream() {
         String inputStr = "{[Json, Util, Test]}";
         List list = JsonUtil.json2Object(new ByteArrayInputStream(inputStr.getBytes()), ArrayList.class);