From dcc65b1d65800a50b348bd7441206dd52d75361f Mon Sep 17 00:00:00 2001 From: Dan Newton Date: Fri, 25 Sep 2020 15:42:14 +0100 Subject: [PATCH] NOTICK Change class byteman references (#6749) Scripts now reference the class `ProxyConnection` which is an implementation of `Connection`, to address JDK 11 compatibility issue. --- .../statemachine/StateMachineErrorHandlingTest.kt | 2 +- .../statemachine/StateMachineFlowInitErrorHandlingTest.kt | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineErrorHandlingTest.kt b/node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineErrorHandlingTest.kt index 311e1d562e..6a43de1ea8 100644 --- a/node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineErrorHandlingTest.kt +++ b/node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineErrorHandlingTest.kt @@ -126,7 +126,7 @@ abstract class StateMachineErrorHandlingTest { } 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") diff --git a/node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineFlowInitErrorHandlingTest.kt b/node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineFlowInitErrorHandlingTest.kt index 97ac7a6387..93f92aa81d 100644 --- a/node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineFlowInitErrorHandlingTest.kt +++ b/node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StateMachineFlowInitErrorHandlingTest.kt @@ -1,5 +1,6 @@ package net.corda.node.services.statemachine +import com.zaxxer.hikari.pool.ProxyConnection import net.corda.core.CordaRuntimeException import net.corda.core.messaging.startFlow 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.driver.internal.OutOfProcessImpl import org.junit.Test -import java.sql.Connection import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.TimeoutException @@ -163,7 +163,7 @@ class StateMachineFlowInitErrorHandlingTest : StateMachineErrorHandlingTest() { ENDRULE RULE Throw exception when rolling back transaction in transition executor - INTERFACE ${Connection::class.java.name} + CLASS ${ProxyConnection::class.java.name} METHOD rollback AT ENTRY IF readCounter("counter") == 1 @@ -178,6 +178,7 @@ class StateMachineFlowInitErrorHandlingTest : StateMachineErrorHandlingTest() { charlie.nodeInfo.singleIdentity() ).returnValue.getOrThrow(30.seconds) + alice.assertBytemanOutput("Throwing exception in transition executor", 1) alice.rpc.assertNumberOfCheckpointsAllZero() alice.rpc.assertHospitalCounts(discharged = 1) assertEquals(0, alice.rpc.stateMachinesSnapshot().size) @@ -215,7 +216,7 @@ class StateMachineFlowInitErrorHandlingTest : StateMachineErrorHandlingTest() { ENDRULE RULE Throw exception when rolling back transaction in transition executor - INTERFACE ${Connection::class.java.name} + CLASS ${ProxyConnection::class.java.name} METHOD close AT ENTRY IF readCounter("counter") == 1 @@ -230,6 +231,7 @@ class StateMachineFlowInitErrorHandlingTest : StateMachineErrorHandlingTest() { charlie.nodeInfo.singleIdentity() ).returnValue.getOrThrow(30.seconds) + alice.assertBytemanOutput("Throwing exception in transition executor", 1) alice.rpc.assertNumberOfCheckpointsAllZero() alice.rpc.assertHospitalCounts(discharged = 1) assertEquals(0, alice.rpc.stateMachinesSnapshot().size)