From 5b2157cdc8783faf35ee512c04ec2b9c7b00b95d Mon Sep 17 00:00:00 2001
From: Andras Slemmer <andras.slemmer@r3cev.com>
Date: Thu, 1 Sep 2016 12:01:36 +0100
Subject: [PATCH] client, test-utils: Move Expect dsl to test-utils

---
 .../test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt  | 2 +-
 .../src/main/kotlin/com/r3corda}/testing/Expect.kt              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename {client/src/main/kotlin/com/r3corda/client => test-utils/src/main/kotlin/com/r3corda}/testing/Expect.kt (99%)

diff --git a/client/src/test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt b/client/src/test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt
index 9626185e28..64474964b5 100644
--- a/client/src/test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt
+++ b/client/src/test/kotlin/com/r3corda/client/WalletMonitorClientTests.kt
@@ -1,7 +1,6 @@
 package com.r3corda.client
 
 import co.paralleluniverse.strands.SettableFuture
-import com.r3corda.client.testing.*
 import com.r3corda.core.contracts.*
 import com.r3corda.core.serialization.OpaqueBytes
 import com.r3corda.node.driver.driver
@@ -10,6 +9,7 @@ import com.r3corda.node.services.monitor.ServiceToClientEvent
 import com.r3corda.node.services.monitor.TransactionBuildResult
 import com.r3corda.node.services.transactions.SimpleNotaryService
 import com.r3corda.node.utilities.AddOrRemove
+import com.r3corda.testing.*
 import org.junit.Test
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
diff --git a/client/src/main/kotlin/com/r3corda/client/testing/Expect.kt b/test-utils/src/main/kotlin/com/r3corda/testing/Expect.kt
similarity index 99%
rename from client/src/main/kotlin/com/r3corda/client/testing/Expect.kt
rename to test-utils/src/main/kotlin/com/r3corda/testing/Expect.kt
index f3d1113dc8..4aeab2b4d1 100644
--- a/client/src/main/kotlin/com/r3corda/client/testing/Expect.kt
+++ b/test-utils/src/main/kotlin/com/r3corda/testing/Expect.kt
@@ -1,4 +1,4 @@
-package com.r3corda.client.testing
+package com.r3corda.testing
 
 import co.paralleluniverse.strands.SettableFuture
 import org.slf4j.Logger