Merge branch 'master' of /home/jwagantall/linuxfoundation/onap/IT-21112/sli-core

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

8 files changed, 477 insertions, 0 deletions

diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceTest.java b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceTest.java
new file mode 100644
index 000000000..45268107e
--- /dev/null
+++ b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceTest.java
@@ -0,0 +1,121 @@
+package org.onap.ccsdk.sli.core.dblib;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Properties;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.ccsdk.sli.core.dblib.config.BaseDBConfiguration;
+import org.onap.ccsdk.sli.core.dblib.config.JDBCConfiguration;
+import org.onap.ccsdk.sli.core.dblib.jdbc.JdbcDBCachedDataSource;
+import org.slf4j.LoggerFactory;
+
+public class CachedDataSourceTest {
+
+	private static final Properties props = new Properties();
+	private static BaseDBConfiguration config;
+	private static CachedDataSource ds;
+
+	@BeforeClass
+	public static void setUpBeforeClass() throws Exception {
+		props.setProperty("org.onap.ccsdk.sli.dbtype", "jdbc");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.hosts", "localhost");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.url", "jdbc:mysql://dbhost:3306/test");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.driver", "org.mariadb.jdbc.Driver");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.database", "test");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.user", "dbuser");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.password", "passw0rd");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.connection.name", "testdb01");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.connection.timeout", "50");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.request.timeout", "100");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.limit.init", "10");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.limit.min", "10");
+		props.setProperty("org.onap.ccsdk.sli.jdbc.limit.max", "20");
+		props.setProperty("org.onap.dblib.connection.recovery", "false");
+
+		config = new JDBCConfiguration(props);
+		ds = new JdbcDBCachedDataSource(config);
+	}
+
+	@Test
+	public void testCachedDataSource() {
+		assertNotNull(ds);
+	}
+
+	@Test
+	public void testConfigure() {
+
+		assertNotNull(ds.configure(config));
+	}
+
+	@Test
+	public void testSetInitialDelay() {
+		ds.setInitialDelay(1000L);
+		assertTrue(ds.getInitialDelay() == 1000L);
+	}
+
+	@Test
+	public void testSetInterval() {
+		ds.setInterval(1000L);
+		assertTrue(ds.getInterval() == 1000L);
+	}
+
+	@Test
+	public void testSetExpectedCompletionTime() {
+		ds.setExpectedCompletionTime(100L);
+		assertTrue(ds.getExpectedCompletionTime() == 100L);
+	}
+
+	@Test
+	public void testSetUnprocessedFailoverThreshold() {
+		ds.setUnprocessedFailoverThreshold(100L);
+		assertTrue(ds.getUnprocessedFailoverThreshold() == 100L);
+	}
+
+	@Test
+	public void testGetParentLogger() {
+		try {
+			assertNull(ds.getParentLogger());
+		} catch (SQLFeatureNotSupportedException e) {
+			LoggerFactory.getLogger(CachedDataSourceTest.class).warn("Test Failure", e);
+		}
+	}
+
+	@Test
+	public void testGettersForJdbcDBCachedDataSource() {
+
+		assertEquals("jdbc:mysql://dbhost:3306/test", ((JdbcDBCachedDataSource) ds).getDbUrl());
+		assertEquals("dbuser", ((JdbcDBCachedDataSource) ds).getDbUserId());
+		assertEquals("passw0rd", ((JdbcDBCachedDataSource) ds).getDbPasswd());
+		assertEquals("testdb01", ((JdbcDBCachedDataSource) ds).toString());
+	}
+
+	@Test
+	public void testIsInitialised() {
+		assertTrue(ds.isInitialized());
+	}
+
+	@Test
+	public void testIsWrapperFor() throws SQLException {
+		assertFalse(ds.isWrapperFor(CachedDataSource.class));
+	}
+
+	@Test
+	public void testGetSetNextErrorReportTime() throws SQLException {
+		ds.setNextErrorReportTime(1L);
+		assertEquals(1L, ds.getNextErrorReportTime());
+	}
+
+	@Test
+	public void testGetSetGlobalHostName() throws SQLException {
+		ds.setGlobalHostName("hostName");
+		assertEquals("hostName", ds.getGlobalHostName());
+	}
+}
\ No newline at end of file
diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DBConfigExceptionTest.java b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DBConfigExceptionTest.java
new file mode 100644
index 000000000..2a5b65c7a
--- /dev/null
+++ b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DBConfigExceptionTest.java
@@ -0,0 +1,19 @@
+package org.onap.ccsdk.sli.core.dblib;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class DBConfigExceptionTest {
+
+    @Test
+    public void testDBConfigExceptionException() {
+        assertNotNull(new DBConfigException("JUnit Test"));
+    }
+
+    @Test
+    public void testDBConfigExceptionString() {
+        assertNotNull(new DBConfigException(new Exception("JUnit Test")));
+    }
+
+}
diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationExceptionTest.java b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationExceptionTest.java
new file mode 100644
index 000000000..7becd1ae4
--- /dev/null
+++ b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationExceptionTest.java
@@ -0,0 +1,24 @@
+package org.onap.ccsdk.sli.core.dblib;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class DblibConfigurationExceptionTest {
+
+    @Test
+    public void testDblibConfigurationException() {
+        assertNotNull(new DblibConfigurationException());
+    }
+
+    @Test
+    public void testDblibConfigurationExceptionString() {
+        assertNotNull(new DblibConfigurationException("JUnit Test"));
+    }
+
+    @Test
+    public void testDblibConfigurationExceptionStringThrowable() {
+        assertNotNull(new DblibConfigurationException("JUnit Test", new Exception("JUnit Test")));
+    }
+
+}
diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsExceptionTest.java b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsExceptionTest.java
new file mode 100644
index 000000000..2fdacb922
--- /dev/null
+++ b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsExceptionTest.java
@@ -0,0 +1,16 @@
+package org.onap.ccsdk.sli.core.dblib;
+
+import static org.junit.Assert.*;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class NoAvailableConnectionsExceptionTest {
+
+    @Test
+    public void testNoAvailableConnectionsException() {
+        assertNotNull(new NoAvailableConnectionsException(new Exception("test")));
+    }
+
+}
diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSourceTest.java b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSourceTest.java
new file mode 100644
index 000000000..160a3d4ae
--- /dev/null
+++ b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSourceTest.java
@@ -0,0 +1,94 @@
+package org.onap.ccsdk.sli.core.dblib;
+
+import static org.junit.Assert.*;
+
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.onap.ccsdk.sli.core.dblib.config.BaseDBConfiguration;
+import org.onap.ccsdk.sli.core.dblib.config.JDBCConfiguration;
+import org.slf4j.LoggerFactory;
+
+public class TerminatingCachedDataSourceTest {
+
+    @Test
+    public void testTerminatingCachedDataSource() {
+        Properties props = new Properties();
+        BaseDBConfiguration config = new JDBCConfiguration(props);
+        CachedDataSource ds = new TerminatingCachedDataSource(config);
+        assertNotNull(ds);
+    }
+
+    @Test
+    public void testConfigure() {
+        Properties props = new Properties();
+        props.setProperty("org.onap.ccsdk.sli.dbtype", "jdbc");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.hosts", "localhost");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.url", "jdbc:mysql://dbhost:3306/test");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.driver", "org.mariadb.jdbc.Driver");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.database", "test");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.user", "dbuser");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.password", "passw0rd");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.connection.name", "testdb01");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.connection.timeout", "50");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.request.timeout", "100");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.limit.init", "10");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.limit.min", "10");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.limit.max", "20");
+        props.setProperty("org.onap.dblib.connection.recovery", "false");
+        BaseDBConfiguration config = new JDBCConfiguration(props);
+
+        CachedDataSource ds = new TerminatingCachedDataSource(config);
+        assertNull(ds.configure(config));
+    }
+
+    @Test
+    public void testSetInitialDelay() {
+        Properties props = new Properties();
+        BaseDBConfiguration config = new JDBCConfiguration(props);
+        CachedDataSource ds = new TerminatingCachedDataSource(config);
+        ds.setInitialDelay(1000L);
+        assertTrue(ds.getInitialDelay() == 1000L);
+    }
+
+    @Test
+    public void testSetInterval() {
+        Properties props = new Properties();
+        BaseDBConfiguration config = new JDBCConfiguration(props);
+        CachedDataSource ds = new TerminatingCachedDataSource(config);
+        ds.setInterval(1000L);
+        assertTrue(ds.getInterval() == 1000L);
+    }
+
+    @Test
+    public void testSetExpectedCompletionTime() {
+        Properties props = new Properties();
+        BaseDBConfiguration config = new JDBCConfiguration(props);
+        CachedDataSource ds = new TerminatingCachedDataSource(config);
+        ds.setExpectedCompletionTime(100L);
+        assertTrue(ds.getExpectedCompletionTime() == 100L);
+    }
+
+    @Test
+    public void testSetUnprocessedFailoverThreshold() {
+        Properties props = new Properties();
+        BaseDBConfiguration config = new JDBCConfiguration(props);
+        CachedDataSource ds = new TerminatingCachedDataSource(config);
+        ds.setUnprocessedFailoverThreshold(100L);
+        assertTrue(ds.getUnprocessedFailoverThreshold() == 100L);
+    }
+
+    @Test
+    public void testGetParentLogger() {
+        Properties props = new Properties();
+        BaseDBConfiguration config = new JDBCConfiguration(props);
+        CachedDataSource ds = new TerminatingCachedDataSource(config);
+        ds.setInterval(100L);
+        try {
+            assertNull(ds.getParentLogger());
+        } catch (SQLFeatureNotSupportedException e) {
+            LoggerFactory.getLogger(TerminatingCachedDataSourceTest.class).warn("Test Failure", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager.java b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager.java
new file mode 100644
index 000000000..8d7d34324
--- /dev/null
+++ b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager.java
@@ -0,0 +1,70 @@
+package org.onap.ccsdk.sli.core.dblib;
+
+import static org.junit.Assert.*;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import ch.vorburger.mariadb4j.DB;
+import ch.vorburger.mariadb4j.DBConfigurationBuilder;
+
+public class TestDBResourceManager {
+
+    DbLibService dblibSvc;
+    DBResourceManager dbm;
+
+    @Before
+    public void setUp() throws Exception {
+        URL propUrl = getClass().getResource("/dblib.properties");
+
+        InputStream propStr = getClass().getResourceAsStream("/dblib.properties");
+
+        Properties props = new Properties();
+
+        props.load(propStr);
+
+        // Start MariaDB4j database
+        DBConfigurationBuilder config = DBConfigurationBuilder.newBuilder();
+        config.setPort(0); // 0 => autom. detect free port
+        DB db = DB.newEmbeddedDB(config.build());
+        db.start();
+
+        // Override jdbc URL and database name
+        props.setProperty("org.onap.ccsdk.sli.jdbc.database", "test");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.url", config.getURL("test"));
+
+        dblibSvc = new DBResourceManager(props);
+        dbm = new DBResourceManager(props);
+        dblibSvc.writeData("CREATE TABLE DBLIB_TEST (name varchar(20));", null, null);
+        dblibSvc.getData("SELECT * FROM DBLIB_TEST", null, null);
+
+    }
+
+    @Test
+    public void testForceRecovery() {
+        dbm.testForceRecovery();
+    }
+
+    @Test
+    public void testGetConnection() throws SQLException {
+        assertNotNull(dbm.getConnection());
+        assertNotNull(dbm.getConnection("testUser", "testPaswd"));
+    }
+
+    @Test
+    public void testCleanup() {
+        dbm.cleanUp();
+
+    }
+
+    @Test
+    public void testGetLogWriter() throws SQLException {
+        assertNull(dbm.getLogWriter());
+    }
+
+}
diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager2.java b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager2.java
new file mode 100644
index 000000000..a3cb8d914
--- /dev/null
+++ b/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager2.java
@@ -0,0 +1,95 @@
+/*-
+   2  * ============LICENSE_START=======================================================
+   3  * ONAP CCSDK
+   4  * ================================================================================
+   5  * Copyright (C) 2019 AT&T Intellectual Property. All rights
+   6  *                             reserved.
+   7  * ================================================================================
+   8  * Licensed under the Apache License, Version 2.0 (the "License");
+   9  * you may not use this file except in compliance with the License.
+  10  * You may obtain a copy of the License at
+  11  *
+  12  * http://www.apache.org/licenses/LICENSE-2.0
+  13  *
+  14  * Unless required by applicable law or agreed to in writing, software
+  15  * distributed under the License is distributed on an "AS IS" BASIS,
+  16  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  17  * See the License for the specific language governing permissions and
+  18  * limitations under the License.
+  19  * ============LICENSE_END============================================
+  20  * ===================================================================
+  21  *
+  22  */
+package org.onap.ccsdk.sli.core.dblib;
+
+import static org.junit.Assert.*;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import ch.vorburger.mariadb4j.DB;
+import ch.vorburger.mariadb4j.DBConfigurationBuilder;
+
+public class TestDBResourceManager2 {
+
+    DbLibService dblibSvc;
+    DBResourceManager dbm;
+
+    @Before
+    public void setUp() throws Exception {
+        URL propUrl = getClass().getResource("/dblib.properties");
+
+        InputStream propStr = getClass().getResourceAsStream("/dblib.properties");
+
+        Properties props = new Properties();
+
+        props.load(propStr);
+
+        // Start MariaDB4j database
+        DBConfigurationBuilder config = DBConfigurationBuilder.newBuilder();
+        config.setPort(0); // 0 => autom. detect free port
+        DB db = DB.newEmbeddedDB(config.build());
+        db.start();
+
+        // Override jdbc URL, database name, and recovery
+        props.setProperty("org.onap.ccsdk.sli.jdbc.database", "test");
+        props.setProperty("org.onap.ccsdk.sli.jdbc.url", config.getURL("test"));
+        props.setProperty("org.onap.dblib.connection.recovery", "true");
+        
+
+        dblibSvc = new DBResourceManager(props);
+        dbm = new DBResourceManager(props);
+        dblibSvc.writeData("CREATE TABLE DBLIB_TEST2 (name varchar(20));", null, null);
+        dblibSvc.getData("SELECT * FROM DBLIB_TEST2", null, null);
+        
+
+    }
+
+    @Test
+    public void testForceRecovery() {
+        dbm.testForceRecovery();
+    }
+
+    @Test
+    public void testGetConnection() throws SQLException {
+        assertNotNull(dbm.getConnection());
+        assertNotNull(dbm.getConnection("testUser", "testPaswd"));
+    }
+
+    @Test
+    public void testCleanup() {
+        dbm.cleanUp();
+
+    }
+
+    @Test
+    public void testGetLogWriter() throws SQLException {
+        assertNull(dbm.getLogWriter());
+    }
+
+}
diff --git a/dblib/provider/src/test/resources/dblib.properties b/dblib/provider/src/test/resources/dblib.properties
new file mode 100644
index 000000000..9506ac8d1
--- /dev/null
+++ b/dblib/provider/src/test/resources/dblib.properties
@@ -0,0 +1,38 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# 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=========================================================
+###
+
+# dblib.properrties
+org.onap.ccsdk.sli.dbtype=jdbc
+
+org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01
+org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
+org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
+org.onap.ccsdk.sli.jdbc.database=sdnctl
+org.onap.ccsdk.sli.jdbc.user=sdnctl
+org.onap.ccsdk.sli.jdbc.password=gamma
+org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01
+org.onap.ccsdk.sli.jdbc.connection.timeout=50
+org.onap.ccsdk.sli.jdbc.request.timeout=100
+org.onap.ccsdk.sli.jdbc.limit.init=10
+org.onap.ccsdk.sli.jdbc.limit.min=10
+org.onap.ccsdk.sli.jdbc.limit.max=20
+org.onap.dblib.connection.recovery=false
+