ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-11 13:16:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[ENT-1153] fix merge - revert feature for database integration test (Enterprise feature)

Browse Source
This commit is contained in:
szymonsztuka 2017-11-29 10:51:49 +00:00
parent 7d75d95dc2
commit c32c21bc48
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
View File

@ -47,8 +47,7 @@ data class DatabaseConfig(
val initDatabase: Boolean = true, val initDatabase: Boolean = true,
val serverNameTablePrefix: String = "", val serverNameTablePrefix: String = "",
val transactionIsolationLevel: TransactionIsolationLevel = TransactionIsolationLevel.REPEATABLE_READ, val transactionIsolationLevel: TransactionIsolationLevel = TransactionIsolationLevel.REPEATABLE_READ,
val schema: String? = null, val schema: String? = null
val nodeOrganizationName: String? = null
) )
enum class TransactionIsolationLevel { enum class TransactionIsolationLevel {

1
testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
View File

@ -18,7 +18,6 @@ import net.corda.core.utilities.getOrThrow
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.node.services.api.StartedNodeServices import net.corda.node.services.api.StartedNodeServices
import net.corda.node.services.config.CertChainPolicyConfig import net.corda.node.services.config.CertChainPolicyConfig
import net.corda.node.services.config.DatabaseConfig
import net.corda.node.services.config.NodeConfiguration import net.corda.node.services.config.NodeConfiguration
import net.corda.node.services.config.VerifierType import net.corda.node.services.config.VerifierType
import net.corda.nodeapi.User import net.corda.nodeapi.User

1
testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
View File

@ -27,7 +27,6 @@ import net.corda.node.internal.StartedNode
import net.corda.node.internal.cordapp.CordappLoader import net.corda.node.internal.cordapp.CordappLoader
import net.corda.node.services.api.SchemaService import net.corda.node.services.api.SchemaService
import net.corda.node.services.config.BFTSMaRtConfiguration import net.corda.node.services.config.BFTSMaRtConfiguration
import net.corda.node.services.config.DatabaseConfig
import net.corda.node.services.config.NodeConfiguration import net.corda.node.services.config.NodeConfiguration
import net.corda.node.services.config.NotaryConfig import net.corda.node.services.config.NotaryConfig
import net.corda.node.services.keys.E2ETestKeyManagementService import net.corda.node.services.keys.E2ETestKeyManagementService

8
testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
View File

@ -109,8 +109,10 @@ open class MockServices(
* @param nodeName Reflects the "instance" of the in-memory database or database username/schema. * @param nodeName Reflects the "instance" of the in-memory database or database username/schema.
*/ */
@JvmStatic @JvmStatic
fun makeTestDatabaseProperties(nodeName: String? = null): DatabaseConfig = fun makeTestDatabaseProperties(nodeName: String? = null): DatabaseConfig {
DatabaseConfig(nodeOrganizationName = nodeName) val config = readDatabaseConfig(nodeName)
return DatabaseConfig(schema = if (config.hasPath("database.schema")) config.getString("database.schema") else "")
}
/** /**
* Creates an instance of [InMemoryIdentityService] with [MOCK_IDENTITIES]. * Creates an instance of [InMemoryIdentityService] with [MOCK_IDENTITIES].
@ -145,7 +147,7 @@ open class MockServices(
initialIdentityName: CordaX500Name): Pair<CordaPersistence, MockServices> { initialIdentityName: CordaX500Name): Pair<CordaPersistence, MockServices> {
val cordappLoader = CordappLoader.createWithTestPackages(cordappPackages) val cordappLoader = CordappLoader.createWithTestPackages(cordappPackages)
val dataSourceProps = makeTestDataSourceProperties() val dataSourceProps = makeTestDataSourceProperties()
val database = configureDatabase(dataSourceProps, DatabaseConfig(), identityService, NodeSchemaService(cordappLoader)) val database = configureDatabase(dataSourceProps, makeTestDatabaseProperties(), identityService, NodeSchemaService(cordappLoader))
val mockService = database.transaction { val mockService = database.transaction {
object : MockServices(cordappLoader, initialIdentityName = initialIdentityName, keys = *(keys.toTypedArray())) { object : MockServices(cordappLoader, initialIdentityName = initialIdentityName, keys = *(keys.toTypedArray())) {
override val identityService get() = identityService override val identityService get() = identityService