ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-06 09:21:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed smoke tests after config parsing changes [CORDA-926]

Browse Source
This commit is contained in:
igor nitto 2018-03-05 15:32:05 +00:00 committed by GitHub
parent cd3beabcc0
commit 1caca44076
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml generated
View File

@ -17,6 +17,8 @@
<module name="bootstrapper_test" target="1.8" /> <module name="bootstrapper_test" target="1.8" />
<module name="buildSrc_main" target="1.8" /> <module name="buildSrc_main" target="1.8" />
<module name="buildSrc_test" target="1.8" /> <module name="buildSrc_test" target="1.8" />
<module name="canonicalizer_main" target="1.8" />
<module name="canonicalizer_test" target="1.8" />
<module name="client_main" target="1.8" /> <module name="client_main" target="1.8" />
<module name="client_test" target="1.8" /> <module name="client_test" target="1.8" />
<module name="confidential-identities_main" target="1.8" /> <module name="confidential-identities_main" target="1.8" />

1
client/rpc/src/smoke-test/java/net/corda/java/rpc/StandaloneCordaRPCJavaClientTest.java
View File

@ -47,7 +47,6 @@ public class StandaloneCordaRPCJavaClientTest {
port.getAndIncrement(), port.getAndIncrement(),
port.getAndIncrement(), port.getAndIncrement(),
port.getAndIncrement(), port.getAndIncrement(),
port.getAndIncrement(),
true, true,
Collections.singletonList(rpcUser) Collections.singletonList(rpcUser)
); );

1
client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/StandaloneCordaRPClientTest.kt
View File

@ -61,7 +61,6 @@ class StandaloneCordaRPClientTest {
p2pPort = port.andIncrement, p2pPort = port.andIncrement,
rpcPort = port.andIncrement, rpcPort = port.andIncrement,
rpcAdminPort = port.andIncrement, rpcAdminPort = port.andIncrement,
webPort = port.andIncrement,
isNotary = true, isNotary = true,
users = listOf(user) users = listOf(user)
) )

1
core/src/smoke-test/kotlin/net/corda/core/NodeVersioningTest.kt
View File

@ -38,7 +38,6 @@ class NodeVersioningTest {
p2pPort = port.andIncrement, p2pPort = port.andIncrement,
rpcPort = port.andIncrement, rpcPort = port.andIncrement,
rpcAdminPort = port.andIncrement, rpcAdminPort = port.andIncrement,
webPort = port.andIncrement,
isNotary = false, isNotary = false,
users = listOf(user) users = listOf(user)
) )

1
core/src/smoke-test/kotlin/net/corda/core/cordapp/CordappSmokeTest.kt
View File

@ -34,7 +34,6 @@ class CordappSmokeTest {
p2pPort = port.andIncrement, p2pPort = port.andIncrement,
rpcPort = port.andIncrement, rpcPort = port.andIncrement,
rpcAdminPort = port.andIncrement, rpcAdminPort = port.andIncrement,
webPort = port.andIncrement,
isNotary = false, isNotary = false,
users = listOf(user) users = listOf(user)
) )

2
testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
View File

@ -13,7 +13,6 @@ class NodeConfig(
val p2pPort: Int, val p2pPort: Int,
val rpcPort: Int, val rpcPort: Int,
val rpcAdminPort: Int, val rpcAdminPort: Int,
val webPort: Int,
val isNotary: Boolean, val isNotary: Boolean,
val users: List<User> val users: List<User>
) { ) {
@ -32,7 +31,6 @@ class NodeConfig(
val config = empty() val config = empty()
.withValue("myLegalName", valueFor(legalName.toString())) .withValue("myLegalName", valueFor(legalName.toString()))
.withValue("p2pAddress", addressValueFor(p2pPort)) .withValue("p2pAddress", addressValueFor(p2pPort))
.withValue("webAddress", addressValueFor(webPort))
.withValue("rpcSettings", empty() .withValue("rpcSettings", empty()
.withValue("address", addressValueFor(rpcPort)) .withValue("address", addressValueFor(rpcPort))
.withValue("adminAddress", addressValueFor(rpcAdminPort)) .withValue("adminAddress", addressValueFor(rpcAdminPort))