Use oparent-odlparent in sli/core

Update sli/core to use oparent-odlparent.  To prevent verify builds from
failing due to unit test errors, also changed unit tests that require
database access to use MariaDB4j to start up a local MariaDB database.

Change-Id: I928b7e1e83bdb328ca9e0785c8b81f67f982eeda
Issue-ID: CCSDK-43
Signed-off-by: Dan Timoney <dtimoney@att.com>

1 files changed, 48 insertions, 52 deletions

diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java
index 5e895aa3..cdf837af 100644
--- a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java
@@ -8,9 +8,9 @@
  * 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.
@@ -31,43 +31,22 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Properties;
 
-import org.onap.ccsdk.sli.core.sli.MetricLogger;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
-import org.onap.ccsdk.sli.core.sli.SvcLogicNode;
 import org.onap.ccsdk.sli.core.sli.SvcLogicParser;
 import org.onap.ccsdk.sli.core.sli.SvcLogicStore;
 import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory;
-import org.onap.ccsdk.sli.core.sli.provider.BlockNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.CallNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.ConfigureNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.DeleteNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.ExistsNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.ForNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.GetResourceNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.IsAvailableNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.NotifyNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.RecordNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.ReleaseNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.ReserveNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.ReturnNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.SaveNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.SetNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.SvcLogicNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.SvcLogicServiceImpl;
-import org.onap.ccsdk.sli.core.sli.provider.SwitchNodeExecutor;
-import org.onap.ccsdk.sli.core.sli.provider.UpdateNodeExecutor;
-import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import ch.vorburger.mariadb4j.DB;
+import ch.vorburger.mariadb4j.DBConfigurationBuilder;
 import junit.framework.TestCase;
 
 public class ITCaseSvcLogicGraphExecutor extends TestCase {
 	private static final Logger LOG = LoggerFactory
 			.getLogger(SvcLogicGraph.class);
-	
+
 	private static final Map<String, SvcLogicNodeExecutor> BUILTIN_NODES = new HashMap<String, SvcLogicNodeExecutor>() {
 		{
 			put("block", new BlockNodeExecutor());
@@ -91,19 +70,36 @@ public class ITCaseSvcLogicGraphExecutor extends TestCase {
 
 		}
 	};
-	
+
 	public void testExecute() {
-		
+
 		try {
 			InputStream testStr = getClass().getResourceAsStream("/executor.tests");
 			BufferedReader testsReader = new BufferedReader(new InputStreamReader(testStr));
-			
+
 			InputStream propStr = getClass().getResourceAsStream("/svclogic.properties");
-			
-			SvcLogicStore store = SvcLogicStoreFactory.getSvcLogicStore(propStr);
-			
+
+			Properties svcprops = new Properties();
+			svcprops.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
+	        svcprops.setProperty("org.onap.ccsdk.sli.jdbc.database", "test");
+			svcprops.setProperty("org.onap.ccsdk.sli.jdbc.url", config.getURL("test"));
+
+
+
+			SvcLogicStore store = SvcLogicStoreFactory.getSvcLogicStore(svcprops);
+
 			assertNotNull(store);
-			
+
 			store.registerNodeType("switch");
 			store.registerNodeType("block");
 			store.registerNodeType("get-resource");
@@ -118,26 +114,26 @@ public class ITCaseSvcLogicGraphExecutor extends TestCase {
 			store.registerNodeType("for");
 			store.registerNodeType("set");
 			SvcLogicParser parser = new SvcLogicParser(store);
-			
+
 			// Loop through executor tests
 
 			SvcLogicServiceImpl svc = new SvcLogicServiceImpl();
-			
+
 			for (String nodeType : BUILTIN_NODES.keySet()) {
 
 				LOG.info("SLI - registering node executor for node type "+nodeType);
-				
+
 				svc.registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
 
 			}
 			String testCaseLine = null;
 			while ((testCaseLine = testsReader.readLine()) != null) {
-				
+
 				String[] testCaseFields = testCaseLine.split(":");
 				String testCaseFile = testCaseFields[0];
 				String testCaseMethod = testCaseFields[1];
 				String testCaseParameters = null;
-				
+
 				if (testCaseFields.length > 2) {
 					testCaseParameters = testCaseFields[2];
 				}
@@ -145,7 +141,7 @@ public class ITCaseSvcLogicGraphExecutor extends TestCase {
 				SvcLogicContext ctx = new SvcLogicContext();
 				if (testCaseParameters != null) {
 					String[] testCaseParameterSettings = testCaseParameters.split(",");
-					
+
 					for (int i = 0 ; i < testCaseParameterSettings.length ; i++) {
 						String[] nameValue = testCaseParameterSettings[i].split("=");
 						if (nameValue != null) {
@@ -154,14 +150,14 @@ public class ITCaseSvcLogicGraphExecutor extends TestCase {
 							if (nameValue.length > 1) {
 								value = nameValue[1];
 							}
-							
+
 							ctx.setAttribute(name,  value);
 						}
 					}
 				}
-				
+
 				testCaseFile = testCaseFile.trim();
-				
+
 				if (testCaseFile.length() > 0) {
 					if (!testCaseFile.startsWith("/")) {
 						testCaseFile = "/"+testCaseFile;
@@ -170,12 +166,12 @@ public class ITCaseSvcLogicGraphExecutor extends TestCase {
 					if (testCaseUrl == null) {
 						fail("Could not resolve test case file "+testCaseFile);
 					}
-					
+
 					LinkedList<SvcLogicGraph> graphs = parser.parse(testCaseUrl.getPath());
-					
+
 
 					assertNotNull(graphs);
-					
+
 					for (SvcLogicGraph graph: graphs) {
 						if (graph.getRpc().equals(testCaseMethod)) {
 							Properties props = ctx.toProperties();
@@ -184,9 +180,9 @@ public class ITCaseSvcLogicGraphExecutor extends TestCase {
 								String propName = (String) e1.nextElement();
 								LOG.info(propName+" = "+props.getProperty(propName));
 							}
-							
+
 							svc.execute(graph, ctx);
-							
+
 							props = ctx.toProperties();
 							LOG.info("SvcLogicContext after executing "+testCaseMethod+":");
 							for (Enumeration e2 = props.propertyNames(); e2.hasMoreElements() ; ) {
@@ -197,16 +193,16 @@ public class ITCaseSvcLogicGraphExecutor extends TestCase {
 					}
 
 				}
-				
-				
+
+
 			}
-			
-			
+
+
 		} catch (Exception e) {
 			LOG.error("Caught exception executing directed graphs", e);
 			fail("Exception executing graphs");
 		}
 	}
 
-	
+
 }