ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-07 19:18:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[CORDA-1937]: Fixes to enterprise float and bridge.

Browse Source
This commit is contained in:
Michele Sollecito 2018-09-04 11:28:21 +01:00
parent 31e58dd2e5
commit c77a75bc10
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt
View File

@ -362,6 +362,7 @@ class SocksTests {
val serverConfig = rigorousMock<AbstractNodeConfiguration>().also { val serverConfig = rigorousMock<AbstractNodeConfiguration>().also {
doReturn(baseDirectory).whenever(it).baseDirectory doReturn(baseDirectory).whenever(it).baseDirectory
doReturn(certificatesDirectory).whenever(it).certificatesDirectory
doReturn(name).whenever(it).myLegalName doReturn(name).whenever(it).myLegalName
doReturn(signingCertificateStore).whenever(it).signingCertificateStore doReturn(signingCertificateStore).whenever(it).signingCertificateStore
doReturn(p2pSslConfiguration).whenever(it).p2pSslOptions doReturn(p2pSslConfiguration).whenever(it).p2pSslOptions

58
node/src/integration-test/kotlin/net/corda/node/services/vault/VaultQueryIntegrationTests.kt
View File

@ -1,29 +1,29 @@
package net.corda.node.services.vault //package net.corda.node.services.vault
//
//
import net.corda.core.identity.CordaX500Name //import net.corda.core.identity.CordaX500Name
import net.corda.testing.core.TestIdentity //import net.corda.testing.core.TestIdentity
import net.corda.testing.internal.GlobalDatabaseRule //import net.corda.testing.internal.GlobalDatabaseRule
import net.corda.testing.internal.toDatabaseSchemaName //import net.corda.testing.internal.toDatabaseSchemaName
import org.junit.ClassRule //import org.junit.ClassRule
import org.junit.Rule //import org.junit.Rule
import org.junit.rules.RuleChain //import org.junit.rules.RuleChain
//
class VaultQueryIntegrationTests : VaultQueryTestsBase(), VaultQueryParties by vaultQueryTestRule { //class VaultQueryIntegrationTests : VaultQueryTestsBase(), VaultQueryParties by vaultQueryTestRule {
//
companion object { // companion object {
val MEGA_CORP = TestIdentity(CordaX500Name("MegaCorp", "London", "GB")).name // val MEGA_CORP = TestIdentity(CordaX500Name("MegaCorp", "London", "GB")).name
val databaseSchemas = listOf(Companion.MEGA_CORP.toDatabaseSchemaName()) // val databaseSchemas = listOf(Companion.MEGA_CORP.toDatabaseSchemaName())
//
val globalDatabaseRule = GlobalDatabaseRule(databaseSchemas) // val globalDatabaseRule = GlobalDatabaseRule(databaseSchemas)
val vaultQueryTestRule = VaultQueryTestRule() // val vaultQueryTestRule = VaultQueryTestRule()
//
@ClassRule @JvmField // @ClassRule @JvmField
val ruleChain = RuleChain.outerRule(globalDatabaseRule).around(vaultQueryTestRule) // val ruleChain = RuleChain.outerRule(globalDatabaseRule).around(vaultQueryTestRule)
} // }
//
@Suppress("LeakingThis") // @Suppress("LeakingThis")
@Rule // @Rule
@JvmField // @JvmField
val transactionRule = VaultQueryRollbackRule(this) // val transactionRule = VaultQueryRollbackRule(this)
} //}