fix #277-modify GraphSPARQLExampleTest so it can pass an appClient and adminClient so GraphSPARQLExample connects to the unit tests db when run as a unit test

Author: sammefford

src/main/java/com/marklogic/client/example/extension/GraphSPARQLExample.java

@@ -33,21 +33,27 @@ public class GraphSPARQLExample {
 	public static void main(String... args) throws IOException {
 		ExampleProperties props = Util.loadProperties();
 
-		installExtensions(props);
-
 		DatabaseClient appClient = DatabaseClientFactory.newClient(
 				props.host, props.port,
 				props.writerUser, props.writerPassword, props.authType);
+		DatabaseClient adminClient = DatabaseClientFactory.newClient(
+				props.host, props.port,
+				props.adminUser, props.adminPassword, props.authType);
+		run(appClient, adminClient);
+		appClient.release();
+		adminClient.release();
+	}
+
+	public static void run(DatabaseClient appClient, DatabaseClient adminClient) throws IOException {
+		installExtensions(adminClient);
 
 		insertGraph(appClient);
 
 		runQuery(appClient);
 
 		deleteGraph(appClient);
 
-		appClient.release();
-
-		uninstallExtensions(props);
+		uninstallExtensions(adminClient);
 	}
 	public static void runQuery(DatabaseClient appClient) throws IOException {
 		SPARQLManager sparqlMgr = new SPARQLManager(appClient);
@@ -92,33 +98,21 @@ public static void deleteGraph(DatabaseClient appClient) throws IOException {
 
 		System.out.println("deleted graph");
 	}
-	public static void installExtensions(ExampleProperties props) throws IOException {
-		DatabaseClient adminClient = DatabaseClientFactory.newClient(
-				props.host, props.port,
-				props.adminUser, props.adminPassword, props.authType);
-
+	public static void installExtensions(DatabaseClient adminClient) throws IOException {
 		System.out.println("installing extensions");
 
 		GraphManager.install(adminClient);
 		SPARQLManager.install(adminClient);
 
 		System.out.println("installed extensions");
-
-		adminClient.release();
 	}
-	public static void uninstallExtensions(ExampleProperties props) throws IOException {
-		DatabaseClient adminClient = DatabaseClientFactory.newClient(
-				props.host, props.port,
-				props.adminUser, props.adminPassword, props.authType);
-
+	public static void uninstallExtensions(DatabaseClient adminClient) throws IOException {
 		System.out.println("uninstalling extensions");
 
 		GraphManager.uninstall(adminClient);
 		SPARQLManager.uninstall(adminClient);
 
 		System.out.println("uninstalled extensions");
-
-		adminClient.release();
 	}
 }
 

src/test/java/com/marklogic/client/test/example/extension/GraphSPARQLExampleTest.java

@@ -6,6 +6,7 @@
 
 import org.junit.Test;
 
+import com.marklogic.client.test.Common;
 import com.marklogic.client.example.extension.GraphSPARQLExample;
 
 public class GraphSPARQLExampleTest {
@@ -17,7 +18,7 @@ public void testMain() {
 
 		boolean succeeded = false;
 		try {
-			GraphSPARQLExample.main(new String[0]);
+			GraphSPARQLExample.run(Common.newClient(), Common.newAdminClient());
 			succeeded = true;
 		} catch (IOException e) {
 			e.printStackTrace();