Make unit tests delete graphs when done

sparqlGraphLibrary/src/test/java/com/ge/research/semtk/api/nodeGroupExecution/client/test/NodeGroupExecutionClientTest_IT.java

@@ -51,7 +51,6 @@
 import java.math.BigInteger;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.UUID;
 
@@ -80,6 +79,7 @@ public static void setup() throws Exception {
 
 		@AfterClass
 	    public static void teardown() throws Exception {
+			IntegrationTestUtility.clearGraph(resultSei);
 	        // delete stored nodegroup when done with all tests
 			nodeGroupStoreClient.deleteStoredNodeGroupIfExists(ID);
 	    } 

sparqlGraphLibrary/src/test/java/com/ge/research/semtk/fdccache/test/FdcCacheSpecRunnerTest_IT.java

@@ -18,8 +18,8 @@
 package com.ge.research.semtk.fdccache.test;
 
 import static org.junit.Assert.*;
-import static org.junit.Assume.assumeTrue;
 
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -28,13 +28,15 @@
 import com.ge.research.semtk.load.utility.SparqlGraphJson;
 import com.ge.research.semtk.resultSet.Table;
 import com.ge.research.semtk.sparqlX.SparqlConnection;
+import com.ge.research.semtk.sparqlX.SparqlEndpointInterface;
 import com.ge.research.semtk.test.IntegrationTestUtility;
 import com.ge.research.semtk.test.TestGraph;
 import com.ge.research.semtk.utility.Utility;
 
 public class FdcCacheSpecRunnerTest_IT {
 	private final static String CREATOR = "Junit CacheSpecRunnerTest_IT.java";
 	private static SparqlConnection cacheConn = null;
+	private static SparqlEndpointInterface cacheSei;
 
 	@BeforeClass
 	public static void setup() throws Exception {
@@ -56,10 +58,16 @@ public static void setup() throws Exception {
 		// create a connection for caching:  TestGraph stuff and model in model[0].  Cache in data[0].
 		cacheConn = SparqlConnection.deepCopy(TestGraph.getSparqlConn());
 		cacheConn.clearDataInterfaces();
-		cacheConn.addDataInterface(TestGraph.getSei(TestGraph.generateGraphName("cache")));
+		cacheSei = TestGraph.getSei(TestGraph.generateGraphName("cache"));
+		cacheConn.addDataInterface(cacheSei);
 		cacheConn.getDataInterface(0).clearGraph();
 	}
 
+	@AfterClass
+	public static void cleanup() throws Exception {
+		IntegrationTestUtility.clearGraph(cacheSei);
+	}
+
 	@Test
 	public void testSimple() throws Exception {
 		cacheConn.getDataInterface(0).clearGraph();

sparqlGraphLibrary/src/test/java/com/ge/research/semtk/load/client/test/IngestorRestClientTest_IT.java

@@ -24,6 +24,7 @@
 import java.nio.file.Paths;
 
 import org.json.simple.*;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -32,13 +33,11 @@
 import com.ge.research.semtk.load.utility.SparqlGraphJson;
 import com.ge.research.semtk.test.IntegrationTestUtility;
 import com.ge.research.semtk.test.TestGraph;
-import com.ge.research.semtk.utility.Utility;
 import com.ge.research.semtk.resultSet.Table;
 import com.ge.research.semtk.sparqlX.SparqlConnection;
 import com.ge.research.semtk.sparqlX.SparqlEndpointInterface;
 import com.ge.research.semtk.sparqlX.SparqlResultTypes;
 import com.ge.research.semtk.sparqlX.SparqlToXUtils;
-import com.ge.research.semtk.sparqlX.VirtuosoSparqlEndpointInterface;
 import com.ge.research.semtk.resultSet.TableResultSet;
 
 
@@ -49,6 +48,8 @@ public class IngestorRestClientTest_IT {
 
 	private static SparqlGraphJson sgJson_TestGraph;
 	private static String sgJsonString_TestGraph;
+
+	private static String otherDataset;
 
 	@BeforeClass
 	public static void setup() throws Exception {
@@ -61,6 +62,11 @@ public static void setup() throws Exception {
 		sgJson_TestGraph = TestGraph.getSparqlGraphJsonFromFile("src/test/resources/testTransforms.json");
 		sgJsonString_TestGraph = sgJson_TestGraph.getJson().toJSONString();   // template as a string
 	}
+
+	@AfterClass
+	public static void cleanup() throws Exception {
+		IntegrationTestUtility.clearGraph(TestGraph.getSei(otherDataset));
+	}
 
 
 	/**
@@ -92,7 +98,7 @@ public void testIngestWithConnectionOverride() throws Exception{
 		JSONObject sparqlConnJson = sgJson_TestGraph.getSparqlConn().toJson();  // original TestGraph sparql conn 
 
 		SparqlConnection sparqlConnectionOverride = new SparqlConnection(sparqlConnJson.toJSONString()); // get the connection object
-		String otherDataset = sparqlConnectionOverride.getDefaultQueryInterface().getGraph() + "OTHER";
+		otherDataset = sparqlConnectionOverride.getDefaultQueryInterface().getGraph() + "OTHER";
 		sparqlConnectionOverride.getDataInterface(0).setGraph(otherDataset);
 		sparqlConnectionOverride.getModelInterface(0).setGraph(otherDataset);
 

sparqlGraphLibrary/src/test/java/com/ge/research/semtk/load/test/DataLoaderTest_IT.java

@@ -37,7 +37,6 @@
 import java.util.Hashtable;
 import java.util.List;
 
-import com.ge.research.semtk.api.nodeGroupExecution.client.NodeGroupExecutionClient;
 import com.ge.research.semtk.belmont.AutoGeneratedQueryTypes;
 import com.ge.research.semtk.belmont.Node;
 import com.ge.research.semtk.belmont.NodeGroup;
@@ -52,12 +51,10 @@
 import com.ge.research.semtk.load.utility.SparqlGraphJson;
 import com.ge.research.semtk.load.utility.UriResolver;
 import com.ge.research.semtk.ontologyTools.OntologyInfo;
-import com.ge.research.semtk.ontologyTools.PredicateStats;
 import com.ge.research.semtk.resultSet.SimpleResultSet;
 import com.ge.research.semtk.resultSet.Table;
 import com.ge.research.semtk.sparqlX.SparqlConnection;
 import com.ge.research.semtk.sparqlX.SparqlEndpointInterface;
-import com.ge.research.semtk.sparqlX.client.SparqlQueryClient;
 import com.ge.research.semtk.sparqlX.dispatch.client.DispatchRestClient;
 import com.ge.research.semtk.test.IntegrationTestUtility;
 import com.ge.research.semtk.test.TestGraph;
@@ -86,6 +83,7 @@ public static void shutdown() throws Exception {
 			System.out.println(s);
 		}
 	}
+
 	@Test
 	public void testOriginal() throws Exception {
 		Dataset ds = new CSVDataset("src/test/resources/testTransforms.csv", false);
@@ -1398,6 +1396,7 @@ public void testLoadLookXNodesTwoConn() throws Exception {
 		doLoadLookXNodesTwoConn(true);
 		doLoadLookXNodesTwoConn(false);
 	}
+
 	public void doLoadLookXNodesTwoConn(boolean cacheFlag) throws Exception {
 		// Repeat testLoadLookXNodes() with an extra data connection graph
 		// ingest into a different graph
@@ -1443,6 +1442,9 @@ public void doLoadLookXNodesTwoConn(boolean cacheFlag) throws Exception {
 		sgJson.setSparqlConn(TestGraph.getSparqlConn());
 		query = TestGraph.getNodeGroupWithOInfo(sgJson).generateSparqlSelect();
 		IntegrationTestUtility.querySeiAndCheckResults(query, seiBoth, this, "/loadTestDuraBatteryFirst4Results.csv");
+
+		IntegrationTestUtility.clearGraph(seiBoth);
+		IntegrationTestUtility.clearGraph(seiData0);
 	}
 
 	@Test

sparqlGraphLibrary/src/test/java/com/ge/research/semtk/ontologyTools/test/PathExplorerTest_IT.java

@@ -27,11 +27,9 @@
 
 import com.ge.research.semtk.belmont.Node;
 import com.ge.research.semtk.belmont.NodeGroup;
-import com.ge.research.semtk.ontologyTools.ClassInstance;
 import com.ge.research.semtk.ontologyTools.OntologyInfo;
 import com.ge.research.semtk.ontologyTools.PathExplorer;
 import com.ge.research.semtk.ontologyTools.PathItemRequest;
-import com.ge.research.semtk.ontologyTools.ReturnRequest;
 import com.ge.research.semtk.resultSet.Table;
 import com.ge.research.semtk.sparqlX.SparqlConnection;
 import com.ge.research.semtk.sparqlX.SparqlEndpointInterface;
@@ -42,7 +40,8 @@ public class PathExplorerTest_IT {
 	private static SparqlConnection conn = null;
 	private static OntologyInfo oInfo = null;
 	private static PathExplorer explorer = null;
-
+	private static SparqlEndpointInterface cacheSei;
+
 	@BeforeClass
 	public static void setup() throws Exception {
 
@@ -53,13 +52,17 @@ public static void setup() throws Exception {
 
 		// create a nodegroup cache graph based on the jUnit test graph name
 		String cacheName = TestGraph.generateGraphName("ngCache");
-		SparqlEndpointInterface cacheSei = TestGraph.getSei(cacheName);
+		cacheSei = TestGraph.getSei(cacheName);
 		cacheSei.clearGraph();
 
 		explorer = new PathExplorer(oInfo, conn, IntegrationTestUtility.getNodeGroupExecutionRestClient(), cacheSei);
 
 	}
 
+	@AfterClass
+	public static void cleanup() throws Exception {
+		IntegrationTestUtility.clearGraph(cacheSei);
+	}
 
 	@Test
 	public void addClassAirportToAircraft() throws Exception {