From 6c4da2a3a082f1e554e9d53f3e902c70ea8d7e2d Mon Sep 17 00:00:00 2001
From: josecoll <jose.coll@r3cev.com>
Date: Wed, 2 May 2018 17:59:28 +0100
Subject: [PATCH] Added Java properties to configure location of Node
 configuration directories and JDBC driver jar.

---
 .../corda/behave/process/DBMigrationToolTests.kt | 11 ++++++-----
 .../corda/behave/process/DoormanCommandTests.kt  | 16 +++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DBMigrationToolTests.kt b/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DBMigrationToolTests.kt
index dc28323795..3d242ac613 100644
--- a/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DBMigrationToolTests.kt
+++ b/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DBMigrationToolTests.kt
@@ -1,11 +1,12 @@
 package net.corda.behave.process
 
-import net.corda.behave.file.currentDirectory
 import net.corda.behave.node.Distribution
+import net.corda.core.CordaRuntimeException
 import net.corda.core.internal.div
 import net.corda.core.utilities.minutes
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
+import java.nio.file.Paths
 
 class DBMigrationToolTests {
 
@@ -14,10 +15,10 @@ class DBMigrationToolTests {
      * http://docs.corda.r3.com/website/releases/docs_head/api-persistence.html#database-migration
      */
 
-    // TODO: use environment variables to specify build location & SQL driver to use
-    // Configure the following to point to valid Corda node configurations
-    private val nodeRunDir = currentDirectory / "build" / "runs" / "PartyA"
-    private val jdbcDriver = nodeRunDir / ".." / "libs" / "postgresql-42.1.4.jar"
+    // Set corresponding Java properties to point to valid Corda node configurations
+    // eg. -DNODE_DIR=<location of node configuration directory> -DJDBC_DRIVER=postgresql-42.1.4.jar
+    private val nodeRunDir = Paths.get(System.getProperty("NODE_DIR") ?: throw CordaRuntimeException("Please set NODE_DIR to point to valid Node configuration"))
+    private val jdbcDriver = nodeRunDir / ".." / "libs" / (System.getProperty("JDBC_DRIVER") ?: throw CordaRuntimeException("Please set JDBC_DRIVER to point to valid JDBC driver jar file located under $nodeRunDir\\..\\libs"))
 
     private val migrationToolMain = "com.r3.corda.dbmigration.DBMigration"
 
diff --git a/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt b/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt
index af74421bd0..9747f53416 100644
--- a/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt
+++ b/experimental/behave/src/smoke-test/kotlin/net/corda/behave/process/DoormanCommandTests.kt
@@ -3,10 +3,12 @@ package net.corda.behave.process
 import net.corda.behave.file.currentDirectory
 import net.corda.behave.file.doormanConfigDirectory
 import net.corda.behave.node.Distribution
+import net.corda.core.CordaRuntimeException
 import net.corda.core.internal.div
 import net.corda.core.utilities.minutes
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
+import java.nio.file.Paths
 
 class DoormanCommandTests {
 
@@ -16,12 +18,12 @@ class DoormanCommandTests {
      */
 
     private val source = doormanConfigDirectory
-    private val doormanRunDir = currentDirectory / "build/runs/doorman"
+    private val doormanRunDir = currentDirectory / "build" / "runs" / "doorman"
 
-    // TODO: use environment variables to specify build location & SQL driver to use
-    // Configure the following to point to valid Corda node configurations
-    private val notaryRunDir = currentDirectory / "build" / "runs" / "Notary"
-    private val participantRunDir = currentDirectory / "build" / "runs" / "PartyA"
+    // Set corresponding Java properties to point to valid Corda node configurations
+    // eg. -DNOTARY_NODE_DIR=<location of notary node configuration directory>
+    private val notaryRunDir = Paths.get(System.getProperty("NOTARY_NODE_DIR") ?: throw CordaRuntimeException("Please set NOTARY_NODE_DIR to point to valid Notary node configuration"))
+    private val nodeRunDir = Paths.get(System.getProperty("NODE_DIR") ?: throw CordaRuntimeException("Please set NODE_DIR to point to valid Node configuration"))
 
     @Test
     fun `step 1 - create key stores for local signer`() {
@@ -96,12 +98,12 @@ class DoormanCommandTests {
 
     @Test
     fun `step 8 - initial registration of network participant nodes`() {
-        println(participantRunDir)
+        println(nodeRunDir)
         val command = JarCommand(Distribution.R3_MASTER.cordaJar,
                 arrayOf("--initial-registration",
                         "--network-root-truststore", "../doorman/certificates/distribute-nodes/network-root-truststore.jks",
                         "--network-root-truststore-password", "password",
-                        "--base-directory", "$participantRunDir"),
+                        "--base-directory", "$nodeRunDir"),
                 doormanRunDir, 2.minutes)
         assertThat(command.run()).isEqualTo(0)
     }