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

CORDA-1589 Flow hospital reports incorrect number of patients and fix… (#3315)

Browse Source 
* CORDA-1589 Flow hospital reports incorrect number of patients and fix flakey associated test.

* Compare before and after count, not against zero.  There's a leak in killFlow that will be easier to address in or after Shams PR.
This commit is contained in:
Rick Parker 2018-06-07 09:12:25 +01:00 committed by GitHub
parent 0978d041a3
commit aa01ef638b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt
View File

@ -17,7 +17,7 @@ object StaffedFlowHospital : FlowHospital {
private val patients = ConcurrentHashMap<StateMachineRunId, MedicalHistory>() private val patients = ConcurrentHashMap<StateMachineRunId, MedicalHistory>()
val numberOfPatients = patients.size val numberOfPatients get() = patients.size
class MedicalHistory { class MedicalHistory {
val records: MutableList<Record> = mutableListOf() val records: MutableList<Record> = mutableListOf()

5
node/src/test/kotlin/net/corda/node/services/statemachine/RetryFlowMockTest.kt
View File

@ -89,8 +89,11 @@ class RetryFlowMockTest {
@Test @Test
fun `Patient records do not leak in hospital`() { fun `Patient records do not leak in hospital`() {
val patientCountBefore = StaffedFlowHospital.numberOfPatients
assertEquals(Unit, internalNodeA.startFlow(RetryFlow(1)).get()) assertEquals(Unit, internalNodeA.startFlow(RetryFlow(1)).get())
assertEquals(0, StaffedFlowHospital.numberOfPatients) // Need to make sure the state machine has finished. Otherwise this test is flakey.
mockNet.waitQuiescent()
assertEquals(patientCountBefore, StaffedFlowHospital.numberOfPatients)
assertEquals(2, RetryFlow.count) assertEquals(2, RetryFlow.count)
} }
} }