CORDA-716 Fix split packages in testing (#2232)

client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java

@@ -12,7 +12,7 @@ import net.corda.node.internal.Node;
 import net.corda.node.internal.StartedNode;
 import net.corda.nodeapi.internal.config.User;
 import net.corda.testing.CoreTestUtils;
-import net.corda.testing.internal.NodeBasedTest;
+import net.corda.testing.node.internal.NodeBasedTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt

@@ -22,7 +22,7 @@ import net.corda.node.services.Permissions.Companion.invokeRpc
 import net.corda.node.services.Permissions.Companion.startFlow
 import net.corda.nodeapi.internal.config.User
 import net.corda.testing.*
-import net.corda.testing.internal.NodeBasedTest
+import net.corda.testing.node.internal.NodeBasedTest
 import org.apache.activemq.artemis.api.core.ActiveMQSecurityException
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatExceptionOfType

client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt

@@ -13,8 +13,8 @@ import net.corda.core.utilities.*
 import net.corda.node.services.messaging.RPCServerConfiguration
 import net.corda.nodeapi.RPCApi
 import net.corda.testing.SerializationEnvironmentRule
-import net.corda.testing.internal.poll
 import net.corda.testing.internal.*
+import net.corda.testing.node.internal.*
 import org.apache.activemq.artemis.api.core.SimpleString
 import org.junit.After
 import org.junit.Assert.assertEquals

client/rpc/src/test/kotlin/net/corda/client/rpc/AbstractRPCTest.kt

@@ -7,10 +7,10 @@ import net.corda.core.messaging.RPCOps
 import net.corda.node.services.messaging.RPCServerConfiguration
 import net.corda.nodeapi.internal.config.User
 import net.corda.testing.SerializationEnvironmentRule
-import net.corda.testing.internal.RPCDriverDSL
+import net.corda.testing.node.internal.RPCDriverDSL
-import net.corda.testing.internal.rpcTestUser
+import net.corda.testing.node.internal.rpcTestUser
-import net.corda.testing.internal.startInVmRpcClient
+import net.corda.testing.node.internal.startInVmRpcClient
-import net.corda.testing.internal.startRpcClient
+import net.corda.testing.node.internal.startRpcClient
 import org.apache.activemq.artemis.api.core.client.ClientSession
 import org.junit.Rule
 import org.junit.runners.Parameterized

client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt

@@ -7,9 +7,9 @@ import net.corda.core.internal.concurrent.thenMatch
 import net.corda.core.messaging.RPCOps
 import net.corda.core.utilities.getOrThrow
 import net.corda.node.services.messaging.rpcContext
-import net.corda.testing.internal.RPCDriverDSL
+import net.corda.testing.node.internal.RPCDriverDSL
-import net.corda.testing.internal.rpcDriver
+import net.corda.testing.node.internal.rpcDriver
-import net.corda.testing.internal.rpcTestUser
+import net.corda.testing.node.internal.rpcTestUser
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith

client/rpc/src/test/kotlin/net/corda/client/rpc/RPCConcurrencyTests.kt

@@ -9,8 +9,8 @@ import net.corda.core.serialization.CordaSerializable
 import net.corda.core.utilities.getOrThrow
 import net.corda.core.utilities.millis
 import net.corda.node.services.messaging.RPCServerConfiguration
-import net.corda.testing.internal.RPCDriverDSL
+import net.corda.testing.node.internal.RPCDriverDSL
-import net.corda.testing.internal.rpcDriver
+import net.corda.testing.node.internal.rpcDriver
 import net.corda.testing.internal.testThreadFactory
 import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet
 import org.junit.After

client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt

@@ -6,8 +6,8 @@ import net.corda.core.internal.concurrent.openFuture
 import net.corda.core.messaging.*
 import net.corda.core.utilities.getOrThrow
 import net.corda.testing.SerializationEnvironmentRule
-import net.corda.testing.internal.rpcDriver
+import net.corda.testing.node.internal.rpcDriver
-import net.corda.testing.internal.startRpcClient
+import net.corda.testing.node.internal.startRpcClient
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Rule
 import org.junit.Test

client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt

@@ -6,12 +6,12 @@ import net.corda.core.messaging.RPCOps
 import net.corda.core.utilities.minutes
 import net.corda.core.utilities.seconds
 import net.corda.node.services.messaging.RPCServerConfiguration
-import net.corda.testing.internal.RPCDriverDSL
+import net.corda.testing.node.internal.RPCDriverDSL
 import net.corda.testing.internal.performance.div
-import net.corda.testing.internal.performance.startPublishingFixedRateInjector
+import net.corda.testing.node.internal.performance.startPublishingFixedRateInjector
-import net.corda.testing.internal.performance.startReporter
+import net.corda.testing.node.internal.performance.startReporter
-import net.corda.testing.internal.performance.startTightLoopInjector
+import net.corda.testing.node.internal.performance.startTightLoopInjector
-import net.corda.testing.internal.rpcDriver
+import net.corda.testing.node.internal.rpcDriver
 import net.corda.testing.measure
 import org.junit.Ignore
 import org.junit.Test

client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPermissionsTests.kt

@@ -3,8 +3,8 @@ package net.corda.client.rpc
 import net.corda.core.messaging.RPCOps
 import net.corda.node.services.messaging.rpcContext
 import net.corda.nodeapi.internal.config.User
-import net.corda.testing.internal.RPCDriverDSL
+import net.corda.testing.node.internal.RPCDriverDSL
-import net.corda.testing.internal.rpcDriver
+import net.corda.testing.node.internal.rpcDriver
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized

confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt

@@ -16,6 +16,7 @@ import net.corda.finance.flows.CashIssueAndPaymentFlow
 import net.corda.finance.flows.CashPaymentFlow
 import net.corda.testing.*
 import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

confidential-identities/src/test/kotlin/net/corda/confidential/SwapIdentitiesFlowTests.kt

@@ -5,6 +5,7 @@ import net.corda.core.utilities.getOrThrow
 import net.corda.testing.*
 import net.corda.testing.node.MockNetwork
 import org.junit.Before
+import net.corda.testing.node.startFlow
 import org.junit.Test
 import kotlin.test.*
 

core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java

@@ -16,7 +16,7 @@ import java.util.concurrent.Future;
 import static net.corda.testing.CoreTestUtils.singleIdentity;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.Assert.fail;
-import static net.corda.testing.NodeTestUtils.startFlow;
+import static net.corda.testing.node.NodeTestUtils.startFlow;
 
 public class FlowsInJavaTest {
     private final MockNetwork mockNet = new MockNetwork();

core/src/test/kotlin/net/corda/core/crypto/PartialMerkleTreeTest.kt

@@ -15,6 +15,7 @@ import net.corda.finance.contracts.asset.Cash
 import net.corda.node.services.api.IdentityServiceInternal
 import net.corda.testing.*
 import net.corda.testing.node.MockServices
+import net.corda.testing.node.ledger
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test

core/src/test/kotlin/net/corda/core/flows/AttachmentTests.kt

@@ -13,6 +13,7 @@ import net.corda.node.services.persistence.NodeAttachmentService
 import net.corda.testing.*
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNodeParameters
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

core/src/test/kotlin/net/corda/core/flows/CollectSignaturesFlowTests.kt

@@ -16,6 +16,7 @@ import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockServices
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt

@@ -24,13 +24,13 @@ import net.corda.testing.ALICE_NAME
 import net.corda.testing.BOB_NAME
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.contracts.DummyContractV2
-import net.corda.testing.internal.RPCDriverDSL
+import net.corda.testing.node.internal.RPCDriverDSL
-import net.corda.testing.internal.rpcDriver
+import net.corda.testing.node.internal.rpcDriver
-import net.corda.testing.internal.rpcTestUser
+import net.corda.testing.node.internal.rpcTestUser
-import net.corda.testing.internal.startRpcClient
+import net.corda.testing.node.internal.startRpcClient
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.singleIdentity
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

core/src/test/kotlin/net/corda/core/flows/FinalityFlowTests.kt

@@ -9,6 +9,7 @@ import net.corda.finance.issuedBy
 import net.corda.node.services.api.StartedNodeServices
 import net.corda.testing.*
 import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

core/src/test/kotlin/net/corda/core/flows/ReceiveAllFlowTests.kt

@@ -7,7 +7,7 @@ import net.corda.core.utilities.getOrThrow
 import net.corda.core.utilities.unwrap
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.singleIdentity
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Test

core/src/test/kotlin/net/corda/core/internal/ResolveTransactionsFlowTest.kt

@@ -9,9 +9,10 @@ import net.corda.core.transactions.SignedTransaction
 import net.corda.core.utilities.getOrThrow
 import net.corda.core.utilities.sequence
 import net.corda.node.internal.StartedNode
-import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.node.MockNetwork
+import net.corda.testing.singleIdentity
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

core/src/test/kotlin/net/corda/core/serialization/AttachmentSerializationTest.kt

@@ -21,7 +21,7 @@ import net.corda.testing.BOB_NAME
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNodeParameters
 import net.corda.testing.singleIdentity
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

core/src/test/kotlin/net/corda/core/transactions/TransactionEncumbranceTests.kt

@@ -13,6 +13,7 @@ import net.corda.finance.contracts.asset.Cash
 import net.corda.node.services.api.IdentityServiceInternal
 import net.corda.testing.*
 import net.corda.testing.node.MockServices
+import net.corda.testing.node.ledger
 import org.junit.Rule
 import org.junit.Test
 import java.time.Instant

core/src/test/kotlin/net/corda/core/transactions/TransactionTests.kt

@@ -6,7 +6,6 @@ import net.corda.core.crypto.CompositeKey
 import net.corda.core.identity.Party
 import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
-import net.corda.testing.node.MockAttachment
 import org.junit.Rule
 import org.junit.Test
 import java.math.BigInteger
@@ -112,7 +111,7 @@ class TransactionTests {
         val inputs = emptyList<StateAndRef<*>>()
         val outputs = listOf(baseOutState, baseOutState.copy(notary = ALICE), baseOutState.copy(notary = BOB))
         val commands = emptyList<CommandWithParties<CommandData>>()
-        val attachments = listOf<Attachment>(ContractAttachment(MockAttachment(), DummyContract.PROGRAM_ID))
+        val attachments = listOf<Attachment>(ContractAttachment(rigorousMock(), DummyContract.PROGRAM_ID))
         val id = SecureHash.randomSHA256()
         val timeWindow: TimeWindow? = null
         val privacySalt: PrivacySalt = PrivacySalt()

docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/testdsl/CommercialPaperTest.java

@@ -21,9 +21,9 @@ import static net.corda.core.crypto.Crypto.generateKeyPair;
 import static net.corda.finance.Currencies.DOLLARS;
 import static net.corda.finance.Currencies.issuedBy;
 import static net.corda.finance.contracts.JavaCommercialPaper.JCP_PROGRAM_ID;
+import static net.corda.testing.node.NodeTestUtils.ledger;
+import static net.corda.testing.node.NodeTestUtils.transaction;
 import static net.corda.testing.CoreTestUtils.rigorousMock;
-import static net.corda.testing.NodeTestUtils.ledger;
-import static net.corda.testing.NodeTestUtils.transaction;
 import static net.corda.testing.TestConstants.*;
 import static org.mockito.Mockito.doReturn;
 

docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt

@@ -19,7 +19,7 @@ import net.corda.testing.node.InMemoryMessagingNetwork
 import net.corda.testing.node.MessagingServiceSpy
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.setMessagingServiceSpy
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule

docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt

@@ -15,6 +15,8 @@ import net.corda.finance.contracts.asset.Cash
 import net.corda.node.services.api.IdentityServiceInternal
 import net.corda.testing.*
 import net.corda.testing.node.MockServices
+import net.corda.testing.node.ledger
+import net.corda.testing.node.transaction
 import org.junit.Rule
 import org.junit.Test
 

docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt

@@ -10,7 +10,7 @@ import net.corda.finance.flows.CashIssueFlow
 import net.corda.node.internal.StartedNode
 import net.corda.testing.chooseIdentity
 import net.corda.testing.node.MockNetwork
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Assert
 import org.junit.Before

docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt

@@ -10,7 +10,7 @@ import net.corda.finance.flows.CashIssueFlow
 import net.corda.node.internal.StartedNode
 import net.corda.testing.chooseIdentity
 import net.corda.testing.node.MockNetwork
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

docs/source/example-code/src/test/kotlin/net/corda/docs/WorkflowTransactionBuildTutorialTest.kt

@@ -12,6 +12,7 @@ import net.corda.core.utilities.getOrThrow
 import net.corda.node.services.api.StartedNodeServices
 import net.corda.testing.*
 import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

experimental/src/test/kotlin/net/corda/finance/contracts/universal/Cap.kt

@@ -10,6 +10,7 @@ import net.corda.finance.contracts.Tenor
 import net.corda.node.services.api.IdentityServiceInternal
 import net.corda.testing.*
 import net.corda.testing.node.MockServices
+import net.corda.testing.node.transaction
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test

finance/src/test/java/net/corda/finance/contracts/asset/CashTestsJava.java

@@ -14,8 +14,8 @@ import org.junit.Test;
 
 import static net.corda.finance.Currencies.DOLLARS;
 import static net.corda.finance.Currencies.issuedBy;
+import static net.corda.testing.node.NodeTestUtils.transaction;
 import static net.corda.testing.CoreTestUtils.rigorousMock;
-import static net.corda.testing.NodeTestUtils.transaction;
 import static net.corda.testing.TestConstants.getDUMMY_NOTARY_NAME;
 import static org.mockito.Mockito.doReturn;
 

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

@@ -21,7 +21,9 @@ import net.corda.testing.*
 import net.corda.testing.contracts.VaultFiller
 import net.corda.testing.node.MockServices
 import net.corda.testing.node.MockServices.Companion.makeTestDatabaseAndMockServices
+import net.corda.testing.node.ledger
 import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.transaction
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

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

@@ -24,7 +24,9 @@ import net.corda.testing.contracts.DummyState
 import net.corda.testing.contracts.VaultFiller
 import net.corda.testing.node.MockServices
 import net.corda.testing.node.MockServices.Companion.makeTestDatabaseAndMockServices
+import net.corda.testing.node.ledger
 import net.corda.testing.node.makeTestIdentityService
+import net.corda.testing.node.transaction
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule

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

@@ -23,6 +23,8 @@ import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.contracts.DummyState
 import net.corda.testing.node.MockServices
+import net.corda.testing.node.ledger
+import net.corda.testing.node.transaction
 import org.junit.Rule
 import org.junit.Test
 import java.time.Instant

finance/src/test/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionH2ImplTest.kt

@@ -10,7 +10,7 @@ import net.corda.finance.flows.CashIssueFlow
 import net.corda.finance.flows.CashPaymentFlow
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNodeParameters
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.After
 import org.junit.Test

finance/src/test/kotlin/net/corda/finance/flows/CashExitFlowTests.kt

@@ -11,7 +11,7 @@ import net.corda.testing.BOC_NAME
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

finance/src/test/kotlin/net/corda/finance/flows/CashIssueFlowTests.kt

@@ -11,7 +11,7 @@ import net.corda.testing.BOC_NAME
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.kt

@@ -14,6 +14,7 @@ import net.corda.testing.*
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Before
 import org.junit.Test

node-api/src/test/kotlin/net/corda/nodeapi/internal/AttachmentsClassLoaderStaticContractTests.kt

@@ -14,7 +14,7 @@ import net.corda.core.transactions.TransactionBuilder
 import net.corda.node.internal.cordapp.CordappLoader
 import net.corda.node.internal.cordapp.CordappProviderImpl
 import net.corda.testing.*
-import net.corda.testing.node.MockAttachmentStorage
+import net.corda.testing.services.MockAttachmentStorage
 import org.junit.Assert.*
 import org.junit.Rule
 import org.junit.Test

node-api/src/test/kotlin/net/corda/nodeapi/internal/AttachmentsClassLoaderTests.kt

@@ -19,7 +19,7 @@ import net.corda.nodeapi.internal.serialization.SerializeAsTokenContextImpl
 import net.corda.nodeapi.internal.serialization.attachmentsClassLoaderEnabledPropertyName
 import net.corda.nodeapi.internal.serialization.withTokenContext
 import net.corda.testing.*
-import net.corda.testing.node.MockAttachmentStorage
+import net.corda.testing.services.MockAttachmentStorage
 import org.apache.commons.io.IOUtils
 import org.junit.Assert.*
 import org.junit.Rule

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/CordaClassResolverTests.kt

@@ -12,7 +12,7 @@ import net.corda.nodeapi.internal.AttachmentsClassLoader
 import net.corda.nodeapi.internal.AttachmentsClassLoaderTests
 import net.corda.nodeapi.internal.serialization.kryo.CordaKryo
 import net.corda.nodeapi.internal.serialization.kryo.KryoHeaderV0_1
-import net.corda.testing.node.MockAttachmentStorage
+import net.corda.testing.services.MockAttachmentStorage
 import net.corda.testing.rigorousMock
 import org.junit.Rule
 import org.junit.Test

node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt

@@ -17,11 +17,11 @@ import net.corda.nodeapi.internal.config.User
 import net.corda.testing.DUMMY_NOTARY_NAME
 import net.corda.testing.driver.NodeHandle
 import net.corda.testing.driver.driver
-import net.corda.testing.internal.InternalDriverDSL
+import net.corda.testing.node.internal.InternalDriverDSL
 import net.corda.testing.internal.performance.div
-import net.corda.testing.internal.performance.startPublishingFixedRateInjector
+import net.corda.testing.node.internal.performance.startPublishingFixedRateInjector
-import net.corda.testing.internal.performance.startReporter
+import net.corda.testing.node.internal.performance.startReporter
-import net.corda.testing.internal.performance.startTightLoopInjector
+import net.corda.testing.node.internal.performance.startTightLoopInjector
 import net.corda.testing.node.NotarySpec
 import org.junit.Before
 import org.junit.Ignore

node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt

@@ -24,7 +24,9 @@ import net.corda.testing.*
 import net.corda.testing.driver.DriverDSL
 import net.corda.testing.driver.NodeHandle
 import net.corda.testing.driver.driver
-import net.corda.testing.node.MockAttachmentStorage
+import net.corda.testing.services.MockAttachmentStorage
+import net.corda.testing.rigorousMock
+import net.corda.testing.withTestSerialization
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.net.URLClassLoader

node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt

@@ -34,7 +34,7 @@ import net.corda.testing.dummyCommand
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode
 import net.corda.testing.node.MockNodeParameters
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Test
 import java.nio.file.Paths

node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt

@@ -16,6 +16,8 @@ import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.driver.NodeHandle
 import net.corda.testing.driver.driver
+import net.corda.testing.dummyCommand
+import net.corda.testing.node.startFlow
 import net.corda.testing.node.ClusterSpec
 import net.corda.testing.node.NotarySpec
 import org.junit.Test

node/src/integration-test/kotlin/net/corda/node/services/UserAuthServiceTests.kt

@@ -16,7 +16,7 @@ import net.corda.node.services.config.SecurityConfiguration
 import net.corda.node.services.config.AuthDataSourceType
 import net.corda.nodeapi.internal.config.User
 import net.corda.nodeapi.internal.config.toConfig
-import net.corda.testing.internal.NodeBasedTest
+import net.corda.testing.node.internal.NodeBasedTest
 import net.corda.testing.*
 import org.apache.activemq.artemis.api.core.ActiveMQSecurityException
 import org.junit.After

node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt

@@ -2,12 +2,12 @@ package net.corda.node.services.network
 
 import net.corda.core.node.NodeInfo
 import net.corda.core.utilities.seconds
+import net.corda.testing.node.internal.CompatibilityZoneParams
 import net.corda.testing.ALICE_NAME
 import net.corda.testing.BOB_NAME
-import net.corda.testing.internal.CompatibilityZoneParams
 import net.corda.testing.driver.NodeHandle
 import net.corda.testing.driver.PortAllocation
-import net.corda.testing.internal.internalDriver
+import net.corda.testing.node.internal.internalDriver
 import net.corda.testing.node.network.NetworkMapServer
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After

node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt

@@ -10,7 +10,7 @@ import net.corda.testing.ALICE_NAME
 import net.corda.testing.BOB_NAME
 import net.corda.testing.TestIdentity
 import net.corda.testing.chooseIdentity
-import net.corda.testing.internal.NodeBasedTest
+import net.corda.testing.node.internal.NodeBasedTest
 import org.junit.Before
 import org.junit.Test
 import kotlin.test.assertEquals

node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt

@@ -7,8 +7,10 @@ import net.corda.core.flows.InitiatingFlow
 import net.corda.core.identity.Party
 import net.corda.core.utilities.getOrThrow
 import net.corda.core.utilities.unwrap
+import net.corda.testing.chooseIdentity
+import net.corda.testing.node.internal.NodeBasedTest
+import net.corda.testing.node.startFlow
 import net.corda.testing.*
-import net.corda.testing.internal.NodeBasedTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 

node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt

@@ -1,6 +1,5 @@
 package net.corda.node.utilities.registration
 
-import com.google.common.net.HostAndPort
 import net.corda.core.crypto.Crypto
 import net.corda.core.identity.CordaX500Name
 import net.corda.core.internal.cert
@@ -15,9 +14,9 @@ import net.corda.nodeapi.internal.crypto.X509Utilities
 import net.corda.nodeapi.internal.crypto.X509Utilities.CORDA_CLIENT_CA
 import net.corda.nodeapi.internal.crypto.X509Utilities.CORDA_INTERMEDIATE_CA
 import net.corda.nodeapi.internal.crypto.X509Utilities.CORDA_ROOT_CA
-import net.corda.testing.internal.CompatibilityZoneParams
+import net.corda.testing.node.internal.CompatibilityZoneParams
 import net.corda.testing.driver.PortAllocation
-import net.corda.testing.internal.internalDriver
+import net.corda.testing.node.internal.internalDriver
 import net.corda.testing.node.network.NetworkMapServer
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy

node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt

@@ -26,8 +26,9 @@ import net.corda.nodeapi.RPCApi
 import net.corda.nodeapi.internal.config.User
 import net.corda.nodeapi.internal.config.SSLConfiguration
 import net.corda.testing.*
-import net.corda.testing.internal.NodeBasedTest
+import net.corda.testing.node.internal.NodeBasedTest
 import net.corda.testing.messaging.SimpleMQClient
+import net.corda.testing.node.startFlow
 import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException
 import org.apache.activemq.artemis.api.core.ActiveMQSecurityException
 import org.apache.activemq.artemis.api.core.SimpleString

node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt

@@ -37,6 +37,7 @@ import net.corda.testing.*
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode
 import net.corda.testing.node.MockNodeParameters
+import net.corda.testing.node.testActor
 import org.apache.commons.io.IOUtils
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.junit.After

node/src/test/kotlin/net/corda/node/internal/cordapp/CordappProviderImplTests.kt

@@ -1,7 +1,7 @@
 package net.corda.node.internal.cordapp
 
 import net.corda.core.node.services.AttachmentStorage
-import net.corda.testing.node.MockAttachmentStorage
+import net.corda.testing.services.MockAttachmentStorage
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test

node/src/test/kotlin/net/corda/node/services/NotaryChangeTests.kt

@@ -18,6 +18,7 @@ import net.corda.testing.contracts.DummyContract
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.NotarySpec
 import net.corda.testing.node.MockNodeParameters
+import net.corda.testing.node.startFlow
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.junit.After
 import org.junit.Before

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

@@ -36,6 +36,7 @@ import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.node.*
 import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties
+import net.corda.testing.services.MockAttachmentStorage
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before

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

@@ -24,6 +24,7 @@ import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNodeParameters
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Assert.*
 import org.junit.Before

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

@@ -17,6 +17,7 @@ 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

node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt

@@ -37,6 +37,7 @@ import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode
 import net.corda.testing.node.MockNodeParameters
 import net.corda.testing.node.pumpReceive
+import net.corda.testing.node.startFlow
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType

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

@@ -20,7 +20,7 @@ import net.corda.testing.dummyCommand
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNodeParameters
 import net.corda.testing.singleIdentity
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before

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

@@ -20,6 +20,7 @@ import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNodeParameters
+import net.corda.testing.node.startFlow
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before

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

@@ -30,7 +30,7 @@ import net.corda.testing.chooseIdentity
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.rigorousMock
 import net.corda.testing.node.MockNodeParameters
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import org.junit.After
 import org.junit.Test
 import java.util.*

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

@@ -15,7 +15,7 @@ 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.testNodeConfiguration
+import net.corda.testing.node.testNodeConfiguration
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Before
 import org.junit.Rule

samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt

@@ -23,9 +23,9 @@ import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.ProgressTracker
 import net.corda.core.utilities.getOrThrow
+import net.corda.testing.node.internal.poll
 import net.corda.testing.DUMMY_BANK_B_NAME
 import net.corda.testing.DUMMY_NOTARY_NAME
-import net.corda.testing.internal.poll
 import java.io.InputStream
 import java.net.HttpURLConnection
 import java.net.URL

samples/bank-of-corda-demo/src/integration-test/kotlin/net/corda/bank/BankOfCordaCordformTest.kt

@@ -2,7 +2,7 @@ package net.corda.bank
 
 import net.corda.finance.DOLLARS
 import net.corda.finance.POUNDS
-import net.corda.testing.internal.demorun.deployNodesThen
+import net.corda.testing.node.internal.demorun.deployNodesThen
 import org.junit.Test
 
 class BankOfCordaCordformTest {

samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/BankOfCordaCordform.kt

@@ -13,8 +13,8 @@ import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.node.services.Permissions.Companion.all
 import net.corda.node.services.config.NotaryConfig
 import net.corda.nodeapi.internal.config.User
+import net.corda.testing.node.internal.demorun.*
 import net.corda.testing.BOC_NAME
-import net.corda.testing.internal.demorun.*
 import java.util.*
 import kotlin.system.exitProcess
 

samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/contract/IRSTests.kt

@@ -26,6 +26,8 @@ import net.corda.finance.contracts.Tenor
 import net.corda.node.services.api.IdentityServiceInternal
 import net.corda.testing.*
 import net.corda.testing.node.MockServices
+import net.corda.testing.node.ledger
+import net.corda.testing.node.transaction
 import org.junit.Rule
 import org.junit.Test
 import java.math.BigDecimal

samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt

@@ -7,8 +7,8 @@ import net.corda.testing.driver.DriverParameters
 import net.corda.testing.driver.NodeHandle
 import net.corda.testing.driver.PortAllocation
 import net.corda.testing.driver.WebserverHandle
-import net.corda.testing.internal.*
 import net.corda.testing.node.NotarySpec
+import net.corda.testing.node.internal.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import java.net.ConnectException

samples/network-visualiser/src/main/kotlin/net/corda/netmap/simulation/IRSSimulation.kt

@@ -24,7 +24,7 @@ import net.corda.irs.flows.FixingFlow
 import net.corda.testing.chooseIdentity
 import net.corda.testing.node.InMemoryMessagingNetwork
 import net.corda.testing.node.makeTestIdentityService
-import net.corda.testing.startFlow
+import net.corda.testing.node.startFlow
 import rx.Observable
 import java.time.LocalDate
 import java.util.*

samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt

@@ -11,9 +11,9 @@ import net.corda.node.services.config.NotaryConfig
 import net.corda.node.services.transactions.BFTNonValidatingNotaryService
 import net.corda.node.services.transactions.minCorrectReplicas
 import net.corda.nodeapi.internal.ServiceIdentityGenerator
+import net.corda.testing.node.internal.demorun.*
 import net.corda.testing.ALICE_NAME
 import net.corda.testing.BOB_NAME
-import net.corda.testing.internal.demorun.*
 import java.nio.file.Paths
 
 fun main(args: Array<String>) = BFTNotaryCordform().deployNodes()

samples/notary-demo/src/main/kotlin/net/corda/notarydemo/Clean.kt

@@ -1,6 +1,6 @@
 package net.corda.notarydemo
 
-import net.corda.testing.internal.demorun.clean
+import net.corda.testing.node.internal.demorun.clean
 
 fun main(args: Array<String>) {
     listOf(SingleNotaryCordform(), RaftNotaryCordform(), BFTNotaryCordform()).forEach {

samples/notary-demo/src/main/kotlin/net/corda/notarydemo/CustomNotaryCordform.kt

@@ -3,8 +3,8 @@ package net.corda.notarydemo
 import net.corda.cordform.CordformContext
 import net.corda.cordform.CordformDefinition
 import net.corda.node.services.config.NotaryConfig
+import net.corda.testing.node.internal.demorun.*
 import net.corda.testing.*
-import net.corda.testing.internal.demorun.*
 import java.nio.file.Paths
 
 fun main(args: Array<String>) = CustomNotaryCordform().deployNodes()

samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt

@@ -10,9 +10,9 @@ import net.corda.node.services.config.NotaryConfig
 import net.corda.node.services.config.RaftConfig
 import net.corda.node.services.transactions.RaftValidatingNotaryService
 import net.corda.nodeapi.internal.ServiceIdentityGenerator
+import net.corda.testing.node.internal.demorun.*
 import net.corda.testing.ALICE_NAME
 import net.corda.testing.BOB_NAME
-import net.corda.testing.internal.demorun.*
 import java.nio.file.Paths
 
 fun main(args: Array<String>) = RaftNotaryCordform().deployNodes()

samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt

@@ -5,8 +5,8 @@ import net.corda.cordform.CordformDefinition
 import net.corda.node.services.Permissions.Companion.all
 import net.corda.node.services.config.NotaryConfig
 import net.corda.nodeapi.internal.config.User
+import net.corda.testing.node.internal.demorun.*
 import net.corda.testing.*
-import net.corda.testing.internal.demorun.*
 import java.nio.file.Paths
 
 fun main(args: Array<String>) = SingleNotaryCordform().deployNodes()

samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt

@@ -12,7 +12,7 @@ import net.corda.nodeapi.internal.config.User
 import net.corda.testing.*
 import net.corda.testing.driver.NodeHandle
 import net.corda.testing.driver.driver
-import net.corda.testing.internal.poll
+import net.corda.testing.node.internal.poll
 import net.corda.traderdemo.flow.BuyerFlow
 import net.corda.traderdemo.flow.CommercialPaperIssueFlow
 import net.corda.traderdemo.flow.SellerFlow

testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt

@@ -8,13 +8,13 @@ import net.corda.core.internal.readLines
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.getOrThrow
 import net.corda.node.internal.NodeStartup
+import net.corda.testing.common.internal.ProjectStructure.projectRootDir
+import net.corda.testing.node.internal.addressMustBeBound
+import net.corda.testing.node.internal.addressMustNotBeBound
+import net.corda.testing.node.internal.internalDriver
 import net.corda.testing.DUMMY_BANK_A_NAME
 import net.corda.testing.DUMMY_NOTARY_NAME
-import net.corda.testing.common.internal.ProjectStructure.projectRootDir
 import net.corda.testing.http.HttpApi
-import net.corda.testing.internal.addressMustBeBound
-import net.corda.testing.internal.addressMustNotBeBound
-import net.corda.testing.internal.internalDriver
 import net.corda.testing.node.NotarySpec
 import org.assertj.core.api.Assertions.assertThat
 import org.json.simple.JSONObject

testing/node-driver/src/integration-test/kotlin/net/corda/testing/node/FlowStackSnapshotTest.kt

@@ -1,4 +1,4 @@
-package net.corda.testing
+package net.corda.testing.node
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.client.jackson.JacksonSupport
@@ -11,7 +11,6 @@ import net.corda.core.serialization.CordaSerializable
 import net.corda.node.services.Permissions.Companion.startFlow
 import net.corda.nodeapi.internal.config.User
 import net.corda.testing.driver.driver
-import net.corda.testing.node.MockNetwork
 import org.junit.Ignore
 import org.junit.Test
 import java.nio.file.Path

testing/node-driver/src/integration-test/kotlin/net/corda/testing/node/internal/ProcessUtilitiesTests.kt

@@ -1,4 +1,4 @@
-package net.corda.testing.internal
+package net.corda.testing.node.internal
 
 import org.apache.commons.io.FileUtils
 import org.junit.Rule

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

@@ -14,10 +14,10 @@ import net.corda.node.internal.StartedNode
 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.node.internal.DriverDSLImpl
+import net.corda.testing.node.internal.genericDriver
+import net.corda.testing.node.internal.getTimestampAsDirectoryName
 import net.corda.testing.DUMMY_NOTARY_NAME
-import net.corda.testing.internal.DriverDSLImpl
-import net.corda.testing.internal.genericDriver
-import net.corda.testing.internal.getTimestampAsDirectoryName
 import net.corda.testing.node.NotarySpec
 import java.net.InetSocketAddress
 import java.net.ServerSocket

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

@@ -47,7 +47,6 @@ 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.setGlobalSerialization
-import net.corda.testing.testNodeConfiguration
 import org.apache.activemq.artemis.utils.ReusableLatch
 import org.apache.sshd.common.util.security.SecurityUtils
 import rx.internal.schedulers.CachedThreadScheduler

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

@@ -32,6 +32,8 @@ import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.persistence.DatabaseConfig
 import net.corda.nodeapi.internal.persistence.HibernateConfiguration
 import net.corda.testing.*
+import net.corda.testing.services.MockAttachmentStorage
+import net.corda.testing.services.MockCordappProvider
 import org.bouncycastle.operator.ContentSigner
 import rx.Observable
 import rx.subjects.PublishSubject

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

@@ -1,6 +1,6 @@
 @file:JvmName("NodeTestUtils")
 
-package net.corda.testing
+package net.corda.testing.node
 
 import com.nhaarman.mockito_kotlin.doReturn
 import com.nhaarman.mockito_kotlin.whenever
@@ -22,6 +22,7 @@ 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
 

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

@@ -1,4 +1,4 @@
-package net.corda.testing.internal
+package net.corda.testing.node.internal
 
 import com.google.common.collect.HashMultimap
 import com.google.common.util.concurrent.ThreadFactoryBuilder
@@ -45,11 +45,12 @@ import net.corda.nodeapi.internal.crypto.save
 import net.corda.testing.common.internal.testNetworkParameters
 import net.corda.testing.*
 import net.corda.testing.driver.*
-import net.corda.testing.internal.DriverDSLImpl.ClusterType.NON_VALIDATING_RAFT
-import net.corda.testing.internal.DriverDSLImpl.ClusterType.VALIDATING_RAFT
 import net.corda.testing.node.ClusterSpec
 import net.corda.testing.node.MockServices.Companion.MOCK_VERSION_INFO
 import net.corda.testing.node.NotarySpec
+import net.corda.testing.node.internal.DriverDSLImpl.ClusterType.NON_VALIDATING_RAFT
+import net.corda.testing.node.internal.DriverDSLImpl.ClusterType.VALIDATING_RAFT
+import net.corda.testing.setGlobalSerialization
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import rx.Observable

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

@@ -1,4 +1,4 @@
-package net.corda.testing.internal
+package net.corda.testing.node.internal
 
 import net.corda.core.CordaException
 import net.corda.core.concurrent.CordaFuture

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

@@ -1,4 +1,4 @@
-package net.corda.testing.internal
+package net.corda.testing.node.internal
 
 import net.corda.core.identity.CordaX500Name
 import net.corda.core.internal.concurrent.fork
@@ -17,6 +17,7 @@ import net.corda.nodeapi.internal.config.User
 import net.corda.testing.SerializationEnvironmentRule
 import net.corda.testing.common.internal.testNetworkParameters
 import net.corda.testing.getFreeLocalPorts
+import net.corda.testing.internal.testThreadFactory
 import net.corda.testing.node.MockServices.Companion.MOCK_VERSION_INFO
 import org.apache.logging.log4j.Level
 import org.junit.After

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

@@ -1,4 +1,4 @@
-package net.corda.testing.internal
+package net.corda.testing.node.internal
 
 import net.corda.core.internal.div
 import net.corda.core.internal.exists

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

@@ -1,4 +1,4 @@
-package net.corda.testing.internal
+package net.corda.testing.node.internal
 
 import net.corda.client.mock.Generator
 import net.corda.client.rpc.internal.KryoClientSerializationScheme

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

@@ -1,4 +1,4 @@
-package net.corda.testing.internal
+package net.corda.testing.node.internal
 
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.internal.ThreadBox

testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/demorun/CordformUtils.kt

@@ -1,6 +1,6 @@
 @file:JvmName("CordformUtils")
 
-package net.corda.testing.internal.demorun
+package net.corda.testing.node.internal.demorun
 
 import net.corda.cordform.CordformDefinition
 import net.corda.cordform.CordformNode

testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/demorun/DemoRunner.kt

@@ -1,6 +1,6 @@
 @file:JvmName("DemoRunner")
 
-package net.corda.testing.internal.demorun
+package net.corda.testing.node.internal.demorun
 
 import net.corda.cordform.CordformDefinition
 import net.corda.cordform.CordformNode
@@ -8,7 +8,7 @@ import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.getOrThrow
 import net.corda.testing.driver.JmxPolicy
 import net.corda.testing.driver.PortAllocation
-import net.corda.testing.internal.internalDriver
+import net.corda.testing.node.internal.internalDriver
 
 fun CordformDefinition.clean() {
     System.err.println("Deleting: $nodesDirectory")
@@ -40,7 +40,7 @@ private fun CordformDefinition.runNodes(waitForAllNodesToFinish: Boolean, block:
             .max()!!
     internalDriver(
             isDebug = true,
-            jmxPolicy =  JmxPolicy(true),
+            jmxPolicy = JmxPolicy(true),
             driverDirectory = nodesDirectory,
             extraCordappPackagesToScan = cordappPackages,
             // Notaries are manually specified in Cordform so we don't want the driver automatically starting any

testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/performance/Injectors.kt

@@ -1,9 +1,10 @@
-package net.corda.testing.internal.performance
+package net.corda.testing.node.internal.performance
 
 import com.codahale.metrics.Gauge
 import com.codahale.metrics.MetricRegistry
 import com.google.common.base.Stopwatch
-import net.corda.testing.internal.ShutdownManager
+import net.corda.testing.internal.performance.Rate
+import net.corda.testing.node.internal.ShutdownManager
 import java.time.Duration
 import java.util.*
 import java.util.concurrent.CountDownLatch

testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/performance/Reporter.kt

@@ -1,9 +1,9 @@
-package net.corda.testing.internal.performance
+package net.corda.testing.node.internal.performance
 
 import com.codahale.metrics.ConsoleReporter
 import com.codahale.metrics.JmxReporter
 import com.codahale.metrics.MetricRegistry
-import net.corda.testing.internal.ShutdownManager
+import net.corda.testing.node.internal.ShutdownManager
 import java.util.concurrent.TimeUnit
 import javax.management.ObjectName
 import kotlin.concurrent.thread

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

@@ -13,8 +13,8 @@ import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.transactions.WireTransaction
 import net.corda.testing.contracts.DummyContract
-import net.corda.testing.node.MockAttachmentStorage
+import net.corda.testing.services.MockAttachmentStorage
-import net.corda.testing.node.MockCordappProvider
+import net.corda.testing.services.MockCordappProvider
 import java.io.InputStream
 import java.security.PublicKey
 import java.util.*

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

@@ -1,9 +0,0 @@
-package net.corda.testing.node
-
-import net.corda.core.crypto.SecureHash
-import net.corda.core.internal.AbstractAttachment
-
-/**
- * An attachment with only an ID and an empty data array
- */
-class MockAttachment(override val id: SecureHash = SecureHash.zeroHash) : AbstractAttachment({ ByteArray(0) })

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

@@ -1,4 +1,4 @@
-package net.corda.testing.node
+package net.corda.testing.services
 
 import net.corda.core.contracts.Attachment
 import net.corda.core.crypto.SecureHash

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

@@ -1,4 +1,4 @@
-package net.corda.testing.node
+package net.corda.testing.services
 
 import net.corda.core.contracts.ContractClassName
 import net.corda.core.cordapp.Cordapp

verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt

@@ -26,8 +26,8 @@ import net.corda.testing.driver.JmxPolicy
 import net.corda.testing.driver.NodeHandle
 import net.corda.testing.driver.PortAllocation
 import net.corda.testing.driver.driver
-import net.corda.testing.internal.*
 import net.corda.testing.node.NotarySpec
+import net.corda.testing.node.internal.*
 import org.apache.activemq.artemis.api.core.SimpleString
 import org.apache.activemq.artemis.api.core.client.ActiveMQClient
 import org.apache.activemq.artemis.api.core.client.ClientProducer

webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt

@@ -4,8 +4,8 @@ import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.getOrThrow
 import net.corda.testing.DUMMY_BANK_A_NAME
 import net.corda.testing.driver.WebserverHandle
-import net.corda.testing.internal.addressMustBeBound
+import net.corda.testing.node.internal.addressMustBeBound
-import net.corda.testing.internal.addressMustNotBeBound
+import net.corda.testing.node.internal.addressMustNotBeBound
 import net.corda.testing.driver.driver
 import org.junit.Test
 import java.util.concurrent.Executors