Refactoring MockServices class - removing Kt Java class (#1350)

finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt

@@ -15,7 +15,7 @@ import net.corda.finance.contracts.asset.*
 import net.corda.testing.*
 import net.corda.testing.contracts.fillWithSomeTestCash
 import net.corda.testing.node.MockServices
-import net.corda.testing.node.makeTestDatabaseAndMockServices
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseAndMockServices
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized

finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt

@@ -22,7 +22,7 @@ import net.corda.testing.*
 import net.corda.testing.contracts.DummyState
 import net.corda.testing.contracts.fillWithSomeTestCash
 import net.corda.testing.node.MockServices
-import net.corda.testing.node.makeTestDatabaseAndMockServices
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseAndMockServices
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java

@@ -49,8 +49,8 @@ import static net.corda.finance.contracts.asset.CashUtilities.getDUMMY_CASH_ISSU
 import static net.corda.testing.CoreTestUtils.*;
 import static net.corda.testing.TestConstants.getDUMMY_NOTARY;
 import static net.corda.testing.TestConstants.getDUMMY_NOTARY_KEY;
-import static net.corda.testing.node.MockServicesKt.makeTestDatabaseAndMockServices;
+import static net.corda.testing.node.MockServices.makeTestDatabaseAndMockServices;
-import static net.corda.testing.node.MockServicesKt.makeTestIdentityService;
+import static net.corda.testing.node.MockServices.makeTestIdentityService;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class VaultQueryJavaTests extends TestDependencyInjectionBase {

node/src/test/kotlin/net/corda/node/services/config/FullNodeConfigurationTest.kt

@@ -4,8 +4,8 @@ import net.corda.core.crypto.commonName
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.testing.ALICE
 import net.corda.nodeapi.User
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Test
 import java.net.URL

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

@@ -20,8 +20,9 @@ import net.corda.node.utilities.AffinityExecutor
 import net.corda.node.utilities.CordaPersistence
 import net.corda.node.utilities.configureDatabase
 import net.corda.testing.*
-import net.corda.testing.node.*
 import net.corda.testing.node.InMemoryMessagingNetwork
+import net.corda.testing.node.MockKeyManagementService
+import net.corda.testing.node.TestClock
 import org.assertj.core.api.Assertions.assertThat
 import org.bouncycastle.asn1.x500.X500Name
 import org.junit.After
@@ -35,6 +36,9 @@ import java.util.concurrent.CountDownLatch
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import kotlin.test.assertTrue
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 
 class NodeSchedulerServiceTest : SingletonSerializeAsToken() {
     val realClock: Clock = Clock.systemUTC()

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

@@ -19,10 +19,10 @@ import net.corda.node.utilities.AffinityExecutor.ServiceAffinityExecutor
 import net.corda.node.utilities.CordaPersistence
 import net.corda.node.utilities.configureDatabase
 import net.corda.testing.*
-import net.corda.testing.node.MOCK_VERSION_INFO
+import net.corda.testing.node.MockServices.Companion.MOCK_VERSION_INFO
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.After

node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt

@@ -9,9 +9,9 @@ import net.corda.node.utilities.CordaPersistence
 import net.corda.node.utilities.configureDatabase
 import net.corda.testing.LogHelper
 import net.corda.testing.TestDependencyInjectionBase
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before

node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt

@@ -22,9 +22,9 @@ import net.corda.node.utilities.CordaPersistence
 import net.corda.node.utilities.configureDatabase
 import net.corda.testing.*
 import net.corda.testing.node.MockServices
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before

node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt

@@ -34,9 +34,9 @@ import net.corda.testing.contracts.fillWithSomeTestCash
 import net.corda.testing.contracts.fillWithSomeTestDeals
 import net.corda.testing.contracts.fillWithSomeTestLinearStates
 import net.corda.testing.node.MockServices
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import net.corda.testing.schemas.DummyLinearStateSchemaV1
 import net.corda.testing.schemas.DummyLinearStateSchemaV2
 import org.assertj.core.api.Assertions

node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt

@@ -14,9 +14,9 @@ import net.corda.node.utilities.CordaPersistence
 import net.corda.node.utilities.DatabaseTransactionManager
 import net.corda.node.utilities.configureDatabase
 import net.corda.testing.LogHelper
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt

@@ -12,9 +12,9 @@ import net.corda.node.services.api.SchemaService
 import net.corda.node.utilities.DatabaseTransactionManager
 import net.corda.node.utilities.configureDatabase
 import net.corda.testing.MEGA_CORP
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import org.hibernate.annotations.Cascade
 import org.hibernate.annotations.CascadeType
 import org.junit.After

node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt

@@ -13,9 +13,9 @@ import net.corda.node.utilities.CordaPersistence
 import net.corda.node.utilities.DatabaseTransaction
 import net.corda.node.utilities.configureDatabase
 import net.corda.testing.*
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt

@@ -5,9 +5,9 @@ import net.corda.core.node.services.UniquenessException
 import net.corda.node.utilities.CordaPersistence
 import net.corda.node.utilities.configureDatabase
 import net.corda.testing.*
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt

@@ -28,7 +28,7 @@ import net.corda.node.utilities.CordaPersistence
 import net.corda.testing.*
 import net.corda.testing.contracts.fillWithSomeTestCash
 import net.corda.testing.node.MockServices
-import net.corda.testing.node.makeTestDatabaseAndMockServices
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseAndMockServices
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.junit.After

node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt

@@ -26,9 +26,9 @@ import net.corda.node.utilities.configureDatabase
 import net.corda.testing.*
 import net.corda.testing.contracts.*
 import net.corda.testing.node.MockServices
-import net.corda.testing.node.makeTestDatabaseAndMockServices
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseAndMockServices
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import net.corda.testing.schemas.DummyLinearStateSchemaV1
 import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions.assertThat

node/src/test/kotlin/net/corda/node/services/vault/VaultWithCashTest.kt

@@ -20,7 +20,7 @@ import net.corda.node.utilities.CordaPersistence
 import net.corda.testing.*
 import net.corda.testing.contracts.*
 import net.corda.testing.node.MockServices
-import net.corda.testing.node.makeTestDatabaseAndMockServices
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseAndMockServices
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.After

node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt

@@ -3,9 +3,9 @@ package net.corda.node.utilities
 import com.google.common.util.concurrent.SettableFuture
 import net.corda.core.internal.bufferUntilSubscribed
 import net.corda.core.internal.tee
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
-import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Test

samples/irs-demo/src/test/kotlin/net/corda/irs/api/NodeInterestRatesTest.kt

@@ -33,6 +33,9 @@ import java.util.function.Predicate
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestIdentityService
 
 class NodeInterestRatesTest : TestDependencyInjectionBase() {
     val TEST_DATA = NodeInterestRates.parseFile("""

test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt

@@ -25,8 +25,8 @@ import net.corda.node.utilities.X509Utilities
 import net.corda.nodeapi.config.SSLConfiguration
 import net.corda.nodeapi.internal.serialization.AMQP_ENABLED
 import net.corda.testing.node.MockServices
-import net.corda.testing.node.makeTestDataSourceProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
-import net.corda.testing.node.makeTestDatabaseProperties
+import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.asn1.x500.X500NameBuilder
 import org.bouncycastle.asn1.x500.style.BCStyle

test-utils/src/main/kotlin/net/corda/testing/driver/Driver.kt

@@ -36,7 +36,7 @@ import net.corda.nodeapi.config.SSLConfiguration
 import net.corda.nodeapi.config.parseAs
 import net.corda.nodeapi.internal.addShutdownHook
 import net.corda.testing.*
-import net.corda.testing.node.MOCK_VERSION_INFO
+import net.corda.testing.node.MockServices.Companion.MOCK_VERSION_INFO
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.bouncycastle.asn1.x500.X500Name

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

@@ -41,6 +41,7 @@ import java.security.KeyPair
 import java.security.cert.X509Certificate
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
+import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
 
 /**
  * A mock node brings up a suite of in-memory services in a fast manner suitable for unit testing.

test-utils/src/main/kotlin/net/corda/testing/node/MockServices.kt

@@ -56,6 +56,85 @@ import java.util.jar.JarInputStream
  */
 open class MockServices(vararg val keys: KeyPair) : ServiceHub {
 
+    companion object {
+
+        @JvmStatic
+        val MOCK_VERSION_INFO = VersionInfo(1, "Mock release", "Mock revision", "Mock Vendor")
+
+        /**
+         * Make properties appropriate for creating a DataSource for unit tests.
+         *
+         * @param nodeName Reflects the "instance" of the in-memory database.  Defaults to a random string.
+         */
+        // TODO: Can we use an X509 principal generator here?
+        @JvmStatic
+        fun makeTestDataSourceProperties(nodeName: String = SecureHash.randomSHA256().toString()): Properties {
+            val props = Properties()
+            props.setProperty("dataSourceClassName", "org.h2.jdbcx.JdbcDataSource")
+            props.setProperty("dataSource.url", "jdbc:h2:mem:${nodeName}_persistence;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE")
+            props.setProperty("dataSource.user", "sa")
+            props.setProperty("dataSource.password", "")
+            return props
+        }
+
+        /**
+         * Make properties appropriate for creating a Database for unit tests.
+         *
+         * @param key (optional) key of a database property to be set.
+         * @param value (optional) value of a database property to be set.
+         */
+        @JvmStatic
+        fun makeTestDatabaseProperties(key: String? = null, value: String? = null): Properties {
+            val props = Properties()
+            props.setProperty("transactionIsolationLevel", "repeatableRead") //for other possible values see net.corda.node.utilities.CordaPeristence.parserTransactionIsolationLevel(String)
+            if (key != null) { props.setProperty(key, value) }
+            return props
+        }
+
+        /**
+         * Creates an instance of [InMemoryIdentityService] with [MOCK_IDENTITIES].
+         */
+        @JvmStatic
+        fun makeTestIdentityService() = InMemoryIdentityService(MOCK_IDENTITIES, trustRoot = DUMMY_CA.certificate)
+
+        /**
+         * Makes database and mock services appropriate for unit tests.
+         *
+         * @param customSchemas a set of schemas being used by [NodeSchemaService]
+         * @param keys a lis of [KeyPair] instances to be used by [MockServices]. Defualts to [MEGA_CORP_KEY]
+         * @param createIdentityService a lambda function returning an instance of [IdentityService]. Defauts to [InMemoryIdentityService].
+         *
+         * @return a pair where the first element is the instance of [CordaPersistence] and the second is [MockServices].
+         */
+        @JvmStatic
+        fun makeTestDatabaseAndMockServices(customSchemas: Set<MappedSchema> = setOf(CommercialPaperSchemaV1, DummyLinearStateSchemaV1, CashSchemaV1),
+                                            keys: List<KeyPair> = listOf(MEGA_CORP_KEY),
+                                            createIdentityService: () -> IdentityService = { makeTestIdentityService() }): Pair<CordaPersistence, MockServices> {
+            val dataSourceProps = makeTestDataSourceProperties()
+            val databaseProperties = makeTestDatabaseProperties()
+            val createSchemaService = { NodeSchemaService(customSchemas) }
+            val database = configureDatabase(dataSourceProps, databaseProperties, createSchemaService, createIdentityService)
+            val mockService = database.transaction {
+                object : MockServices(*(keys.toTypedArray())) {
+                    override val vaultService: VaultService = makeVaultService(database.hibernateConfig)
+
+                    override fun recordTransactions(notifyVault: Boolean, txs: Iterable<SignedTransaction>) {
+                        for (stx in txs) {
+                            validatedTransactions.addTransaction(stx)
+                        }
+                        // Refactored to use notifyAll() as we have no other unit test for that method with multiple transactions.
+                        vaultService.notifyAll(txs.map { it.tx })
+                    }
+
+                    override val vaultQueryService: VaultQueryService = HibernateVaultQueryImpl(database.hibernateConfig, vaultService)
+
+                    override fun jdbcSession(): Connection = database.createSession()
+                }
+            }
+            return Pair(database, mockService)
+        }
+    }
+
     constructor() : this(generateKeyPair())
 
     val key: KeyPair get() = keys.first()
@@ -193,56 +272,3 @@ open class MockTransactionStorage : WritableTransactionStorage, SingletonSeriali
 
     override fun getTransaction(id: SecureHash): SignedTransaction? = txns[id]
 }
-
-/**
- * Make properties appropriate for creating a DataSource for unit tests.
- *
- * @param nodeName Reflects the "instance" of the in-memory database.  Defaults to a random string.
- */
-// TODO: Can we use an X509 principal generator here?
-fun makeTestDataSourceProperties(nodeName: String = SecureHash.randomSHA256().toString()): Properties {
-    val props = Properties()
-    props.setProperty("dataSourceClassName", "org.h2.jdbcx.JdbcDataSource")
-    props.setProperty("dataSource.url", "jdbc:h2:mem:${nodeName}_persistence;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE")
-    props.setProperty("dataSource.user", "sa")
-    props.setProperty("dataSource.password", "")
-    return props
-}
-
-fun makeTestDatabaseProperties(key: String? = null, value: String? = null): Properties {
-    val props = Properties()
-    props.setProperty("transactionIsolationLevel", "repeatableRead") //for other possible values see net.corda.node.utilities.CordaPeristence.parserTransactionIsolationLevel(String)
-    if (key != null) { props.setProperty(key, value) }
-    return props
-}
-
-fun makeTestIdentityService() = InMemoryIdentityService(MOCK_IDENTITIES, trustRoot = DUMMY_CA.certificate)
-
-fun makeTestDatabaseAndMockServices(customSchemas: Set<MappedSchema> = setOf(CommercialPaperSchemaV1, DummyLinearStateSchemaV1, CashSchemaV1),
-                                    keys: List<KeyPair> = listOf(MEGA_CORP_KEY),
-                                    createIdentityService: () -> IdentityService = { makeTestIdentityService() }): Pair<CordaPersistence, MockServices> {
-    val dataSourceProps = makeTestDataSourceProperties()
-    val databaseProperties = makeTestDatabaseProperties()
-    val createSchemaService = { NodeSchemaService(customSchemas) }
-    val database = configureDatabase(dataSourceProps, databaseProperties, createSchemaService, createIdentityService)
-    val mockService = database.transaction {
-        object : MockServices(*(keys.toTypedArray())) {
-            override val vaultService: VaultService = makeVaultService(database.hibernateConfig)
-
-            override fun recordTransactions(notifyVault: Boolean, txs: Iterable<SignedTransaction>) {
-                for (stx in txs) {
-                    validatedTransactions.addTransaction(stx)
-                }
-                // Refactored to use notifyAll() as we have no other unit test for that method with multiple transactions.
-                vaultService.notifyAll(txs.map { it.tx })
-            }
-
-            override val vaultQueryService: VaultQueryService = HibernateVaultQueryImpl(database.hibernateConfig, vaultService)
-
-            override fun jdbcSession(): Connection = database.createSession()
-        }
-    }
-    return Pair(database, mockService)
-}
-
-val MOCK_VERSION_INFO = VersionInfo(1, "Mock release", "Mock revision", "Mock Vendor")

test-utils/src/main/kotlin/net/corda/testing/node/NodeBasedTest.kt

@@ -27,6 +27,7 @@ import net.corda.testing.DUMMY_MAP
 import net.corda.testing.TestDependencyInjectionBase
 import net.corda.testing.driver.addressMustNotBeBoundFuture
 import net.corda.testing.getFreeLocalPorts
+import net.corda.testing.node.MockServices.Companion.MOCK_VERSION_INFO
 import org.apache.logging.log4j.Level
 import org.bouncycastle.asn1.x500.X500Name
 import org.junit.After

test-utils/src/main/kotlin/net/corda/testing/node/SimpleNode.kt

@@ -24,6 +24,7 @@ import net.corda.testing.freeLocalHostAndPort
 import java.security.KeyPair
 import java.security.cert.X509Certificate
 import kotlin.concurrent.thread
+import net.corda.testing.node.MockServices.Companion.MOCK_VERSION_INFO
 
 /**
  * This is a bare-bones node which can only send and receive messages. It doesn't register with a network map service or