ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 07:06:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7828 from corda/merge-release/os/4.11-release/os/4.12-2024-10-01-398

Browse Source 
ENT-12072: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-01
This commit is contained in:
Adel El-Beik 2024-10-01 14:46:42 +01:00 committed by GitHub
commit f1092eb12d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
View File

@ -140,16 +140,42 @@ class DriverTests {
} }
} }
/**
* The uniqueness of nodes by the DSL is checked using the node organisation name and, if specified,
* the organisation unit name.
* All other X500 components are ignored in this regard.
*/
@Test(timeout=300_000) @Test(timeout=300_000)
fun `driver rejects multiple nodes with the same organisation name`() { fun `driver rejects multiple nodes with the same organisation name`() {
driver(DriverParameters(startNodesInProcess = true, notarySpecs = emptyList())) { driver(DriverParameters(startNodesInProcess = true, notarySpecs = emptyList())) {
newNode(CordaX500Name(commonName = "Notary", organisation = "R3CEV", locality = "New York", country = "US"))().getOrThrow() newNode(CordaX500Name(commonName = "Notary", organisation = "R3CEV", locality = "New York", country = "US"))().getOrThrow()
assertThatIllegalArgumentException().isThrownBy { assertThatIllegalArgumentException().isThrownBy {
newNode(CordaX500Name(commonName = "Regulator", organisation = "R3CEV", locality = "New York", country = "US"))().getOrThrow() newNode(CordaX500Name(commonName = "Regulator", organisation = "R3CEV", locality = "Newcastle", country = "GB"))().getOrThrow()
} }
} }
} }
@Test(timeout=300_000)
fun `driver allows multiple nodes with the same organisation name but different organisation unit name`() {
driver(DriverParameters(startNodesInProcess = true, notarySpecs = emptyList())) {
newNode(CordaX500Name(commonName = "Notary", organisation = "R3CEV", organisationUnit = "Eric", locality = "New York", country = "US", state = null))().getOrThrow()
assertThatCode {
newNode(CordaX500Name(commonName = "Regulator", organisation = "R3CEV", organisationUnit = "Ernie", locality = "Newcastle", country = "GB", state = null))().getOrThrow()
}.doesNotThrowAnyException()
}
}
@Test(timeout=300_000)
fun `driver rejects multiple nodes with the same organisation name and organisation unit name`() {
driver(DriverParameters(startNodesInProcess = true, notarySpecs = emptyList())) {
newNode(CordaX500Name(commonName = "Notary", organisation = "R3CEV", organisationUnit = "Eric", locality = "New York", country = "US", state = null))().getOrThrow()
assertThatIllegalArgumentException().isThrownBy {
newNode(CordaX500Name(commonName = "Regulator", organisation = "R3CEV", organisationUnit = "Eric", locality = "Newcastle", country = "GB", state = null))().getOrThrow()
}
}
}
/** **** **/
@Test(timeout=300_000) @Test(timeout=300_000)
fun `driver allows reusing names of nodes that have been stopped`() { fun `driver allows reusing names of nodes that have been stopped`() {
driver(DriverParameters(startNodesInProcess = true, notarySpecs = emptyList())) { driver(DriverParameters(startNodesInProcess = true, notarySpecs = emptyList())) {

19
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
View File

@ -664,7 +664,11 @@ class DriverDSLImpl(
} }
override fun baseDirectory(nodeName: CordaX500Name): Path { override fun baseDirectory(nodeName: CordaX500Name): Path {
val nodeDirectoryName = nodeName.organisation.filter { !it.isWhitespace() } val nodeDirectoryName = if (nodeName.organisationUnit != null) {
"${nodeName.organisation}-${nodeName.organisationUnit}"
} else {
nodeName.organisation
}.filter { !it.isWhitespace() }
return driverDirectory / nodeDirectoryName return driverDirectory / nodeDirectoryName
} }
@ -1142,11 +1146,16 @@ private class NetworkVisibilityController {
fun register(name: CordaX500Name): VisibilityHandle { fun register(name: CordaX500Name): VisibilityHandle {
val handle = VisibilityHandle() val handle = VisibilityHandle()
nodeVisibilityHandles.locked { val handleName = if (name.organisationUnit != null) {
require(name.organisation !in keys) { "${name.organisation}-${name.organisationUnit}"
"Node with organisation name ${name.organisation} is already started or starting" } else {
name.organisation
} }
put(name.organisation, handle) nodeVisibilityHandles.locked {
require(handleName !in keys) {
"Node with the organisation name (+ unit name) \"$handleName\" is already started or starting"
}
put(handleName, handle)
} }
return handle return handle
} }