diff --git a/node/src/integration-test/kotlin/net/corda/node/services/rpc/NodeHandleTests.kt b/node/src/integration-test/kotlin/net/corda/node/services/rpc/NodeHandleTests.kt index 77852b5f7a..c62d68d062 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/rpc/NodeHandleTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/rpc/NodeHandleTests.kt @@ -1,12 +1,27 @@ package net.corda.node.services.rpc import net.corda.core.utilities.getOrThrow +import net.corda.testing.core.ALICE_NAME +import net.corda.testing.core.BOB_NAME +import net.corda.testing.core.DUMMY_BANK_A_NAME +import net.corda.testing.core.DUMMY_NOTARY_NAME import net.corda.testing.driver.DriverParameters import net.corda.testing.driver.driver +import net.corda.testing.internal.IntegrationTest +import net.corda.testing.internal.IntegrationTestSchemas +import net.corda.testing.internal.toDatabaseSchemaName import org.assertj.core.api.Assertions.assertThatCode +import org.junit.ClassRule import org.junit.Test -class NodeHandleTests { +class NodeHandleTests : IntegrationTest() { + companion object { + @ClassRule + @JvmField + val databaseSchemas = IntegrationTestSchemas(ALICE_NAME.toDatabaseSchemaName(), BOB_NAME.toDatabaseSchemaName(), + DUMMY_BANK_A_NAME.toDatabaseSchemaName(), DUMMY_NOTARY_NAME.toDatabaseSchemaName()) + } + @Test fun object_defined_functions_are_static_for_node_rpc_ops() { driver(DriverParameters(startNodesInProcess = true)) { diff --git a/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-global-cleanup.sql b/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-global-cleanup.sql index 4876136006..4768e23834 100644 --- a/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-global-cleanup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-global-cleanup.sql @@ -67,6 +67,7 @@ DROP TABLE IF EXISTS ${schema}.network_map; DROP TABLE IF EXISTS ${schema}.parameters_update; DROP TABLE IF EXISTS ${schema}.network_parameters; DROP TABLE IF EXISTS ${schema}.private_network; +DROP TABLE IF EXISTS ${schema}.foos; DROP SEQUENCE IF EXISTS ${schema}.hibernate_sequence; DROP USER IF EXISTS ${schema}; DROP SCHEMA IF EXISTS ${schema}; \ No newline at end of file diff --git a/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-setup.sql b/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-setup.sql index fc58d19b9e..ca8035d827 100644 --- a/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-setup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/azure-sql/db-setup.sql @@ -67,4 +67,5 @@ DROP TABLE IF EXISTS ${schema}.network_map; DROP TABLE IF EXISTS ${schema}.parameters_update; DROP TABLE IF EXISTS ${schema}.network_parameters; DROP TABLE IF EXISTS ${schema}.private_network; +DROP TABLE IF EXISTS ${schema}.foos; DROP SEQUENCE IF EXISTS ${schema}.hibernate_sequence; \ No newline at end of file diff --git a/testing/test-utils/src/main/resources/database-scripts/oracle/db-cleanup.sql b/testing/test-utils/src/main/resources/database-scripts/oracle/db-cleanup.sql index 77d9286487..1ed7830483 100644 --- a/testing/test-utils/src/main/resources/database-scripts/oracle/db-cleanup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/oracle/db-cleanup.sql @@ -67,4 +67,5 @@ DROP TABLE ${schema}.network_map CASCADE CONSTRAINTS DROP TABLE ${schema}.parameters_update CASCADE CONSTRAINTS DROP TABLE ${schema}.network_parameters CASCADE CONSTRAINTS DROP TABLE ${schema}.private_network CASCADE CONSTRAINTS +DROP TABLE ${schema}.foos CASCADE CONSTRAINTS DROP SEQUENCE ${schema}.hibernate_sequence \ No newline at end of file diff --git a/testing/test-utils/src/main/resources/database-scripts/oracle/db-setup.sql b/testing/test-utils/src/main/resources/database-scripts/oracle/db-setup.sql index 4f25148ff1..43875f3c58 100644 --- a/testing/test-utils/src/main/resources/database-scripts/oracle/db-setup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/oracle/db-setup.sql @@ -67,4 +67,5 @@ DROP TABLE ${schema}.network_map CASCADE CONSTRAINTS DROP TABLE ${schema}.parameters_update CASCADE CONSTRAINTS DROP TABLE ${schema}.network_parameters CASCADE CONSTRAINTS DROP TABLE ${schema}.private_network CASCADE CONSTRAINTS +DROP TABLE ${schema}.foos CASCADE CONSTRAINTS DROP SEQUENCE ${schema}.hibernate_sequence \ No newline at end of file diff --git a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-cleanup.sql b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-cleanup.sql index fc46a9de15..02c073fc80 100644 --- a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-cleanup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-cleanup.sql @@ -67,6 +67,7 @@ DROP TABLE IF EXISTS ${schema}.network_map; DROP TABLE IF EXISTS ${schema}.parameters_update; DROP TABLE IF EXISTS ${schema}.network_parameters; DROP TABLE IF EXISTS ${schema}.private_network; +DROP TABLE IF EXISTS ${schema}.foos; DROP SEQUENCE IF EXISTS ${schema}.hibernate_sequence; DROP USER IF EXISTS ${schema}; DROP LOGIN ${schema}; diff --git a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-setup.sql b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-setup.sql index 19e1217977..6dfad8c1a7 100644 --- a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-setup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-global-setup.sql @@ -67,6 +67,7 @@ DROP TABLE IF EXISTS ${schema}.network_map; DROP TABLE IF EXISTS ${schema}.parameters_update; DROP TABLE IF EXISTS ${schema}.network_parameters; DROP TABLE IF EXISTS ${schema}.private_network; +DROP TABLE IF EXISTS ${schema}.foos; DROP SEQUENCE IF EXISTS ${schema}.hibernate_sequence; DROP USER IF EXISTS ${schema}; DROP SCHEMA IF EXISTS ${schema}; diff --git a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-setup.sql b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-setup.sql index fa4aa4ab95..c7c172217b 100644 --- a/testing/test-utils/src/main/resources/database-scripts/sql-server/db-setup.sql +++ b/testing/test-utils/src/main/resources/database-scripts/sql-server/db-setup.sql @@ -67,6 +67,7 @@ DROP TABLE IF EXISTS ${schema}.network_map; DROP TABLE IF EXISTS ${schema}.parameters_update; DROP TABLE IF EXISTS ${schema}.network_parameters; DROP TABLE IF EXISTS ${schema}.private_network; +DROP TABLE IF EXISTS ${schema}.foos; DROP SEQUENCE IF EXISTS ${schema}.hibernate_sequence; IF NOT EXISTS (SELECT schema_name FROM information_schema.schemata WHERE schema_name = '${schema}') EXEC('CREATE SCHEMA ${schema}'); IF NOT EXISTS (SELECT * FROM sys.sysusers WHERE name='${schema}') CREATE USER ${schema} FOR LOGIN ${schema} WITH DEFAULT_SCHEMA = ${schema};