ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-30 16:14:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

NOTICK Change class byteman references (#6749)

Browse Source 
Scripts now reference the class `ProxyConnection` which is an implementation of `Connection`, to address JDK 11 compatibility issue.
This commit is contained in:
Dan Newton 2020-09-25 15:42:14 +01:00 committed by GitHub
parent d691037f3a
commit dcc65b1d65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineErrorHandlingTest.kt
View File

@ -126,7 +126,7 @@ abstract class StateMachineErrorHandlingTest {
} }
internal fun NodeHandle.assertBytemanOutput(string: String, count: Int) { internal fun NodeHandle.assertBytemanOutput(string: String, count: Int) {
assertEquals(count, getBytemanOutput().filter { string in it }.size) assertEquals(count, getBytemanOutput().filter { string in it }.size, "Expected message \"$string\" to be in byteman output")
} }
@Suppress("LongParameterList") @Suppress("LongParameterList")

8
node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineFlowInitErrorHandlingTest.kt
View File

@ -1,5 +1,6 @@
package net.corda.node.services.statemachine package net.corda.node.services.statemachine
import com.zaxxer.hikari.pool.ProxyConnection
import net.corda.core.CordaRuntimeException import net.corda.core.CordaRuntimeException
import net.corda.core.messaging.startFlow import net.corda.core.messaging.startFlow
import net.corda.core.messaging.startFlowWithClientId import net.corda.core.messaging.startFlowWithClientId
@ -12,7 +13,6 @@ import net.corda.testing.core.CHARLIE_NAME
import net.corda.testing.core.singleIdentity import net.corda.testing.core.singleIdentity
import net.corda.testing.driver.internal.OutOfProcessImpl import net.corda.testing.driver.internal.OutOfProcessImpl
import org.junit.Test import org.junit.Test
import java.sql.Connection
import java.util.concurrent.ExecutorService import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors import java.util.concurrent.Executors
import java.util.concurrent.TimeoutException import java.util.concurrent.TimeoutException
@ -163,7 +163,7 @@ class StateMachineFlowInitErrorHandlingTest : StateMachineErrorHandlingTest() {
ENDRULE ENDRULE
RULE Throw exception when rolling back transaction in transition executor RULE Throw exception when rolling back transaction in transition executor
INTERFACE ${Connection::class.java.name} CLASS ${ProxyConnection::class.java.name}
METHOD rollback METHOD rollback
AT ENTRY AT ENTRY
IF readCounter("counter") == 1 IF readCounter("counter") == 1
@ -178,6 +178,7 @@ class StateMachineFlowInitErrorHandlingTest : StateMachineErrorHandlingTest() {
charlie.nodeInfo.singleIdentity() charlie.nodeInfo.singleIdentity()
).returnValue.getOrThrow(30.seconds) ).returnValue.getOrThrow(30.seconds)
alice.assertBytemanOutput("Throwing exception in transition executor", 1)
alice.rpc.assertNumberOfCheckpointsAllZero() alice.rpc.assertNumberOfCheckpointsAllZero()
alice.rpc.assertHospitalCounts(discharged = 1) alice.rpc.assertHospitalCounts(discharged = 1)
assertEquals(0, alice.rpc.stateMachinesSnapshot().size) assertEquals(0, alice.rpc.stateMachinesSnapshot().size)
@ -215,7 +216,7 @@ class StateMachineFlowInitErrorHandlingTest : StateMachineErrorHandlingTest() {
ENDRULE ENDRULE
RULE Throw exception when rolling back transaction in transition executor RULE Throw exception when rolling back transaction in transition executor
INTERFACE ${Connection::class.java.name} CLASS ${ProxyConnection::class.java.name}
METHOD close METHOD close
AT ENTRY AT ENTRY
IF readCounter("counter") == 1 IF readCounter("counter") == 1
@ -230,6 +231,7 @@ class StateMachineFlowInitErrorHandlingTest : StateMachineErrorHandlingTest() {
charlie.nodeInfo.singleIdentity() charlie.nodeInfo.singleIdentity()
).returnValue.getOrThrow(30.seconds) ).returnValue.getOrThrow(30.seconds)
alice.assertBytemanOutput("Throwing exception in transition executor", 1)
alice.rpc.assertNumberOfCheckpointsAllZero() alice.rpc.assertNumberOfCheckpointsAllZero()
alice.rpc.assertHospitalCounts(discharged = 1) alice.rpc.assertHospitalCounts(discharged = 1)
assertEquals(0, alice.rpc.stateMachinesSnapshot().size) assertEquals(0, alice.rpc.stateMachinesSnapshot().size)