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>

2 files changed, 32 insertions, 72 deletions

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