From 29615f512eab2b4fb82a59c2ddb4d1945ba567ae Mon Sep 17 00:00:00 2001 From: Maksymilian Pawlak <120831+m4ksio@users.noreply.github.com> Date: Tue, 1 May 2018 14:37:35 +0100 Subject: [PATCH] Close DB after test Add unique node prefix to DB source --- .../kotlin/net/corda/node/services/vault/VaultQueryTests.kt | 5 +++++ .../src/main/kotlin/net/corda/testing/node/MockServices.kt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt b/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt index c8491aff85..fdad7e332d 100644 --- a/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt +++ b/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt @@ -122,6 +122,11 @@ open class VaultQueryTests { services.identityService.verifyAndRegisterIdentity(identity) } } + + @AfterClass @JvmStatic + fun afterClass() { + database.close() + } } private lateinit var transaction: DatabaseTransaction diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt index 04c56ec54d..6da52bf601 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt @@ -117,7 +117,7 @@ open class MockServices private constructor( networkParameters: NetworkParameters = testNetworkParameters(), vararg moreKeys: KeyPair): Pair { val cordappLoader = CordappLoader.createWithTestPackages(cordappPackages) - val dataSourceProps = makeTestDataSourceProperties(initialIdentity.name.organisation) + val dataSourceProps = makeTestDataSourceProperties(initialIdentity.name.organisation, SecureHash.randomSHA256().toString()) val schemaService = NodeSchemaService(cordappLoader.cordappSchemas) val database = configureDatabase(dataSourceProps, makeTestDatabaseProperties(initialIdentity.name.organisation), identityService, schemaService) val mockService = database.transaction {