Merged in rnicoll-test-utils (pull request #313)

Move test utilities into their own package

.gitignore

@@ -16,6 +16,7 @@ tags
 /core/build
 /experimental/build
 /docs/build/doctrees
+/test-utils/build
 
 # gradle's buildSrc build/
 /buildSrc/build/

.idea/modules.xml

@@ -24,6 +24,9 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping_integrationTest.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping_integrationTest.iml" group="r3prototyping" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping_main.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping_main.iml" group="r3prototyping" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping_test.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping_test.iml" group="r3prototyping" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/test-utils/test-utils.iml" filepath="$PROJECT_DIR$/.idea/modules/test-utils/test-utils.iml" group="test-utils" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/test-utils/test-utils_main.iml" filepath="$PROJECT_DIR$/.idea/modules/test-utils/test-utils_main.iml" group="test-utils" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/test-utils/test-utils_test.iml" filepath="$PROJECT_DIR$/.idea/modules/test-utils/test-utils_test.iml" group="test-utils" />
     </modules>
   </component>
 </project>

build.gradle

@@ -118,6 +118,7 @@ dependencies {
     // Integration test helpers
     integrationTestCompile 'junit:junit:4.12'
     integrationTestCompile 'org.assertj:assertj-core:${assertj_version}'
+    integrationTestCompile project(':test-utils')
 }
 
 // Package up the demo programs.
@@ -242,4 +243,4 @@ task installTemplateNodes(dependsOn: 'buildCordaJAR') << {
         into "${buildDir}/nodes"
     }
 
-}
+}

contracts/build.gradle

@@ -14,6 +14,7 @@ repositories {
 dependencies {
     compile project(':core')
 
+    testCompile project(':test-utils')
     testCompile 'junit:junit:4.12'
 }
 

contracts/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt

@@ -4,16 +4,10 @@ import com.google.common.annotations.VisibleForTesting
 import com.r3corda.contracts.clause.*
 import com.r3corda.core.contracts.*
 import com.r3corda.core.contracts.clauses.*
-import com.r3corda.core.crypto.NullPublicKey
-import com.r3corda.core.crypto.Party
-import com.r3corda.core.crypto.SecureHash
-import com.r3corda.core.crypto.toStringShort
+import com.r3corda.core.crypto.*
 import com.r3corda.core.random63BitValue
-import com.r3corda.core.testing.MINI_CORP
-import com.r3corda.core.testing.TEST_TX_TIME
-import com.r3corda.core.utilities.Emoji
-import com.r3corda.core.utilities.NonEmptySet
-import com.r3corda.core.utilities.nonEmptySetOf
+import com.r3corda.core.utilities.*
+import java.math.BigInteger
 import java.security.PublicKey
 import java.time.Duration
 import java.time.Instant
@@ -714,7 +708,12 @@ infix fun <T> Obligation.State<T>.`issued by`(party: Party) = copy(obligor = par
 @Suppress("unused") fun <T> Obligation.State<T>.ownedBy(owner: PublicKey) = copy(beneficiary = owner)
 @Suppress("unused") fun <T> Obligation.State<T>.issuedBy(party: Party) = copy(obligor = party)
 
+/** A randomly generated key. */
+val DUMMY_OBLIGATION_ISSUER_KEY by lazy { entropyToKeyPair(BigInteger.valueOf(10)) }
+/** A dummy, randomly generated issuer party by the name of "Snake Oil Issuer" */
+val DUMMY_OBLIGATION_ISSUER by lazy { Party("Snake Oil Issuer", DUMMY_OBLIGATION_ISSUER_KEY.public) }
+
 val Issued<Currency>.OBLIGATION_DEF: Obligation.Terms<Currency>
     get() = Obligation.Terms(nonEmptySetOf(Cash().legalContractReference), nonEmptySetOf(this), TEST_TX_TIME)
 val Amount<Issued<Currency>>.OBLIGATION: Obligation.State<Currency>
-    get() = Obligation.State(Obligation.Lifecycle.NORMAL, MINI_CORP, token.OBLIGATION_DEF, quantity, NullPublicKey)
+    get() = Obligation.State(Obligation.Lifecycle.NORMAL, DUMMY_OBLIGATION_ISSUER, token.OBLIGATION_DEF, quantity, NullPublicKey)

contracts/src/main/kotlin/com/r3corda/contracts/testing/WalletFiller.kt

@@ -12,7 +12,7 @@ import com.r3corda.core.crypto.Party
 import com.r3corda.core.node.ServiceHub
 import com.r3corda.core.node.services.Wallet
 import com.r3corda.core.serialization.OpaqueBytes
-import com.r3corda.core.testing.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import java.security.PublicKey
 import java.util.*
 

contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java

@@ -6,7 +6,8 @@ import kotlin.*;
 import org.junit.*;
 
 import static com.r3corda.core.contracts.ContractsDSL.*;
-import static com.r3corda.core.testing.CoreTestUtils.*;
+import static com.r3corda.core.utilities.TestConstants.*;
+import static com.r3corda.testing.CoreTestUtils.*;
 
 /**
  * This is an incomplete Java replica of CashTests.kt to show how to use the Java test DSL

contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt

@@ -6,9 +6,13 @@ import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.days
-import com.r3corda.core.node.services.testing.MockServices
 import com.r3corda.core.seconds
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
+import com.r3corda.core.utilities.DUMMY_PUBKEY_1
+import com.r3corda.core.utilities.TEST_TX_TIME
+import com.r3corda.testing.node.MockServices
+import com.r3corda.testing.*
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized

contracts/src/test/kotlin/com/r3corda/contracts/IRSTests.kt

@@ -1,10 +1,15 @@
 package com.r3corda.contracts
 
 import com.r3corda.core.contracts.*
-import com.r3corda.core.crypto.SecureHash
-import com.r3corda.core.node.services.testing.MockServices
 import com.r3corda.core.seconds
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
+import com.r3corda.core.utilities.TEST_TX_TIME
+import com.r3corda.testing.LedgerDSL
+import com.r3corda.testing.TestLedgerDSLInterpreter
+import com.r3corda.testing.TestTransactionDSLInterpreter
+import com.r3corda.testing.node.MockServices
+import com.r3corda.testing.*
 import org.junit.Test
 import java.math.BigDecimal
 import java.time.LocalDate

contracts/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt

@@ -4,7 +4,10 @@ import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.serialization.OpaqueBytes
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_PUBKEY_1
+import com.r3corda.core.utilities.DUMMY_PUBKEY_2
+import com.r3corda.testing.*
 import org.junit.Test
 import java.security.PublicKey
 import java.util.*

contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt

@@ -5,8 +5,11 @@ import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.NullPublicKey
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.serialization.OpaqueBytes
-import com.r3corda.core.testing.*
-import com.r3corda.core.utilities.nonEmptySetOf
+import com.r3corda.core.utilities.*
+import com.r3corda.testing.LedgerDSL
+import com.r3corda.testing.TestLedgerDSLInterpreter
+import com.r3corda.testing.TestTransactionDSLInterpreter
+import com.r3corda.testing.*
 import org.junit.Test
 import java.security.PublicKey
 import java.time.Duration

core/build.gradle

@@ -40,6 +40,7 @@ dependencies {
 
     // Bring in the MockNode infrastructure for writing protocol unit tests.
     testCompile project(":node")
+    testCompile project(":test-utils")
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

core/src/main/kotlin/com/r3corda/core/utilities/TestConstants.kt

@@ -0,0 +1,20 @@
+@file:JvmName("TestConstants")
+package com.r3corda.core.utilities
+
+import com.r3corda.core.crypto.*
+import java.math.BigInteger
+import java.security.KeyPair
+import java.security.PublicKey
+import java.time.Instant
+
+// A dummy time at which we will be pretending test transactions are created.
+val TEST_TX_TIME: Instant get() = Instant.parse("2015-04-17T12:00:00.00Z")
+
+val DUMMY_PUBKEY_1: PublicKey get() = DummyPublicKey("x1")
+val DUMMY_PUBKEY_2: PublicKey get() = DummyPublicKey("x2")
+
+val DUMMY_KEY_1: KeyPair by lazy { generateKeyPair() }
+val DUMMY_KEY_2: KeyPair by lazy { generateKeyPair() }
+
+val DUMMY_NOTARY_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(20)) }
+val DUMMY_NOTARY: Party get() = Party("Notary Service", DUMMY_NOTARY_KEY.public)

core/src/test/kotlin/com/r3corda/core/contracts/TransactionGraphSearchTests.kt

@@ -1,10 +1,10 @@
 package com.r3corda.core.contracts
 
 import com.r3corda.core.crypto.newSecureRandom
-import com.r3corda.core.node.services.testing.MockTransactionStorage
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.DUMMY_NOTARY_KEY
-import com.r3corda.core.testing.MEGA_CORP_KEY
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
+import com.r3corda.testing.node.MockTransactionStorage
+import com.r3corda.testing.MEGA_CORP_KEY
 import org.junit.Test
 import java.security.KeyPair
 import kotlin.test.assertEquals

core/src/test/kotlin/com/r3corda/core/contracts/TransactionTypeTests.kt

@@ -2,7 +2,9 @@ package com.r3corda.core.contracts
 
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.SecureHash
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
+import com.r3corda.testing.*
 import org.junit.Test
 import kotlin.test.assertFailsWith
 

core/src/test/kotlin/com/r3corda/core/node/AttachmentClassLoaderTests.kt

@@ -4,10 +4,10 @@ import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.node.services.AttachmentStorage
-import com.r3corda.core.node.services.testing.MockAttachmentStorage
 import com.r3corda.core.serialization.*
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.MEGA_CORP
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.testing.node.MockAttachmentStorage
+import com.r3corda.testing.MEGA_CORP
 import org.apache.commons.io.IOUtils
 import org.junit.Assert
 import org.junit.Test

core/src/test/kotlin/com/r3corda/core/node/WalletUpdateTests.kt

@@ -3,7 +3,7 @@ package com.r3corda.core.node
 import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.node.services.Wallet
-import com.r3corda.core.testing.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import org.junit.Test
 import java.security.PublicKey
 import kotlin.test.assertEquals

core/src/test/kotlin/com/r3corda/core/protocols/ResolveTransactionsProtocolTest.kt

@@ -6,9 +6,10 @@ import com.r3corda.core.crypto.NullSignature
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.serialization.opaque
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.protocols.ResolveTransactionsProtocol
+import com.r3corda.testing.*
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt

@@ -3,7 +3,8 @@ package com.r3corda.core.serialization
 import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.seconds
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.*
+import com.r3corda.testing.*
 import org.junit.Before
 import org.junit.Test
 import java.security.PublicKey

experimental/build.gradle

@@ -21,4 +21,5 @@ dependencies {
     compile project(':contracts')
 
     testCompile 'junit:junit:4.12'
+    compile project(':test-utils')
 }

experimental/src/main/kotlin/com/r3corda/contracts/LOC.kt

@@ -5,7 +5,6 @@ import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.days
-import com.r3corda.core.testing.DUMMY_NOTARY
 import java.security.PublicKey
 import java.time.Instant
 import java.time.LocalDate

experimental/src/test/kotlin/com/r3corda/contracts/AccountReceivableTests.kt

@@ -4,10 +4,13 @@ import com.r3corda.core.contracts.DOLLARS
 import com.r3corda.core.contracts.LedgerTransaction
 import com.r3corda.core.contracts.`issued by`
 import com.r3corda.core.contracts.toLedgerTransaction
-import com.r3corda.core.node.services.testing.MockServices
 import com.r3corda.core.seconds
 import com.r3corda.core.serialization.OpaqueBytes
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
+import com.r3corda.core.utilities.TEST_TX_TIME
+import com.r3corda.testing.node.MockServices
+import com.r3corda.testing.*
 import org.junit.Before
 import java.time.Instant
 import java.time.ZoneOffset

experimental/src/test/kotlin/com/r3corda/contracts/BillOfLadingAgreementTests.kt

@@ -2,8 +2,10 @@ package com.r3corda.contracts
 
 import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.SecureHash
-import com.r3corda.core.node.services.testing.MockServices
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
+import com.r3corda.testing.node.MockServices
+import com.r3corda.testing.*
 import org.junit.Before
 import org.junit.Test
 import java.time.Instant

experimental/src/test/kotlin/com/r3corda/contracts/InvoiceTests.kt

@@ -3,7 +3,9 @@ package com.r3corda.contracts
 import com.r3corda.core.contracts.DOLLARS
 import com.r3corda.core.contracts.`issued by`
 import com.r3corda.core.serialization.OpaqueBytes
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_PUBKEY_1
+import com.r3corda.core.utilities.TEST_TX_TIME
+import com.r3corda.testing.*
 import org.junit.Test
 import java.time.LocalDate
 import java.util.*

experimental/src/test/kotlin/com/r3corda/contracts/LOCTests.kt

@@ -3,9 +3,11 @@ package com.r3corda.contracts
 import com.r3corda.contracts.asset.Cash
 import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.SecureHash
-import com.r3corda.core.node.services.testing.MockServices
 import com.r3corda.core.serialization.OpaqueBytes
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
+import com.r3corda.testing.node.MockServices
+import com.r3corda.testing.*
 import org.junit.Before
 import org.junit.Test
 import java.time.Instant

experimental/src/test/kotlin/com/r3corda/contracts/universal/Caplet.kt

@@ -3,8 +3,8 @@ package com.r3corda.contracts.universal
 import com.r3corda.core.contracts.Fix
 import com.r3corda.core.contracts.FixOf
 import com.r3corda.core.contracts.Tenor
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.transaction
+import com.r3corda.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import org.junit.Test
 import java.math.BigDecimal
 import java.time.Instant

experimental/src/test/kotlin/com/r3corda/contracts/universal/FXSwap.kt

@@ -1,7 +1,7 @@
 package com.r3corda.contracts.universal
 
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.transaction
+import com.r3corda.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import org.junit.Test
 import java.time.Instant
 

experimental/src/test/kotlin/com/r3corda/contracts/universal/ZeroCouponBond.kt

@@ -1,8 +1,7 @@
 package com.r3corda.contracts.universal
 
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.TEST_TX_TIME
-import com.r3corda.core.testing.transaction
+import com.r3corda.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import org.junit.Test
 import java.time.Instant
 

node/build.gradle

@@ -34,6 +34,7 @@ sourceSets {
 
 dependencies {
     compile project(':contracts')
+    compile project(':test-utils')
 
     compile "com.google.code.findbugs:jsr305:3.0.1"
 

node/src/main/kotlin/com/r3corda/node/internal/testing/IRSSimulation.kt

@@ -12,7 +12,7 @@ import com.r3corda.core.contracts.StateAndRef
 import com.r3corda.core.contracts.UniqueIdentifier
 import com.r3corda.core.failure
 import com.r3corda.core.node.services.linearHeadsOfType
-import com.r3corda.core.node.services.testing.MockIdentityService
+import com.r3corda.testing.node.MockIdentityService
 import com.r3corda.core.random63BitValue
 import com.r3corda.core.success
 import com.r3corda.node.services.network.InMemoryMessagingNetwork

node/src/main/kotlin/com/r3corda/node/internal/testing/MockNode.kt

@@ -9,10 +9,10 @@ import com.r3corda.core.node.NodeInfo
 import com.r3corda.core.node.PhysicalLocation
 import com.r3corda.core.node.services.ServiceType
 import com.r3corda.core.node.services.WalletService
-import com.r3corda.core.node.services.testing.MockIdentityService
-import com.r3corda.core.node.services.testing.makeTestDataSourceProperties
-import com.r3corda.core.testing.DUMMY_NOTARY_KEY
+import com.r3corda.testing.node.MockIdentityService
+import com.r3corda.testing.node.makeTestDataSourceProperties
 import com.r3corda.core.testing.InMemoryWalletService
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import com.r3corda.core.utilities.loggerFor
 import com.r3corda.node.internal.AbstractNode
 import com.r3corda.node.services.api.MessagingServiceInternal

node/src/test/kotlin/com/r3corda/node/messaging/AttachmentTests.kt

@@ -6,7 +6,6 @@ import com.r3corda.core.crypto.sha256
 import com.r3corda.core.node.NodeInfo
 import com.r3corda.core.node.services.ServiceType
 import com.r3corda.core.serialization.OpaqueBytes
-import com.r3corda.core.testing.rootCauseExceptions
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.node.services.config.NodeConfiguration
 import com.r3corda.node.services.network.NetworkMapService
@@ -14,6 +13,7 @@ import com.r3corda.node.services.persistence.NodeAttachmentService
 import com.r3corda.node.services.transactions.SimpleNotaryService
 import com.r3corda.protocols.FetchAttachmentsProtocol
 import com.r3corda.protocols.FetchDataProtocol
+import com.r3corda.testing.rootCauseExceptions
 import org.junit.Before
 import org.junit.Test
 import java.io.ByteArrayInputStream

node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt

@@ -14,8 +14,10 @@ import com.r3corda.core.node.services.ServiceType
 import com.r3corda.core.node.services.TransactionStorage
 import com.r3corda.core.node.services.Wallet
 import com.r3corda.core.random63BitValue
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import com.r3corda.core.utilities.LogHelper
+import com.r3corda.core.utilities.TEST_TX_TIME
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.node.services.config.NodeConfiguration
 import com.r3corda.node.services.network.InMemoryMessagingNetwork
@@ -24,6 +26,7 @@ import com.r3corda.node.services.persistence.PerFileTransactionStorage
 import com.r3corda.node.services.persistence.StorageServiceImpl
 import com.r3corda.node.services.statemachine.StateMachineManager
 import com.r3corda.protocols.TwoPartyTradeProtocol
+import com.r3corda.testing.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before

node/src/test/kotlin/com/r3corda/node/services/ArtemisMessagingTests.kt

@@ -4,12 +4,12 @@ import com.google.common.net.HostAndPort
 import com.r3corda.core.crypto.generateKeyPair
 import com.r3corda.core.messaging.Message
 import com.r3corda.core.node.services.DEFAULT_SESSION_ID
-import com.r3corda.core.testing.freeLocalHostAndPort
 import com.r3corda.node.services.config.NodeConfiguration
 import com.r3corda.node.services.messaging.ArtemisMessagingClient
 import com.r3corda.node.services.messaging.ArtemisMessagingServer
 import com.r3corda.node.services.network.InMemoryNetworkMapCache
 import com.r3corda.node.utilities.AffinityExecutor
+import com.r3corda.testing.freeLocalHostAndPort
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.After
 import org.junit.Rule

node/src/test/kotlin/com/r3corda/node/services/MockServiceHubInternal.kt

@@ -4,11 +4,8 @@ import com.codahale.metrics.MetricRegistry
 import com.google.common.util.concurrent.ListenableFuture
 import com.r3corda.core.contracts.SignedTransaction
 import com.r3corda.core.node.services.*
-import com.r3corda.core.node.services.testing.MockStorageService
 import com.r3corda.core.protocols.ProtocolLogic
 import com.r3corda.core.protocols.ProtocolLogicRefFactory
-import com.r3corda.core.testing.InMemoryWalletService
-import com.r3corda.core.testing.MOCK_IDENTITY_SERVICE
 import com.r3corda.node.serialization.NodeClock
 import com.r3corda.node.services.api.MessagingServiceInternal
 import com.r3corda.node.services.api.MonitoringService
@@ -17,6 +14,9 @@ import com.r3corda.node.services.network.MockNetworkMapCache
 import com.r3corda.node.services.network.NetworkMapService
 import com.r3corda.node.services.persistence.DataVending
 import com.r3corda.node.services.statemachine.StateMachineManager
+import com.r3corda.core.testing.InMemoryWalletService
+import com.r3corda.testing.node.MockStorageService
+import com.r3corda.testing.MOCK_IDENTITY_SERVICE
 import java.time.Clock
 
 @Suppress("LeakingThis")

node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt

@@ -11,14 +11,14 @@ import com.r3corda.core.contracts.TransactionType
 import com.r3corda.core.contracts.`with notary`
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.generateKeyPair
-import com.r3corda.core.testing.ALICE_PUBKEY
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.MEGA_CORP
-import com.r3corda.core.testing.MEGA_CORP_KEY
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import com.r3corda.core.utilities.LogHelper
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.node.services.clientapi.NodeInterestRates
 import com.r3corda.protocols.RatesFixProtocol
+import com.r3corda.testing.ALICE_PUBKEY
+import com.r3corda.testing.MEGA_CORP
+import com.r3corda.testing.MEGA_CORP_KEY
 import org.junit.Assert
 import org.junit.Test
 import java.time.Clock

node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt

@@ -6,19 +6,19 @@ import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.days
 import com.r3corda.core.node.ServiceHub
-import com.r3corda.core.node.services.testing.MockKeyManagementService
 import com.r3corda.core.protocols.ProtocolLogic
 import com.r3corda.core.protocols.ProtocolLogicRef
 import com.r3corda.core.protocols.ProtocolLogicRefFactory
 import com.r3corda.core.serialization.SingletonSerializeAsToken
-import com.r3corda.core.testing.ALICE_KEY
-import com.r3corda.core.testing.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import com.r3corda.node.internal.testing.TestClock
 import com.r3corda.node.services.events.NodeSchedulerService
 import com.r3corda.node.services.network.InMemoryMessagingNetwork
 import com.r3corda.node.services.persistence.PerFileCheckpointStorage
 import com.r3corda.node.services.statemachine.StateMachineManager
 import com.r3corda.node.utilities.AffinityExecutor
+import com.r3corda.testing.ALICE_KEY
+import com.r3corda.testing.node.MockKeyManagementService
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test

node/src/test/kotlin/com/r3corda/node/services/NodeWalletServiceTest.kt

@@ -5,9 +5,9 @@ import com.r3corda.core.contracts.DOLLARS
 import com.r3corda.core.contracts.SignedTransaction
 import com.r3corda.core.node.services.TxWritableStorageService
 import com.r3corda.core.node.services.WalletService
-import com.r3corda.core.node.services.testing.MockServices
-import com.r3corda.core.node.services.testing.makeTestDataSourceProperties
-import com.r3corda.core.testing.DUMMY_NOTARY
+import com.r3corda.testing.node.MockServices
+import com.r3corda.testing.node.makeTestDataSourceProperties
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import com.r3corda.core.utilities.LogHelper
 import com.r3corda.node.services.wallet.NodeWalletService
 import com.r3corda.node.utilities.configureDatabase

node/src/test/kotlin/com/r3corda/node/services/NotaryChangeTests.kt

@@ -4,8 +4,8 @@ import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.generateKeyPair
 import com.r3corda.core.seconds
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.DUMMY_NOTARY_KEY
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import com.r3corda.node.internal.AbstractNode
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.node.services.network.NetworkMapService

node/src/test/kotlin/com/r3corda/node/services/NotaryServiceTests.kt

@@ -3,15 +3,15 @@ package com.r3corda.node.services
 import com.r3corda.core.contracts.Timestamp
 import com.r3corda.core.contracts.TransactionType
 import com.r3corda.core.seconds
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.DUMMY_NOTARY_KEY
-import com.r3corda.core.testing.MINI_CORP_KEY
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.node.services.network.NetworkMapService
 import com.r3corda.node.services.transactions.SimpleNotaryService
 import com.r3corda.protocols.NotaryError
 import com.r3corda.protocols.NotaryException
 import com.r3corda.protocols.NotaryProtocol
+import com.r3corda.testing.MINI_CORP_KEY
 import org.junit.Before
 import org.junit.Test
 import java.time.Instant

node/src/test/kotlin/com/r3corda/node/services/UniquenessProviderTests.kt

@@ -2,9 +2,9 @@ package com.r3corda.node.services
 
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.node.services.UniquenessException
-import com.r3corda.core.testing.MEGA_CORP
-import com.r3corda.core.testing.generateStateRef
 import com.r3corda.node.services.transactions.InMemoryUniquenessProvider
+import com.r3corda.testing.MEGA_CORP
+import com.r3corda.testing.generateStateRef
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith

node/src/test/kotlin/com/r3corda/node/services/ValidatingNotaryServiceTests.kt

@@ -3,16 +3,16 @@ package com.r3corda.node.services
 import com.r3corda.core.contracts.Command
 import com.r3corda.core.contracts.DummyContract
 import com.r3corda.core.contracts.TransactionType
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.DUMMY_NOTARY_KEY
-import com.r3corda.core.testing.MEGA_CORP_KEY
-import com.r3corda.core.testing.MINI_CORP_KEY
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.node.services.network.NetworkMapService
 import com.r3corda.node.services.transactions.ValidatingNotaryService
 import com.r3corda.protocols.NotaryError
 import com.r3corda.protocols.NotaryException
 import com.r3corda.protocols.NotaryProtocol
+import com.r3corda.testing.MEGA_CORP_KEY
+import com.r3corda.testing.MINI_CORP_KEY
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test

node/src/test/kotlin/com/r3corda/node/services/WalletMonitorServiceTests.kt

@@ -14,8 +14,8 @@ import com.r3corda.core.random63BitValue
 import com.r3corda.core.serialization.OpaqueBytes
 import com.r3corda.core.serialization.deserialize
 import com.r3corda.core.serialization.serialize
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.DUMMY_PUBKEY_1
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_PUBKEY_1
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.node.services.monitor.*
 import org.junit.Before

node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt

@@ -6,12 +6,15 @@ import com.r3corda.contracts.asset.cashBalances
 import com.r3corda.contracts.testing.fillWithSomeTestCash
 import com.r3corda.core.contracts.*
 import com.r3corda.core.node.services.WalletService
-import com.r3corda.core.node.services.testing.MockServices
-import com.r3corda.core.node.services.testing.makeTestDataSourceProperties
-import com.r3corda.core.testing.*
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import com.r3corda.core.utilities.LogHelper
 import com.r3corda.node.services.wallet.NodeWalletService
 import com.r3corda.node.utilities.configureDatabase
+import com.r3corda.testing.node.MockServices
+import com.r3corda.testing.node.makeTestDataSourceProperties
+import com.r3corda.testing.DummyLinearContract
+import com.r3corda.testing.*
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.After
 import org.junit.Before

node/src/test/kotlin/com/r3corda/node/services/persistence/DataVendingServiceTests.kt

@@ -5,15 +5,12 @@ import com.r3corda.core.contracts.Amount
 import com.r3corda.core.contracts.Issued
 import com.r3corda.core.contracts.TransactionType
 import com.r3corda.core.contracts.USD
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.MEGA_CORP
-import com.r3corda.core.testing.rootCauseExceptions
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import com.r3corda.node.internal.testing.MockNetwork
+import com.r3corda.testing.MEGA_CORP
 import org.junit.Before
 import org.junit.Test
-import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
 
 /**
  * Tests for the data vending service.

node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt

@@ -3,9 +3,9 @@ package com.r3corda.node.visualiser
 import com.r3corda.core.contracts.CommandData
 import com.r3corda.core.contracts.ContractState
 import com.r3corda.core.crypto.SecureHash
-import com.r3corda.core.testing.LedgerDSL
-import com.r3corda.core.testing.TestLedgerDSLInterpreter
-import com.r3corda.core.testing.TestTransactionDSLInterpreter
+import com.r3corda.testing.LedgerDSL
+import com.r3corda.testing.TestLedgerDSLInterpreter
+import com.r3corda.testing.TestTransactionDSLInterpreter
 import org.graphstream.graph.Edge
 import org.graphstream.graph.Node
 import org.graphstream.graph.implementations.SingleGraph

settings.gradle

@@ -4,4 +4,5 @@ include 'contracts:isolated'
 include 'core'
 include 'node'
 include 'experimental'
+include 'test-utils'
 

src/integration-test/kotlin/com/r3corda/core/testing/IRSDemoTest.kt

@@ -1,13 +1,13 @@
 package com.r3corda.core.testing
 
 import com.google.common.net.HostAndPort
-import com.r3corda.core.testing.utilities.*
+import com.r3corda.testing.*
 import kotlin.test.assertEquals
 import org.junit.Test
 import java.nio.file.Path
 import java.nio.file.Paths
 
-class IRSDemoTest {
+class IRSDemoTest: IntegrationTestCategory {
     @Test fun `runs IRS demo`() {
         val nodeAddrA = freeLocalHostAndPort()
         val apiAddrA = freeLocalHostAndPort()

src/integration-test/kotlin/com/r3corda/core/testing/TraderDemoTest.kt

@@ -1,10 +1,7 @@
 package com.r3corda.core.testing
 
 import com.google.common.net.HostAndPort
-import com.r3corda.core.testing.utilities.NodeApi
-import com.r3corda.core.testing.utilities.TestTimestamp
-import com.r3corda.core.testing.utilities.assertExitOrKill
-import com.r3corda.core.testing.utilities.spawn
+import com.r3corda.testing.*
 import org.junit.Test
 import kotlin.test.assertEquals
 

src/main/kotlin/com/r3corda/demos/RateFixDemo.kt

@@ -7,7 +7,7 @@ import com.r3corda.core.crypto.Party
 import com.r3corda.core.logElapsedTime
 import com.r3corda.core.node.NodeInfo
 import com.r3corda.core.node.services.ServiceType
-import com.r3corda.core.node.services.testing.makeTestDataSourceProperties
+import com.r3corda.testing.node.makeTestDataSourceProperties
 import com.r3corda.core.serialization.deserialize
 import com.r3corda.core.utilities.Emoji
 import com.r3corda.core.utilities.LogHelper

src/test/kotlin/com/r3corda/core/testing/JsonSupportTest.kt

@@ -6,7 +6,7 @@ import com.pholser.junit.quickcheck.generator.GenerationStatus
 import com.pholser.junit.quickcheck.generator.Generator
 import com.pholser.junit.quickcheck.random.SourceOfRandomness
 import com.pholser.junit.quickcheck.runner.JUnitQuickcheck
-import com.r3corda.core.node.services.testing.MockIdentityService
+import com.r3corda.testing.node.MockIdentityService
 import com.r3corda.node.utilities.JsonSupport
 import net.i2p.crypto.eddsa.EdDSAPrivateKey
 import net.i2p.crypto.eddsa.EdDSAPublicKey

test-utils/build.gradle

@@ -0,0 +1,40 @@
+apply plugin: 'kotlin'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url 'http://oss.sonatype.org/content/repositories/snapshots'
+    }
+    jcenter()
+    maven {
+        url 'https://dl.bintray.com/kotlin/exposed'
+    }
+}
+
+//noinspection GroovyAssignabilityCheck
+configurations {
+
+    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
+    runtime.exclude module: 'isolated'
+}
+
+dependencies {
+    compile project(':core')
+
+    // Log4J: logging framework (with SLF4J bindings)
+    compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
+    compile "org.apache.logging.log4j:log4j-core:${log4j_version}"
+
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+
+    compile "com.google.guava:guava:19.0"
+
+    // Force commons logging to version 1.2 to override Artemis, which pulls in 1.1.3 (ARTEMIS-424)
+    compile "commons-logging:commons-logging:1.2"
+
+    // Unit testing helpers.
+    compile 'junit:junit:4.12'
+}

test-utils/src/main/kotlin/com/r3corda/testing/AlwaysSucceedContract.kt

@@ -1,4 +1,4 @@
-package com.r3corda.core.testing
+package com.r3corda.testing
 
 import com.r3corda.core.contracts.Contract
 import com.r3corda.core.contracts.TransactionForContract

test-utils/src/main/kotlin/com/r3corda/testing/CoreTestUtils.kt

@@ -1,20 +1,21 @@
 @file:Suppress("UNUSED_PARAMETER", "UNCHECKED_CAST")
 @file:JvmName("CoreTestUtils")
-package com.r3corda.core.testing
+package com.r3corda.testing
 
 import com.google.common.base.Throwables
 import com.google.common.net.HostAndPort
+import com.r3corda.testing.*
 import com.r3corda.core.contracts.StateRef
 import com.r3corda.core.contracts.TransactionBuilder
 import com.r3corda.core.crypto.*
 import com.r3corda.core.node.ServiceHub
-import com.r3corda.core.node.services.testing.MockIdentityService
-import com.r3corda.core.node.services.testing.MockServices
-import java.math.BigInteger
+import com.r3corda.testing.node.MockIdentityService
+import com.r3corda.testing.node.MockServices
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import java.net.ServerSocket
 import java.security.KeyPair
 import java.security.PublicKey
-import java.time.Instant
 
 /**
  *  JAVA INTEROP
@@ -34,9 +35,6 @@ import java.time.Instant
  *   - The Int.DOLLARS syntax doesn't work from Java.  Use the DOLLARS(int) function instead.
  */
 
-// A dummy time at which we will be pretending test transactions are created.
-val TEST_TX_TIME: Instant get() = Instant.parse("2015-04-17T12:00:00.00Z")
-
 // A few dummy values for testing.
 val MEGA_CORP_KEY: KeyPair by lazy { generateKeyPair() }
 val MEGA_CORP_PUBKEY: PublicKey get() = MEGA_CORP_KEY.public
@@ -47,12 +45,6 @@ val MINI_CORP_PUBKEY: PublicKey get() = MINI_CORP_KEY.public
 val ORACLE_KEY: KeyPair by lazy { generateKeyPair() }
 val ORACLE_PUBKEY: PublicKey get() = ORACLE_KEY.public
 
-val DUMMY_PUBKEY_1: PublicKey get() = DummyPublicKey("x1")
-val DUMMY_PUBKEY_2: PublicKey get() = DummyPublicKey("x2")
-
-val DUMMY_KEY_1: KeyPair by lazy { generateKeyPair() }
-val DUMMY_KEY_2: KeyPair by lazy { generateKeyPair() }
-
 val ALICE_KEY: KeyPair by lazy { generateKeyPair() }
 val ALICE_PUBKEY: PublicKey get() = ALICE_KEY.public
 val ALICE: Party get() = Party("Alice", ALICE_PUBKEY)
@@ -68,9 +60,6 @@ val CHARLIE: Party get() = Party("Charlie", CHARLIE_PUBKEY)
 val MEGA_CORP: Party get() = Party("MegaCorp", MEGA_CORP_PUBKEY)
 val MINI_CORP: Party get() = Party("MiniCorp", MINI_CORP_PUBKEY)
 
-val DUMMY_NOTARY_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(20)) }
-val DUMMY_NOTARY: Party get() = Party("Notary Service", DUMMY_NOTARY_KEY.public)
-
 val ALL_TEST_KEYS: List<KeyPair> get() = listOf(MEGA_CORP_KEY, MINI_CORP_KEY, ALICE_KEY, BOB_KEY, DUMMY_NOTARY_KEY)
 
 val MOCK_IDENTITY_SERVICE: MockIdentityService get() = MockIdentityService(listOf(MEGA_CORP, MINI_CORP, DUMMY_NOTARY))

test-utils/src/main/kotlin/com/r3corda/testing/DummyLinearState.kt

@@ -1,4 +1,4 @@
-package com.r3corda.core.testing
+package com.r3corda.testing
 
 import com.r3corda.core.contracts.*
 import com.r3corda.core.contracts.clauses.Clause

test-utils/src/main/kotlin/com/r3corda/testing/IntegrationTestCategory.kt

@@ -0,0 +1,6 @@
+package com.r3corda.testing
+
+/**
+ * Marker interface for tests which are only run as part of the integration tests.
+ */
+interface IntegrationTestCategory

test-utils/src/main/kotlin/com/r3corda/testing/JVMSpawner.kt

@@ -1,4 +1,4 @@
-package com.r3corda.core.testing.utilities
+package com.r3corda.testing
 
 import java.nio.file.Paths
 import java.util.concurrent.TimeUnit

test-utils/src/main/kotlin/com/r3corda/testing/LedgerDSLInterpreter.kt

@@ -1,7 +1,8 @@
-package com.r3corda.core.testing
+package com.r3corda.testing
 
 import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.SecureHash
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import java.io.InputStream
 
 /**
@@ -134,7 +135,7 @@ class LedgerDSL<out T : TransactionDSLInterpreter, out L : LedgerDSLInterpreter<
      */
     @JvmOverloads
     fun unverifiedTransaction(label: String? = null, transactionBuilder: TransactionBuilder = TransactionBuilder(notary = DUMMY_NOTARY),
-                    dsl: TransactionDSL<TransactionDSLInterpreter>.() -> Unit) =
+                              dsl: TransactionDSL<TransactionDSLInterpreter>.() -> Unit) =
             _unverifiedTransaction(label, transactionBuilder, dsl)
 
     /**

test-utils/src/main/kotlin/com/r3corda/testing/NodeApi.kt

@@ -1,4 +1,4 @@
-package com.r3corda.core.testing.utilities
+package com.r3corda.testing
 
 import com.google.common.net.HostAndPort
 import java.io.IOException

test-utils/src/main/kotlin/com/r3corda/testing/TestDSL.kt

@@ -1,9 +1,10 @@
-package com.r3corda.core.testing
+package com.r3corda.testing
 
 import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.*
 import com.r3corda.core.node.ServiceHub
 import com.r3corda.core.serialization.serialize
+import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
 import java.io.InputStream
 import java.security.KeyPair
 import java.security.PublicKey

test-utils/src/main/kotlin/com/r3corda/testing/TestTimestamp.kt

@@ -1,4 +1,4 @@
-package com.r3corda.core.testing.utilities
+package com.r3corda.testing
 
 import java.text.SimpleDateFormat
 import java.util.*

test-utils/src/main/kotlin/com/r3corda/testing/TransactionDSLInterpreter.kt

@@ -1,9 +1,10 @@
-package com.r3corda.core.testing
+package com.r3corda.testing
 
 import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.seconds
+import com.r3corda.core.utilities.DUMMY_NOTARY
 import java.security.PublicKey
 import java.time.Duration
 import java.time.Instant

test-utils/src/main/kotlin/com/r3corda/testing/node/MockServices.kt

@@ -1,4 +1,4 @@
-package com.r3corda.core.node.services.testing
+package com.r3corda.testing.node
 
 import com.google.common.util.concurrent.ListenableFuture
 import com.r3corda.core.contracts.Attachment
@@ -12,9 +12,9 @@ import com.r3corda.core.node.ServiceHub
 import com.r3corda.core.node.services.*
 import com.r3corda.core.protocols.ProtocolLogic
 import com.r3corda.core.serialization.SingletonSerializeAsToken
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.MEGA_CORP
-import com.r3corda.core.testing.MINI_CORP
+import com.r3corda.core.utilities.DUMMY_NOTARY
+import com.r3corda.testing.MEGA_CORP
+import com.r3corda.testing.MINI_CORP
 import rx.Observable
 import rx.subjects.PublishSubject
 import java.io.ByteArrayInputStream