Ability to run integration tests against standalone databases (part 2) (#109)

Commit 359610ff14 didn't fully covered: * Integration tests extends IntegrationTest class which can run SQL scripts before and after a test and before and after test class. *Driver.kt creates notaries without a table name prefixes (separation is achieved by using different user/schema). *Revert wrongly altered H2 JDBC connection string for tests.
2024-12-28 00:38:55 +00:00 · 2017-11-15 14:04:48 +00:00 · 2017-11-15 14:04:48 +00:00 · 4f2d8d058e
commit 4f2d8d058e
parent 233f1fb8e2
12 changed files with 24 additions and 24 deletions
--- a/client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
+++ b/client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
@ -34,7 +34,7 @@ import net.corda.testing.driver.driver
 import org.junit.Test
 import rx.Observable

-class NodeMonitorModelTest {
+class NodeMonitorModelTest : IntegrationTest() {
    private lateinit var aliceNode: NodeInfo
    private lateinit var bobNode: NodeInfo
    private lateinit var notaryParty: Party
--- a/client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
+++ b/client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
@ -55,7 +55,8 @@ public class CordaRPCJavaClientTest extends NodeBasedTest {
    }

    @Before
-    public void setUp() throws ExecutionException, InterruptedException {
+    public void setUp() throws Exception {
+        super.setUp();
        node = startNode(getALICE().getName(), 1, singletonList(rpcUser));
        client = new CordaRPCClient(requireNonNull(node.getInternals().getConfiguration().getRpcAddress()));
    }
--- a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
+++ b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
@ -8,11 +8,12 @@ import net.corda.core.messaging.startFlow
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.utilities.getOrThrow
 import net.corda.testing.ALICE
+import net.corda.testing.IntegrationTest
 import net.corda.testing.driver.driver
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.junit.Test

-class BlacklistKotlinClosureTest {
+class BlacklistKotlinClosureTest : IntegrationTest() {
    companion object {
        const val EVIL: Long = 666
    }
--- a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt
+++ b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt
@ -49,7 +49,8 @@ class CordaRPCClientTest : NodeBasedTest(listOf("net.corda.finance.contracts", C
    }

    @Before
-    fun setUp() {
+    override fun setUp() {
+        super.setUp()
        node = startNode(ALICE.name, rpcUsers = listOf(rpcUser))
        client = CordaRPCClient(node.internals.configuration.rpcAddress!!)
    }
--- a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
+++ b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
@ -24,7 +24,7 @@ import java.time.Duration
 import java.util.concurrent.*
 import java.util.concurrent.atomic.AtomicInteger

-class RPCStabilityTests {
+class RPCStabilityTests : IntegrationTest() {

    object DummyOps : RPCOps {
        override val protocolVersion = 0
--- a/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/AbstractCashSelection.kt
+++ b/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/AbstractCashSelection.kt
@ -27,7 +27,9 @@ import kotlin.concurrent.withLock
 * Custom implementations must implement this interface and declare their implementation in
 * META-INF/services/net.corda.contracts.asset.CashSelection
 */
-abstract class AbstractCashSelection {
+// TODO: make parameters configurable when we get CorDapp configuration.
+abstract class AbstractCashSelection(private val maxRetries : Int = 8, private val retrySleep : Int = 100,
+                                     private val retryCap : Int = 2000) {
    companion object {
        val instance = AtomicReference<AbstractCashSelection>()

@ -48,10 +50,6 @@ abstract class AbstractCashSelection {
    }

    // coin selection retry loop counter, sleep (msecs) and lock for selecting states
-    // TODO: make parameters configurable when we get CorDapp configuration.
-    private val MAX_RETRIES = 8
-    private val RETRY_SLEEP = 100
-    private val RETRY_CAP = 2000
    private val spendLock: ReentrantLock = ReentrantLock()

    /**
@ -103,13 +101,13 @@ abstract class AbstractCashSelection {
                                        withIssuerRefs: Set<OpaqueBytes> = emptySet()): List<StateAndRef<Cash.State>> {
        val stateAndRefs = mutableListOf<StateAndRef<Cash.State>>()

-        for (retryCount in 1..MAX_RETRIES) {
+        for (retryCount in 1..maxRetries) {
            if (!attemptSpend(services, amount, lockId, notary, onlyFromIssuerParties, withIssuerRefs, stateAndRefs)) {
                log.warn("Coin selection failed on attempt $retryCount")
                // TODO: revisit the back off strategy for contended spending.
-                if (retryCount != MAX_RETRIES) {
+                if (retryCount != maxRetries) {
                    stateAndRefs.clear()
-                    val durationMillis = (minOf(RETRY_SLEEP.shl(retryCount), RETRY_CAP / 2) * (1.0 + Math.random())).toInt()
+                    val durationMillis = (minOf(retrySleep.shl(retryCount), retryCap / 2) * (1.0 + Math.random())).toInt()
                    FlowLogic.sleep(durationMillis.millis)
                } else {
                    log.warn("Insufficient spendable states identified for $amount")
--- a/node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
@ -55,7 +55,6 @@ class NodePerformanceTests : IntegrationTest() {
    @Before
    fun before() {
        checkQuasarAgent()
-        super.setUp()
    }

    @Test
--- a/node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
@ -26,6 +26,7 @@ import net.corda.node.services.config.NotaryConfig
 import net.corda.node.services.transactions.minClusterSize
 import net.corda.node.services.transactions.minCorrectReplicas
 import net.corda.node.utilities.ServiceIdentityGenerator
+import net.corda.testing.IntegrationTest
 import net.corda.testing.chooseIdentity
 import net.corda.testing.common.internal.NetworkParametersCopier
 import net.corda.testing.common.internal.testNetworkParameters
@ -41,7 +42,7 @@ import java.nio.file.Paths
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue

-class BFTNotaryServiceTests {
+class BFTNotaryServiceTests : IntegrationTest() {
    private lateinit var mockNet: MockNetwork
    private lateinit var notary: Party
    private lateinit var node: StartedNode<MockNode>
--- a/node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.kt
@ -13,6 +13,7 @@ import net.corda.testing.contracts.DummyContract
 import net.corda.testing.contracts.DummyState
 import net.corda.testing.driver.driver
 import net.corda.testing.dummyCommand
+import net.corda.testing.IntegrationTest
 import org.junit.Test
 import kotlin.test.assertEquals

@ -20,7 +21,7 @@ import kotlin.test.assertEquals
 * Check that we can add lots of large attachments to a transaction and that it works OK, e.g. does not hit the
 * transaction size limit (which should only consider the hashes).
 */
-class LargeTransactionsTest {
+class LargeTransactionsTest : IntegrationTest() {
    @StartableByRPC
    @InitiatingFlow
    class SendLargeTransactionFlow(private val hash1: SecureHash,
--- a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
+++ b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
@ -889,9 +889,7 @@ class DriverDSL(
                providedName = nodeNames[0],
                rpcUsers = spec.rpcUsers,
                verifierType = spec.verifierType,
-                customOverrides = notaryConfig(clusterAddress) + mapOf(
-                        "database.serverNameTablePrefix" to nodeNames[0].toString().replace(Regex("[^0-9A-Za-z]+"), "")
-                )
+                customOverrides = notaryConfig(clusterAddress)
        )

        // All other nodes will join the cluster
@ -901,9 +899,7 @@ class DriverDSL(
                    providedName = it,
                    rpcUsers = spec.rpcUsers,
                    verifierType = spec.verifierType,
-                    customOverrides = notaryConfig(nodeAddress, clusterAddress) + mapOf(
-                            "database.serverNameTablePrefix" to it.toString().replace(Regex("[^0-9A-Za-z]+"), "")
-                    )
+                    customOverrides = notaryConfig(nodeAddress, clusterAddress)
            )
        }

--- a/testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
+++ b/testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
@ -15,6 +15,7 @@ import net.corda.node.services.config.configOf
 import net.corda.node.services.config.parseAsNodeConfiguration
 import net.corda.node.services.config.plus
 import net.corda.nodeapi.User
+import net.corda.testing.IntegrationTest
 import net.corda.testing.SerializationEnvironmentRule
 import net.corda.testing.common.internal.NetworkParametersCopier
 import net.corda.testing.common.internal.testNetworkParameters
@ -31,7 +32,7 @@ import java.util.concurrent.Executors
 import kotlin.concurrent.thread

 // TODO Some of the logic here duplicates what's in the driver
-abstract class NodeBasedTest(private val cordappPackages: List<String> = emptyList()) {
+abstract class NodeBasedTest(private val cordappPackages: List<String> = emptyList()) : IntegrationTest() {
    companion object {
        private val WHITESPACE = "\\s++".toRegex()
    }
--- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
+++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
@ -63,6 +63,7 @@ open class MockServices(

        private fun readDatabaseConfig(nodeName: String? = null, postifx: String? = null): Config {
            val standarizedNodeName = if (nodeName!= null) nodeName.replace(" ", "").replace("-", "_") else null
+            //in case of H2, the same db instance runs for all integration tests, so adding additional variable postfix to use unique db user/schema each time
            val h2InstanceName =  if (postifx != null) standarizedNodeName + "_" + postifx  else standarizedNodeName
            val parseOptions = ConfigParseOptions.defaults()
            val databaseConfig = ConfigFactory.parseResources(System.getProperty("databaseProvider") + ".conf", parseOptions.setAllowMissing(true))
@ -70,7 +71,7 @@ open class MockServices(
            val nodeOrganizationNameConfig = if (standarizedNodeName != null) configOf("nodeOrganizationName" to standarizedNodeName) else ConfigFactory.empty()
            val defaultProps = Properties()
            defaultProps.setProperty("dataSourceProperties.dataSourceClassName", "org.h2.jdbcx.JdbcDataSource")
-            defaultProps.setProperty("dataSourceProperties.dataSource.url", "jdbc:h2:mem:${h2InstanceName}_persistence;LOCK_TIMEOUT=100;DB_CLOSE_ON_EXIT=TRUE")//;TRACE_LEVEL_SYSTEM_OUT=4")
+            defaultProps.setProperty("dataSourceProperties.dataSource.url", "jdbc:h2:mem:${h2InstanceName}_persistence;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE")
            defaultProps.setProperty("dataSourceProperties.dataSource.user", "sa")
            defaultProps.setProperty("dataSourceProperties.dataSource.password", "")
            val defaultConfig = ConfigFactory.parseProperties(defaultProps, parseOptions)