From 2fafb118a14aab8ed0b2fc1e39d93ceea8efb71f Mon Sep 17 00:00:00 2001
From: Christian Sailer <christian.sailer@r3.com>
Date: Tue, 6 Nov 2018 14:10:02 +0000
Subject: [PATCH] Fix up Enterprise only Integration tests

---
 .../corda/notary/mysql/MySQLNotaryServiceTests.kt    | 12 +++++-------
 .../contracts/asset/CashSelectionH2Test.kt           |  6 +++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/notary/mysql/src/test/kotlin/net/corda/notary/mysql/MySQLNotaryServiceTests.kt b/notary/mysql/src/test/kotlin/net/corda/notary/mysql/MySQLNotaryServiceTests.kt
index 1f3ab696ca..f93acafd36 100644
--- a/notary/mysql/src/test/kotlin/net/corda/notary/mysql/MySQLNotaryServiceTests.kt
+++ b/notary/mysql/src/test/kotlin/net/corda/notary/mysql/MySQLNotaryServiceTests.kt
@@ -32,6 +32,8 @@ import net.corda.testing.core.dummyCommand
 import net.corda.testing.core.singleIdentity
 import net.corda.testing.internal.IntegrationTest
 import net.corda.testing.internal.IntegrationTestSchemas
+import net.corda.testing.node.MockNetNotaryConfig
+import net.corda.testing.node.MockNodeConfigOverrides
 import net.corda.testing.node.TestClock
 import net.corda.testing.node.internal.*
 import org.assertj.core.api.Assertions
@@ -253,16 +255,12 @@ class MySQLNotaryServiceTests : IntegrationTest() {
                 InternalMockNodeParameters(
                         legalName = notaryNodeName,
                         entropyRoot = BigInteger.valueOf(60L),
-                        configOverrides = {
-                            val notaryConfig = NotaryConfig(
+                        configOverrides = MockNodeConfigOverrides(
+                                notary = MockNetNotaryConfig(
                                     validating = true,
                                     extraConfig = MySQLNotaryConfiguration(dataStoreProperties, maxBatchSize = 10, maxBatchInputStates = 100).toConfig(),
                                     serviceLegalName = notaryName,
                                     className = MySQLNotaryService::class.java.name
-                            )
-                            doReturn(notaryConfig).whenever(it).notary
-                        }
-                )
-        )
+                                ))))
     }
 }
diff --git a/perftestcordapp/src/test/kotlin/com/r3/corda/enterprise/perftestcordapp/contracts/asset/CashSelectionH2Test.kt b/perftestcordapp/src/test/kotlin/com/r3/corda/enterprise/perftestcordapp/contracts/asset/CashSelectionH2Test.kt
index 0a49dd8a9b..9114b06343 100644
--- a/perftestcordapp/src/test/kotlin/com/r3/corda/enterprise/perftestcordapp/contracts/asset/CashSelectionH2Test.kt
+++ b/perftestcordapp/src/test/kotlin/com/r3/corda/enterprise/perftestcordapp/contracts/asset/CashSelectionH2Test.kt
@@ -9,6 +9,7 @@ import net.corda.core.internal.concurrent.transpose
 import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.getOrThrow
 import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.MockNodeConfigOverrides
 import net.corda.testing.node.MockNodeParameters
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.After
@@ -40,10 +41,9 @@ class CashSelectionH2Test {
 
     @Test
     fun `check does not hold connection over retries`() {
-        val bankA = mockNet.createNode(MockNodeParameters(configOverrides = {
+        val bankA = mockNet.createNode(MockNodeParameters(configOverrides = MockNodeConfigOverrides(
             // Tweak connections to be minimal to make this easier (1 results in a hung node during start up, so use 2 connections).
-            it.dataSourceProperties.setProperty("maximumPoolSize", "2")
-        }))
+                extraDataSourceProperties = mapOf("maximumPoolSize" to "2"))))
         val notary = mockNet.defaultNotaryIdentity
 
         // Start more cash spends than we have connections.  If spend leaks a connection on retry, we will run out of connections.