Updated integration tests; flaky driver DSL causing test failures.

Author: MrMatthewLayton

onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/AttestationIntegrationTests.kt

@@ -32,49 +32,52 @@ class AttestationIntegrationTests : IntegrationTest() {
     fun `Attestation integration service tests`() = start {
 
         // Issue a claim
-        nodeA.claimService.issueClaim(
+        val claimIssuanceTransaction = nodeA.claimService.issueClaim(
             property = "example",
             value = "Hello, World!",
             linearId = ID,
             observers = setOf(partyC)
         ).returnValue.getOrThrow()
 
         // Find the issued claim
+        nodeC.waitForTransaction(claimIssuanceTransaction.id)
         val issuedClaim = nodeC.rpc.vaultServiceFor<CordaClaim<String>>().singleOrNull {
             linearIds(ID)
         } ?: fail("Failed to find issued claim.")
 
         // Issue an attestation
-        nodeC.attestationService.issueStaticAttestation(
+        val attestationIssuanceTransaction = nodeC.attestationService.issueStaticAttestation(
             state = issuedClaim
         ).returnValue.getOrThrow()
 
         // Find the issued attestation
+        nodeC.waitForTransaction(attestationIssuanceTransaction.id)
         val issuedAttestation = nodeC.rpc.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
             attestationPointer(issuedClaim.ref)
         } ?: fail("Failed to find issued attestation.")
 
         // Amend the issued attestation
-        nodeC.attestationService.amendStaticAttestation(
+        val attestationAmendmentTransaction = nodeC.attestationService.amendStaticAttestation(
             oldAttestation = issuedAttestation,
             state = issuedClaim,
             status = AttestationStatus.ACCEPTED
         ).returnValue.getOrThrow()
 
         // Find the amended attestation
+        nodeC.waitForTransaction(attestationAmendmentTransaction.id)
         val amendedAttestation = nodeC.rpc.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
             attestationPointer(issuedClaim.ref)
         } ?: fail("Failed to find amended attestation.")
 
         // Publish the amended attestation
-        val tx = nodeA.attestationService.publishAttestation(
+        val attestationPublicationTransaction = nodeA.attestationService.publishAttestation(
             attestation = amendedAttestation,
             observers = setOf(partyB)
         ).returnValue.getOrThrow()
 
         // Find the published attestation
         listOf(nodeA, nodeB, nodeC).forEach {
-            it.waitForTransaction(tx.id)
+            it.waitForTransaction(attestationPublicationTransaction.id)
             it.rpc.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
                 attestationPointer(issuedClaim.ref)
             } ?: fail("Failed to find published attestation.")
@@ -85,5 +88,7 @@ class AttestationIntegrationTests : IntegrationTest() {
             attestation = amendedAttestation,
             observers = setOf(partyB)
         ).returnValue.getOrThrow()
+
+        logger.info("Attestation tests complete!")
     }
 }

onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/ClaimIntegrationTests.kt

@@ -29,38 +29,40 @@ class ClaimIntegrationTests : IntegrationTest() {
     fun `Claim integration service tests`() = start {
 
         // Issue a claim
-        nodeA.claimService.issueClaim(
+        val claimIssuanceTransaction = nodeA.claimService.issueClaim(
             property = "example",
             value = "Hello, World!",
             linearId = ID,
             observers = setOf(partyC)
         ).returnValue.getOrThrow()
 
         // Find the issued claim
+        nodeA.waitForTransaction(claimIssuanceTransaction.id)
         val issuedClaim = nodeA.rpc.vaultServiceFor<CordaClaim<String>>().singleOrNull {
             linearIds(ID)
         } ?: fail("Failed to find issued claim.")
 
         // Amend the claim
-        nodeA.claimService.amendClaim(
+        val claimAmendmentTransaction = nodeA.claimService.amendClaim(
             claim = issuedClaim,
             value = "Goodbye, World!"
         ).returnValue.getOrThrow()
 
         // Find the amended claim
+        nodeA.waitForTransaction(claimAmendmentTransaction.id)
         val amendedClaim = nodeA.rpc.vaultServiceFor<CordaClaim<String>>().singleOrNull {
             linearIds(ID)
         } ?: fail("Failed to find amended claim.")
 
         // Publish the amended claim
-        val tx = nodeA.claimService.publishClaim(
+        val claimPublicationTransaction = nodeA.claimService.publishClaim(
             claim = amendedClaim,
             observers = setOf(partyB, partyC)
         ).returnValue.getOrThrow()
 
         // Find the published claim
         listOf(nodeA, nodeB, nodeC).forEach {
-            it.waitForTransaction(tx.id)
+            it.waitForTransaction(claimPublicationTransaction.id)
             it.rpc.vaultServiceFor<CordaClaim<String>>().singleOrNull {
                 linearIds(ID)
             } ?: fail("Failed to find sent claim.")
@@ -71,5 +73,7 @@ class ClaimIntegrationTests : IntegrationTest() {
             claim = amendedClaim,
             observers = setOf(partyB, partyC)
         ).returnValue.getOrThrow()
+
+        logger.info("Claim tests complete!")
     }
 }

onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/IntegrationTest.kt

@@ -29,9 +29,9 @@ import net.corda.testing.node.internal.cordappsForPackages
 
 abstract class IntegrationTest : AutoCloseable {
 
-    private companion object {
+    protected companion object {
         val RPC_USERS = listOf(User("guest", "letmein", permissions = setOf("ALL")))
-        val log = loggerFor<IntegrationTest>()
+        val logger = loggerFor<IntegrationTest>()
     }
 
     private lateinit var _nodeA: NodeHandle
@@ -48,9 +48,11 @@ abstract class IntegrationTest : AutoCloseable {
 
     fun start(action: () -> Unit) {
         val parameters = DriverParameters(
-            isDebug = true,
+            isDebug = false,
             startNodesInProcess = true,
             waitForAllNodesToFinish = false,
+            inMemoryDB = true,
+            premigrateH2Database = true,
             networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
             cordappsForAllNodes = cordappsForPackages(
                 "io.onixlabs.corda.core.workflow",
@@ -71,21 +73,41 @@ abstract class IntegrationTest : AutoCloseable {
             listOf(_nodeA, _nodeB, _nodeC).forEach {
                 val identity = it.nodeInfo.legalIdentities.first()
                 val rpcAddress = it.rpcAddress
-                log.info("Node registered with RPC address '$rpcAddress' for node '$identity'.")
+                logger.info("Node registered with RPC address '$rpcAddress' for node '$identity'.")
             }
 
-            initialize()
-            action()
-            finalize()
-            close()
+            try {
+                logger.info("Initializing test...")
+                initialize()
+
+                logger.info("Performing test action...")
+                action()
+
+                logger.info("Finalizing test...")
+                finalize()
+
+                logger.info("Closing down nodes...")
+                close()
+            } catch (ex: Exception) {
+                logger.error("Test failed with exception type '${ex.javaClass}' and message '${ex.message}'.")
+            }
         }
     }
 
     protected open fun initialize() = Unit
     protected open fun finalize() = Unit
 
     override fun close() = listOf(nodeA, nodeB, nodeC).forEach {
-        it.stop()
-        it.close()
+        val identity = it.nodeInfo.legalIdentities.first()
+
+        try {
+            logger.info("Stopping node: $identity...")
+            it.stop()
+
+            logger.info("Closing node: $identity...")
+            it.close()
+        } catch (ex: Exception) {
+            logger.error("Node shutdown for '$identity' failed with exception type '${ex.javaClass}' and message '${ex.message}'.")
+        }
     }
 }