Testing cleanup:

- Move code out of ambiguously named TestUtils files (there were three). Sometimes it's simpler to just put these things into the contract source files directly.
- Remove JavaTestHelpers objects (there were three), in favour of just giving the top level kotlin file class better names.
- Misc other small tweaks and cleanups.

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

@@ -1,46 +0,0 @@
-package com.r3corda.node.internal.testing
-
-import com.r3corda.core.contracts.StateAndRef
-import com.r3corda.core.contracts.DummyContract
-import com.r3corda.core.contracts.StateRef
-import com.r3corda.core.contracts.TransactionState
-import com.r3corda.core.contracts.TransactionType
-import com.r3corda.core.crypto.Party
-import com.r3corda.core.seconds
-import com.r3corda.core.testing.DUMMY_NOTARY
-import com.r3corda.core.testing.DUMMY_NOTARY_KEY
-import com.r3corda.node.internal.AbstractNode
-import java.time.Instant
-import java.util.*
-
-fun issueState(node: AbstractNode): StateAndRef<*> {
-    val tx = DummyContract().generateInitial(node.info.identity.ref(0), Random().nextInt(), DUMMY_NOTARY)
-    tx.signWith(node.storage.myLegalIdentityKey)
-    tx.signWith(DUMMY_NOTARY_KEY)
-    val stx = tx.toSignedTransaction()
-    node.services.recordTransactions(listOf(stx))
-    return StateAndRef(tx.outputStates().first(), StateRef(stx.id, 0))
-}
-
-fun issueMultiPartyState(nodeA: AbstractNode, nodeB: AbstractNode): StateAndRef<DummyContract.MultiOwnerState> {
-    val state = TransactionState(DummyContract.MultiOwnerState(0,
-            listOf(nodeA.info.identity.owningKey, nodeB.info.identity.owningKey)), DUMMY_NOTARY)
-    val tx = TransactionType.NotaryChange.Builder().withItems(state)
-    tx.signWith(nodeA.storage.myLegalIdentityKey)
-    tx.signWith(nodeB.storage.myLegalIdentityKey)
-    tx.signWith(DUMMY_NOTARY_KEY)
-    val stx = tx.toSignedTransaction()
-    nodeA.services.recordTransactions(listOf(stx))
-    nodeB.services.recordTransactions(listOf(stx))
-    val stateAndRef = StateAndRef(state, StateRef(stx.id, 0))
-    return stateAndRef
-}
-
-fun issueInvalidState(node: AbstractNode, notary: Party = DUMMY_NOTARY): StateAndRef<*> {
-    val tx = DummyContract().generateInitial(node.info.identity.ref(0), Random().nextInt(), notary)
-    tx.setTime(Instant.now(), notary, 30.seconds)
-    tx.signWith(node.storage.myLegalIdentityKey)
-    val stx = tx.toSignedTransaction(false)
-    node.services.recordTransactions(listOf(stx))
-    return StateAndRef(tx.outputStates().first(), StateRef(stx.id, 0))
-}

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

@@ -2,10 +2,10 @@ package com.r3corda.node.messaging
 
 import com.google.common.util.concurrent.ListenableFuture
 import com.r3corda.contracts.CommercialPaper
+import com.r3corda.contracts.asset.CASH
 import com.r3corda.contracts.asset.Cash
-import com.r3corda.contracts.testing.CASH
-import com.r3corda.contracts.testing.`issued by`
-import com.r3corda.contracts.testing.`owned by`
+import com.r3corda.contracts.asset.`issued by`
+import com.r3corda.contracts.asset.`owned by`
 import com.r3corda.contracts.testing.fillWithSomeTestCash
 import com.r3corda.core.contracts.*
 import com.r3corda.core.crypto.Party

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

@@ -1,14 +1,14 @@
 package com.r3corda.node.services
 
+import com.r3corda.contracts.asset.CASH
 import com.r3corda.contracts.asset.Cash
-import com.r3corda.contracts.testing.CASH
-import com.r3corda.contracts.testing.`issued by`
-import com.r3corda.contracts.testing.`owned by`
-import com.r3corda.contracts.testing.`with notary`
+import com.r3corda.contracts.asset.`issued by`
+import com.r3corda.contracts.asset.`owned by`
 import com.r3corda.core.bd
 import com.r3corda.core.contracts.DOLLARS
 import com.r3corda.core.contracts.Fix
 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

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

@@ -1,12 +1,13 @@
 package com.r3corda.node.services
 
+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.node.internal.AbstractNode
 import com.r3corda.node.internal.testing.MockNetwork
-import com.r3corda.node.internal.testing.issueMultiPartyState
-import com.r3corda.node.internal.testing.issueState
 import com.r3corda.node.services.network.NetworkMapService
 import com.r3corda.node.services.transactions.SimpleNotaryService
 import org.junit.Before
@@ -15,6 +16,8 @@ import protocols.NotaryChangeProtocol
 import protocols.NotaryChangeProtocol.Instigator
 import protocols.StateReplacementException
 import protocols.StateReplacementRefused
+import java.time.Instant
+import java.util.*
 import java.util.concurrent.ExecutionException
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
@@ -90,4 +93,36 @@ class NotaryChangeTests {
     //       - The requesting party wants to change additional state fields
     //       - Multiple states in a single "notary change" transaction
     //       - Transaction contains additional states and commands with business logic
-}
+}
+
+fun issueState(node: AbstractNode): StateAndRef<*> {
+    val tx = DummyContract().generateInitial(node.info.identity.ref(0), Random().nextInt(), DUMMY_NOTARY)
+    tx.signWith(node.storage.myLegalIdentityKey)
+    tx.signWith(DUMMY_NOTARY_KEY)
+    val stx = tx.toSignedTransaction()
+    node.services.recordTransactions(listOf(stx))
+    return StateAndRef(tx.outputStates().first(), StateRef(stx.id, 0))
+}
+
+fun issueMultiPartyState(nodeA: AbstractNode, nodeB: AbstractNode): StateAndRef<DummyContract.MultiOwnerState> {
+    val state = TransactionState(DummyContract.MultiOwnerState(0,
+            listOf(nodeA.info.identity.owningKey, nodeB.info.identity.owningKey)), DUMMY_NOTARY)
+    val tx = TransactionType.NotaryChange.Builder().withItems(state)
+    tx.signWith(nodeA.storage.myLegalIdentityKey)
+    tx.signWith(nodeB.storage.myLegalIdentityKey)
+    tx.signWith(DUMMY_NOTARY_KEY)
+    val stx = tx.toSignedTransaction()
+    nodeA.services.recordTransactions(listOf(stx))
+    nodeB.services.recordTransactions(listOf(stx))
+    val stateAndRef = StateAndRef(state, StateRef(stx.id, 0))
+    return stateAndRef
+}
+
+fun issueInvalidState(node: AbstractNode, notary: Party = DUMMY_NOTARY): StateAndRef<*> {
+    val tx = DummyContract().generateInitial(node.info.identity.ref(0), Random().nextInt(), notary)
+    tx.setTime(Instant.now(), notary, 30.seconds)
+    tx.signWith(node.storage.myLegalIdentityKey)
+    val stx = tx.toSignedTransaction(false)
+    node.services.recordTransactions(listOf(stx))
+    return StateAndRef(tx.outputStates().first(), StateRef(stx.id, 0))
+}

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

@@ -7,7 +7,6 @@ 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.node.internal.testing.MockNetwork
-import com.r3corda.node.internal.testing.issueState
 import com.r3corda.node.services.network.NetworkMapService
 import com.r3corda.node.services.transactions.SimpleNotaryService
 import com.r3corda.protocols.NotaryError

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

@@ -8,8 +8,6 @@ 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.node.internal.testing.MockNetwork
-import com.r3corda.node.internal.testing.issueInvalidState
-import com.r3corda.node.internal.testing.issueState
 import com.r3corda.node.services.network.NetworkMapService
 import com.r3corda.node.services.transactions.ValidatingNotaryService
 import com.r3corda.protocols.NotaryError