From 98a12c92d54fc0f0c68cd071aac20b8b7da7d6d3 Mon Sep 17 00:00:00 2001
From: szymonsztuka <szymon.sztuka@yahoo.com>
Date: Mon, 8 Jan 2018 11:14:57 +0000
Subject: [PATCH] Fix database integration tests after OS->Ent merge (#295)

* Add more db schemas to NodeRegistrationTest
* Add tables to drop
---
 .../kotlin/net/corda/node/NodeKeystoreCheckTest.kt            | 3 ++-
 .../corda/node/utilities/registration/NodeRegistrationTest.kt | 2 +-
 .../database-scripts/azure-sql/db-global-cleanup.sql          | 2 ++
 .../main/resources/database-scripts/azure-sql/db-setup.sql    | 2 ++
 .../sql-server-no-default-schema/db-global-cleanup.sql        | 2 ++
 .../sql-server-no-default-schema/db-setup.sql                 | 2 ++
 .../database-scripts/sql-server/db-global-cleanup.sql         | 4 +++-
 .../main/resources/database-scripts/sql-server/db-setup.sql   | 4 +++-
 8 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt b/node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
index 25e41028ad..dc891392cf 100644
--- a/node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
@@ -7,6 +7,7 @@ import net.corda.node.services.config.configureDevKeyAndTrustStores
 import net.corda.nodeapi.internal.config.SSLConfiguration
 import net.corda.nodeapi.internal.crypto.*
 import net.corda.testing.ALICE_NAME
+import net.corda.testing.DUMMY_NOTARY_NAME
 import net.corda.testing.internal.IntegrationTest
 import net.corda.testing.internal.IntegrationTestSchemas
 import net.corda.testing.driver.driver
@@ -20,7 +21,7 @@ import javax.security.auth.x500.X500Principal
 class NodeKeystoreCheckTest : IntegrationTest() {
     companion object {
         @ClassRule @JvmField
-        val databaseSchemas = IntegrationTestSchemas(ALICE_NAME.toDatabaseSchemaName())
+        val databaseSchemas = IntegrationTestSchemas(ALICE_NAME.toDatabaseSchemaName(), DUMMY_NOTARY_NAME.toDatabaseSchemaName())
     }
 
     @Test
diff --git a/node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt b/node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
index 7ac559b8d3..10aa20ccb5 100644
--- a/node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
@@ -49,7 +49,7 @@ import javax.ws.rs.core.Response
 class NodeRegistrationTest : IntegrationTest() {
     companion object {
         @ClassRule @JvmField
-        val databaseSchemas = IntegrationTestSchemas("Alice")
+        val databaseSchemas = IntegrationTestSchemas("NotaryService", "Alice", "Genevieve")
 
         private val notaryName = CordaX500Name("NotaryService", "Zurich", "CH")
         private val aliceName = CordaX500Name("Alice", "London", "GB")
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 55ec8a0593..c3fb09ac33 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
@@ -29,10 +29,12 @@ DROP TABLE IF EXISTS ${schema}.node_named_identities;
 DROP TABLE IF EXISTS ${schema}.children;
 DROP TABLE IF EXISTS ${schema}.parents;
 DROP TABLE IF EXISTS ${schema}.contract_cash_states;
+DROP TABLE IF EXISTS ${schema}.contract_cash_states_v1;
 DROP TABLE IF EXISTS ${schema}.messages;
 DROP TABLE IF EXISTS ${schema}.state_participants;
 DROP TABLE IF EXISTS ${schema}.cash_states_v2;
 DROP TABLE IF EXISTS ${schema}.cash_states_v3;
+DROP TABLE IF EXISTS ${schema}.cp_states_v1;
 DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
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 9357df9527..74fe7c442a 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
@@ -29,10 +29,12 @@ DROP TABLE IF EXISTS ${schema}.node_named_identities;
 DROP TABLE IF EXISTS ${schema}.children;
 DROP TABLE IF EXISTS ${schema}.parents;
 DROP TABLE IF EXISTS ${schema}.contract_cash_states;
+DROP TABLE IF EXISTS ${schema}.contract_cash_states_v1;
 DROP TABLE IF EXISTS ${schema}.messages;
 DROP TABLE IF EXISTS ${schema}.state_participants;
 DROP TABLE IF EXISTS ${schema}.cash_states_v2;
 DROP TABLE IF EXISTS ${schema}.cash_states_v3;
+DROP TABLE IF EXISTS ${schema}.cp_states_v1;
 DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
diff --git a/testing/test-utils/src/main/resources/database-scripts/sql-server-no-default-schema/db-global-cleanup.sql b/testing/test-utils/src/main/resources/database-scripts/sql-server-no-default-schema/db-global-cleanup.sql
index 0e733933d7..7388081af4 100644
--- a/testing/test-utils/src/main/resources/database-scripts/sql-server-no-default-schema/db-global-cleanup.sql
+++ b/testing/test-utils/src/main/resources/database-scripts/sql-server-no-default-schema/db-global-cleanup.sql
@@ -29,10 +29,12 @@ DROP TABLE IF EXISTS ${schema}.node_named_identities;
 DROP TABLE IF EXISTS ${schema}.children;
 DROP TABLE IF EXISTS ${schema}.parents;
 DROP TABLE IF EXISTS ${schema}.contract_cash_states;
+DROP TABLE IF EXISTS ${schema}.contract_cash_states_v1;
 DROP TABLE IF EXISTS ${schema}.messages;
 DROP TABLE IF EXISTS ${schema}.state_participants;
 DROP TABLE IF EXISTS ${schema}.cash_states_v2;
 DROP TABLE IF EXISTS ${schema}.cash_states_v3;
+DROP TABLE IF EXISTS ${schema}.cp_states_v1;
 DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
diff --git a/testing/test-utils/src/main/resources/database-scripts/sql-server-no-default-schema/db-setup.sql b/testing/test-utils/src/main/resources/database-scripts/sql-server-no-default-schema/db-setup.sql
index 9357df9527..74fe7c442a 100644
--- a/testing/test-utils/src/main/resources/database-scripts/sql-server-no-default-schema/db-setup.sql
+++ b/testing/test-utils/src/main/resources/database-scripts/sql-server-no-default-schema/db-setup.sql
@@ -29,10 +29,12 @@ DROP TABLE IF EXISTS ${schema}.node_named_identities;
 DROP TABLE IF EXISTS ${schema}.children;
 DROP TABLE IF EXISTS ${schema}.parents;
 DROP TABLE IF EXISTS ${schema}.contract_cash_states;
+DROP TABLE IF EXISTS ${schema}.contract_cash_states_v1;
 DROP TABLE IF EXISTS ${schema}.messages;
 DROP TABLE IF EXISTS ${schema}.state_participants;
 DROP TABLE IF EXISTS ${schema}.cash_states_v2;
 DROP TABLE IF EXISTS ${schema}.cash_states_v3;
+DROP TABLE IF EXISTS ${schema}.cp_states_v1;
 DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
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 2faae150ee..6245118de0 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
@@ -29,18 +29,20 @@ DROP TABLE IF EXISTS ${schema}.node_named_identities;
 DROP TABLE IF EXISTS ${schema}.children;
 DROP TABLE IF EXISTS ${schema}.parents;
 DROP TABLE IF EXISTS ${schema}.contract_cash_states;
+DROP TABLE IF EXISTS ${schema}.contract_cash_states_v1;
 DROP TABLE IF EXISTS ${schema}.messages;
 DROP TABLE IF EXISTS ${schema}.state_participants;
 DROP TABLE IF EXISTS ${schema}.cash_states_v2;
 DROP TABLE IF EXISTS ${schema}.cash_states_v3;
+DROP TABLE IF EXISTS ${schema}.cp_states_v1;
 DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2;
 DROP TABLE IF EXISTS ${schema}.node_mutual_exclusion;
-DROP SEQUENCE IF EXISTS ${schema}.hibernate_sequence;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOG;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOGLOCK;
+DROP SEQUENCE IF EXISTS ${schema}.hibernate_sequence;
 DROP USER IF EXISTS ${schema};
 DROP LOGIN ${schema};
 DROP SCHEMA IF EXISTS ${schema};
\ No newline at end of file
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 da348a5a87..69e8b477bd 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
@@ -29,18 +29,20 @@ DROP TABLE IF EXISTS ${schema}.node_named_identities;
 DROP TABLE IF EXISTS ${schema}.children;
 DROP TABLE IF EXISTS ${schema}.parents;
 DROP TABLE IF EXISTS ${schema}.contract_cash_states;
+DROP TABLE IF EXISTS ${schema}.contract_cash_states_v1;
 DROP TABLE IF EXISTS ${schema}.messages;
 DROP TABLE IF EXISTS ${schema}.state_participants;
 DROP TABLE IF EXISTS ${schema}.cash_states_v2;
 DROP TABLE IF EXISTS ${schema}.cash_states_v3;
+DROP TABLE IF EXISTS ${schema}.cp_states_v1;
 DROP TABLE IF EXISTS ${schema}.cp_states_v2;
 DROP TABLE IF EXISTS ${schema}.dummy_deal_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states;
 DROP TABLE IF EXISTS ${schema}.dummy_linear_states_v2;
 DROP TABLE IF EXISTS ${schema}.node_mutual_exclusion;
-DROP SEQUENCE IF EXISTS ${schema}.hibernate_sequence;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOG;
 DROP TABLE IF EXISTS ${schema}.DATABASECHANGELOGLOCK;
+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};
 GRANT ALTER, DELETE, EXECUTE, INSERT, REFERENCES, SELECT, UPDATE, VIEW DEFINITION ON SCHEMA::${schema} TO ${schema};