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

ENT-5339 Failing tests against Oracle in VaultObserverExceptionTest (#6275)

Browse Source 
* Fix erroneous sql statement for oracle; It was failing tests with 'ORA-00933: SQL command not properly ended'

* Fixed flaky test; it didn't wait for counter party flow to get hospitalized as the test implied
This commit is contained in:
Kyriakos Tharrouniatis 2020-05-22 10:15:51 +01:00 committed by GitHub
parent 326afacedb
commit 57b1a5e0fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
node/src/integration-test/kotlin/net/corda/node/services/vault/VaultObserverExceptionTest.kt
View File

@ -24,6 +24,7 @@ import net.corda.core.utilities.getOrThrow
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.node.services.Permissions import net.corda.node.services.Permissions
import net.corda.node.services.statemachine.StaffedFlowHospital import net.corda.node.services.statemachine.StaffedFlowHospital
import net.corda.node.services.transactions.PersistentUniquenessProvider
import net.corda.testing.core.ALICE_NAME import net.corda.testing.core.ALICE_NAME
import net.corda.testing.core.BOB_NAME import net.corda.testing.core.BOB_NAME
import net.corda.testing.core.singleIdentity import net.corda.testing.core.singleIdentity
@ -598,7 +599,12 @@ class VaultObserverExceptionTest {
@Test(timeout=300_000) @Test(timeout=300_000)
fun `Throw user error in VaultService rawUpdates during counterparty FinalityFlow blows up the flow but does not break the Observer`() { fun `Throw user error in VaultService rawUpdates during counterparty FinalityFlow blows up the flow but does not break the Observer`() {
var observationCounter = 0 var observationCounter = 0
StaffedFlowHospital.onFlowKeptForOvernightObservation.add { _, _ -> ++observationCounter } // Semaphore is used to wait until [PassErroneousOwnableStateReceiver] gets hospitalized, only after that moment let testing thread assert 'observationCounter'
val counterPartyHospitalized = Semaphore(0)
StaffedFlowHospital.onFlowKeptForOvernightObservation.add { _, _ ->
++observationCounter
counterPartyHospitalized.release()
}
val rawUpdatesCount = ConcurrentHashMap<Party, Int>() val rawUpdatesCount = ConcurrentHashMap<Party, Int>()
DbListenerService.onNextVisited = { party -> DbListenerService.onNextVisited = { party ->
@ -644,6 +650,7 @@ class VaultObserverExceptionTest {
assertEquals(1, aliceNode.getStatesById(stateId, Vault.StateStatus.CONSUMED).size) assertEquals(1, aliceNode.getStatesById(stateId, Vault.StateStatus.CONSUMED).size)
assertEquals(0, bobNode.getStatesById(stateId, Vault.StateStatus.UNCONSUMED).size) assertEquals(0, bobNode.getStatesById(stateId, Vault.StateStatus.UNCONSUMED).size)
assertEquals(1, notary.getNotarisedTransactionIds().size) assertEquals(1, notary.getNotarisedTransactionIds().size)
counterPartyHospitalized.acquire()
assertEquals(1, observationCounter) assertEquals(1, observationCounter)
assertEquals(2, rawUpdatesCount[aliceNode.nodeInfo.singleIdentity()]) assertEquals(2, rawUpdatesCount[aliceNode.nodeInfo.singleIdentity()])
assertEquals(1, rawUpdatesCount[bobNode.nodeInfo.singleIdentity()]) assertEquals(1, rawUpdatesCount[bobNode.nodeInfo.singleIdentity()])
@ -653,6 +660,7 @@ class VaultObserverExceptionTest {
assertEquals(2, aliceNode.getAllStates(Vault.StateStatus.CONSUMED).size) assertEquals(2, aliceNode.getAllStates(Vault.StateStatus.CONSUMED).size)
assertEquals(0, bobNode.getStatesById(stateId2, Vault.StateStatus.UNCONSUMED).size) assertEquals(0, bobNode.getStatesById(stateId2, Vault.StateStatus.UNCONSUMED).size)
assertEquals(2, notary.getNotarisedTransactionIds().size) assertEquals(2, notary.getNotarisedTransactionIds().size)
counterPartyHospitalized.acquire()
assertEquals(2, observationCounter) assertEquals(2, observationCounter)
assertEquals(4, rawUpdatesCount[aliceNode.nodeInfo.singleIdentity()]) assertEquals(4, rawUpdatesCount[aliceNode.nodeInfo.singleIdentity()])
assertEquals(2, rawUpdatesCount[bobNode.nodeInfo.singleIdentity()]) assertEquals(2, rawUpdatesCount[bobNode.nodeInfo.singleIdentity()])
@ -833,14 +841,13 @@ class VaultObserverExceptionTest {
@StartableByRPC @StartableByRPC
class NotarisedTxs : FlowLogic<List<String>>() { class NotarisedTxs : FlowLogic<List<String>>() {
override fun call(): List<String> { override fun call(): List<String> {
val session = serviceHub.jdbcSession() return serviceHub.withEntityManager {
val statement = session.createStatement() val criteriaQuery = this.criteriaBuilder.createQuery(String::class.java)
statement.execute("SELECT TRANSACTION_ID FROM NODE_NOTARY_COMMITTED_TXS;") val root = criteriaQuery.from(PersistentUniquenessProvider.CommittedTransaction::class.java)
val result = mutableListOf<String>() criteriaQuery.select(root.get<String>(PersistentUniquenessProvider.CommittedTransaction::transactionId.name))
while (statement.resultSet.next()) { val query = this.createQuery(criteriaQuery)
result.add(statement.resultSet.getString(1)) query.resultList
} }
return result
} }
} }