diff --git a/build.gradle b/build.gradle index 98a82c7fc2..2da8daa2e8 100644 --- a/build.gradle +++ b/build.gradle @@ -162,6 +162,33 @@ allprojects { tasks.withType(Test) { // Prevent the project from creating temporary files outside of the build directory. systemProperties['java.io.tmpdir'] = buildDir + + // Ensures that "net.corda.testing.amqp.enable" is passed correctly from Gradle command line + // down to JVM executing unit test. It looks like we are running unit tests in the forked mode + // and all the "-D" parameters passed to Gradle not making it to unit test level + // TODO: Remove once we fully switched to AMQP + final AMQP_ENABLE_PROP_NAME = "net.corda.testing.amqp.enable" + systemProperty(AMQP_ENABLE_PROP_NAME, System.getProperty(AMQP_ENABLE_PROP_NAME)) + + // relational database provider to be used by node + final DATABASE_PROVIDER = "databaseProvider" + final DATASOURCE_URL = "dataSourceProperties.dataSource.url" + final DATASOURCE_CLASSNAME = "dataSourceProperties.dataSourceClassName" + final DATASOURCE_USER = "dataSourceProperties.dataSource.user" + final DATASOURCE_PASSWORD = "dataSourceProperties.dataSource.password" + + // integration testing database configuration (to be used in conjunction with a DATABASE_PROVIDER) + final TEST_DB_ADMIN_USER = "test.db.admin.user" + final TEST_DB_ADMIN_PASSWORD = "test.db.admin.password" + final TEST_DB_SCRIPT_DIR = "test.db.script.dir" + + [DATABASE_PROVIDER,DATASOURCE_URL, DATASOURCE_CLASSNAME, DATASOURCE_USER, DATASOURCE_PASSWORD, + TEST_DB_ADMIN_USER, TEST_DB_ADMIN_PASSWORD, TEST_DB_SCRIPT_DIR].forEach { + def property = System.getProperty(it) + if (property != null) { + systemProperty(it, property) + } + } } group 'com.r3.corda.enterprise'