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

Merge branch 'feature/checkpoint_table_improvements' into dan/merge-4.5-into-feature-branch

Browse Source 
# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
This commit is contained in:
LankyDan
2020-03-13 14:29:18 +00:00
parent ac3f880ae4 0174d996bd
commit 8941cf7b8f
17 changed files with 246 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
View File

@ -23,6 +23,7 @@ import net.corda.core.utilities.millis
import net.corda.core.utilities.seconds
import net.corda.node.services.api.StartedNodeServices
import net.corda.node.services.messaging.Message
import net.corda.node.services.statemachine.Checkpoint
import net.corda.testing.driver.DriverDSL
import net.corda.testing.driver.NodeHandle
import net.corda.testing.internal.chooseIdentity
@ -273,9 +274,10 @@ fun CordaRPCOps.waitForShutdown(): Observable<Unit> {
return completable
}
fun DriverDSL.assertCheckpoints(name: CordaX500Name, expected: Long) {
fun DriverDSL.assertUncompletedCheckpoints(name: CordaX500Name, expected: Long) {
val sqlStatement = "select count(*) from node_checkpoints where status not in (${Checkpoint.FlowStatus.COMPLETED.ordinal})"
DriverManager.getConnection("jdbc:h2:file:${baseDirectory(name) / "persistence"}", "sa", "").use { connection ->
connection.createStatement().executeQuery("select count(*) from NODE_CHECKPOINTS").use { rs ->
connection.createStatement().executeQuery(sqlStatement).use { rs ->
rs.next()
assertThat(rs.getLong(1)).isEqualTo(expected)
}