Inline testNodeConfiguration. (#2238)

node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt

@@ -30,6 +30,7 @@ import net.corda.node.services.statemachine.StateMachineManagerImpl
 import net.corda.node.services.vault.NodeVaultService
 import net.corda.node.utilities.AffinityExecutor
 import net.corda.node.internal.configureDatabase
+import net.corda.node.services.config.NodeConfiguration
 import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.persistence.DatabaseConfig
 import net.corda.testing.*
@@ -42,7 +43,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import java.nio.file.Paths
 import java.time.Clock
 import java.time.Instant
 import java.util.concurrent.CountDownLatch
@@ -97,7 +97,10 @@ class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
         database = configureDatabase(dataSourceProps, DatabaseConfig(), rigorousMock())
         val identityService = makeTestIdentityService()
         kms = MockKeyManagementService(identityService, ALICE_KEY)
-        val configuration = testNodeConfiguration(Paths.get("."), CordaX500Name("Alice", "London", "GB"))
+        val configuration = rigorousMock<NodeConfiguration>().also {
+            doReturn(true).whenever(it).devMode
+            doReturn(null).whenever(it).devModeOptions
+        }
         val validatedTransactions = MockTransactionStorage()
         database.transaction {
             services = rigorousMock<Services>().also {

node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTests.kt

@@ -1,5 +1,7 @@
 package net.corda.node.services.messaging
 
+import com.nhaarman.mockito_kotlin.doReturn
+import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.context.AuthServiceId
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.utilities.NetworkHostAndPort
@@ -12,12 +14,12 @@ import net.corda.node.services.network.PersistentNetworkMapCache
 import net.corda.node.services.transactions.PersistentUniquenessProvider
 import net.corda.node.utilities.AffinityExecutor.ServiceAffinityExecutor
 import net.corda.node.internal.configureDatabase
+import net.corda.node.services.config.CertChainPolicyConfig
 import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.persistence.DatabaseConfig
 import net.corda.testing.*
 import net.corda.testing.node.MockServices.Companion.MOCK_VERSION_INFO
 import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.testNodeConfiguration
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.After
@@ -61,9 +63,16 @@ class ArtemisMessagingTests {
     @Before
     fun setUp() {
         securityManager = RPCSecurityManagerImpl.fromUserList(users = emptyList(), id = AuthServiceId("TEST"))
-        config = testNodeConfiguration(
+        abstract class AbstractNodeConfiguration : NodeConfiguration
-                baseDirectory = temporaryFolder.root.toPath(),
+        config = rigorousMock<AbstractNodeConfiguration>().also {
-                myLegalName = ALICE_NAME)
+            doReturn(temporaryFolder.root.toPath()).whenever(it).baseDirectory
+            doReturn(ALICE_NAME).whenever(it).myLegalName
+            doReturn("trustpass").whenever(it).trustStorePassword
+            doReturn("cordacadevpass").whenever(it).keyStorePassword
+            doReturn("").whenever(it).exportJMXto
+            doReturn(emptyList<CertChainPolicyConfig>()).whenever(it).certificateChainCheckPolicies
+            doReturn(5).whenever(it).messageRedeliveryDelaySeconds
+        }
         LogHelper.setLevel(PersistentUniquenessProvider::class)
         database = configureDatabase(makeTestDataSourceProperties(), DatabaseConfig(), rigorousMock())
         networkMapCache = NetworkMapCacheImpl(PersistentNetworkMapCache(database, emptyList()), rigorousMock())

node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt

@@ -15,7 +15,6 @@ import net.corda.nodeapi.internal.crypto.getX509Certificate
 import net.corda.nodeapi.internal.crypto.loadKeyStore
 import net.corda.testing.ALICE_NAME
 import net.corda.testing.rigorousMock
-import net.corda.testing.node.testNodeConfiguration
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Before
 import org.junit.Rule
@@ -45,7 +44,14 @@ class NetworkRegistrationHelperTest {
 
     @Before
     fun init() {
-        config = testNodeConfiguration(baseDirectory = tempFolder.root.toPath(), myLegalName = ALICE_NAME)
+        abstract class AbstractNodeConfiguration : NodeConfiguration
+        config = rigorousMock<AbstractNodeConfiguration>().also {
+            doReturn(tempFolder.root.toPath()).whenever(it).baseDirectory
+            doReturn("trustpass").whenever(it).trustStorePassword
+            doReturn("cordacadevpass").whenever(it).keyStorePassword
+            doReturn(ALICE_NAME).whenever(it).myLegalName
+            doReturn("").whenever(it).emailAddress
+        }
     }
 
     @Test

testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt

@@ -22,14 +22,13 @@ import net.corda.core.node.services.KeyManagementService
 import net.corda.core.serialization.SerializationWhitelist
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.contextLogger
+import net.corda.core.utilities.seconds
 import net.corda.node.internal.AbstractNode
 import net.corda.node.internal.StartedNode
 import net.corda.node.internal.cordapp.CordappLoader
 import net.corda.node.services.api.SchemaService
-import net.corda.node.services.config.BFTSMaRtConfiguration
-import net.corda.node.services.config.NodeConfiguration
-import net.corda.node.services.config.NotaryConfig
 import net.corda.node.services.api.IdentityServiceInternal
+import net.corda.node.services.config.*
 import net.corda.node.services.keys.E2ETestKeyManagementService
 import net.corda.node.services.messaging.MessagingService
 import net.corda.node.services.transactions.BFTNonValidatingNotaryService
@@ -41,11 +40,14 @@ import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.ServiceIdentityGenerator
 import net.corda.nodeapi.internal.NotaryInfo
 import net.corda.nodeapi.internal.NetworkParametersCopier
+import net.corda.nodeapi.internal.config.User
+import net.corda.nodeapi.internal.persistence.DatabaseConfig
 import net.corda.testing.common.internal.testNetworkParameters
 import net.corda.testing.DUMMY_NOTARY_NAME
 import net.corda.testing.internal.testThreadFactory
 import net.corda.testing.node.MockServices.Companion.MOCK_VERSION_INFO
 import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
+import net.corda.testing.rigorousMock
 import net.corda.testing.setGlobalSerialization
 import org.apache.activemq.artemis.utils.ReusableLatch
 import org.apache.sshd.common.util.security.SecurityUtils
@@ -384,9 +386,9 @@ class MockNetwork(defaultParameters: MockNetworkParameters = MockNetworkParamete
 
     private fun <N : MockNode> createNodeImpl(parameters: MockNodeParameters, nodeFactory: (MockNodeArgs) -> N, start: Boolean): N {
         val id = parameters.forcedID ?: nextNodeId++
-        val config = testNodeConfiguration(
+        val config = mockNodeConfiguration().also {
-                baseDirectory = baseDirectory(id).createDirectories(),
+            doReturn(baseDirectory(id).createDirectories()).whenever(it).baseDirectory
-                myLegalName = parameters.legalName ?: CordaX500Name(organisation = "Mock Company $id", locality = "London", country = "GB")).also {
+            doReturn(parameters.legalName ?: CordaX500Name("Mock Company $id", "London", "GB")).whenever(it).myLegalName
             doReturn(makeTestDataSourceProperties("node_${id}_net_$networkId")).whenever(it).dataSourceProperties
             parameters.configOverrides(it)
         }
@@ -472,3 +474,23 @@ open class MessagingServiceSpy(val messagingService: MessagingService) : Messagi
 fun StartedNode<MockNetwork.MockNode>.setMessagingServiceSpy(messagingServiceSpy: MessagingServiceSpy) {
     internals.setMessagingServiceSpy(messagingServiceSpy)
 }
+
+private fun mockNodeConfiguration(): NodeConfiguration {
+    abstract class AbstractNodeConfiguration : NodeConfiguration
+    return rigorousMock<AbstractNodeConfiguration>().also {
+        doReturn("cordacadevpass").whenever(it).keyStorePassword
+        doReturn("trustpass").whenever(it).trustStorePassword
+        doReturn(emptyList<User>()).whenever(it).rpcUsers
+        doReturn(null).whenever(it).notary
+        doReturn(DatabaseConfig()).whenever(it).database
+        doReturn("").whenever(it).emailAddress
+        doReturn("").whenever(it).exportJMXto
+        doReturn(true).whenever(it).devMode
+        doReturn(null).whenever(it).compatibilityZoneURL
+        doReturn(emptyList<CertChainPolicyConfig>()).whenever(it).certificateChainCheckPolicies
+        doReturn(VerifierType.InMemory).whenever(it).verifierType
+        doReturn(5).whenever(it).messageRedeliveryDelaySeconds
+        doReturn(5.seconds.toMillis()).whenever(it).additionalNodeInfoPollingFrequencyMsec
+        doReturn(null).whenever(it).devModeOptions
+    }
+}

testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt

@@ -2,8 +2,6 @@
 
 package net.corda.testing.node
 
-import com.nhaarman.mockito_kotlin.doReturn
-import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.context.Actor
 import net.corda.core.context.AuthServiceId
 import net.corda.core.context.InvocationContext
@@ -15,16 +13,8 @@ import net.corda.core.internal.FlowStateMachine
 import net.corda.core.node.ServiceHub
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.getOrThrow
-import net.corda.core.utilities.seconds
 import net.corda.node.services.api.StartedNodeServices
-import net.corda.node.services.config.CertChainPolicyConfig
-import net.corda.nodeapi.internal.persistence.DatabaseConfig
-import net.corda.node.services.config.NodeConfiguration
-import net.corda.node.services.config.VerifierType
-import net.corda.nodeapi.internal.config.User
 import net.corda.testing.*
-import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import java.nio.file.Path
 
 /**
  * Creates and tests a ledger built by the passed in dsl.
@@ -48,31 +38,6 @@ fun ServiceHub.transaction(
     dsl(TransactionDSL(TestTransactionDSLInterpreter(interpreter, TransactionBuilder(notary)), notary))
 }
 
-fun testNodeConfiguration(
-        baseDirectory: Path,
-        myLegalName: CordaX500Name): NodeConfiguration {
-    abstract class MockableNodeConfiguration : NodeConfiguration // Otherwise Mockito is defeated by val getters.
-    return rigorousMock<MockableNodeConfiguration>().also {
-        doReturn(baseDirectory).whenever(it).baseDirectory
-        doReturn(myLegalName).whenever(it).myLegalName
-        doReturn("cordacadevpass").whenever(it).keyStorePassword
-        doReturn("trustpass").whenever(it).trustStorePassword
-        doReturn(emptyList<User>()).whenever(it).rpcUsers
-        doReturn(null).whenever(it).notary
-        doReturn(makeTestDataSourceProperties(myLegalName.organisation)).whenever(it).dataSourceProperties
-        doReturn(DatabaseConfig()).whenever(it).database
-        doReturn("").whenever(it).emailAddress
-        doReturn("").whenever(it).exportJMXto
-        doReturn(true).whenever(it).devMode
-        doReturn(null).whenever(it).compatibilityZoneURL
-        doReturn(emptyList<CertChainPolicyConfig>()).whenever(it).certificateChainCheckPolicies
-        doReturn(VerifierType.InMemory).whenever(it).verifierType
-        doReturn(5).whenever(it).messageRedeliveryDelaySeconds
-        doReturn(5.seconds.toMillis()).whenever(it).additionalNodeInfoPollingFrequencyMsec
-        doReturn(null).whenever(it).devModeOptions
-    }
-}
-
 fun testActor(owningLegalIdentity: CordaX500Name = CordaX500Name("Test Company Inc.", "London", "GB")) = Actor(Actor.Id("Only For Testing"), AuthServiceId("TEST"), owningLegalIdentity)
 
 fun testContext(owningLegalIdentity: CordaX500Name = CordaX500Name("Test Company Inc.", "London", "GB")) = InvocationContext.rpc(testActor(owningLegalIdentity))