From f0557e106d0e8c7034d1a417ff72cbfef31a3532 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@plan99.net>
Date: Wed, 18 Nov 2015 13:29:18 +0100
Subject: [PATCH] Minor: reorganise the test directory to match the src
 directory

---
 tests/contracts/CashTests.kt                              | 2 +-
 tests/contracts/CommercialPaperTests.kt                   | 2 +-
 tests/{ => core}/serialization/KryoTests.kt               | 3 +--
 .../serialization/TransactionSerializationTests.kt        | 8 ++++----
 tests/{ => core}/testutils/TestUtils.kt                   | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)
 rename tests/{ => core}/serialization/KryoTests.kt (96%)
 rename tests/{ => core}/serialization/TransactionSerializationTests.kt (94%)
 rename tests/{ => core}/testutils/TestUtils.kt (99%)

diff --git a/tests/contracts/CashTests.kt b/tests/contracts/CashTests.kt
index edb819d4f0..d373a34983 100644
--- a/tests/contracts/CashTests.kt
+++ b/tests/contracts/CashTests.kt
@@ -2,8 +2,8 @@ import contracts.Cash
 import contracts.DummyContract
 import contracts.InsufficientBalanceException
 import core.*
+import core.testutils.*
 import org.junit.Test
-import testutils.*
 import java.security.PublicKey
 import java.util.*
 import kotlin.test.assertEquals
diff --git a/tests/contracts/CommercialPaperTests.kt b/tests/contracts/CommercialPaperTests.kt
index 3294cd6bad..1bcdb92220 100644
--- a/tests/contracts/CommercialPaperTests.kt
+++ b/tests/contracts/CommercialPaperTests.kt
@@ -4,8 +4,8 @@ import core.DOLLARS
 import core.InstitutionReference
 import core.OpaqueBytes
 import core.days
+import core.testutils.*
 import org.junit.Test
-import testutils.*
 
 // TODO: Finish this off.
 
diff --git a/tests/serialization/KryoTests.kt b/tests/core/serialization/KryoTests.kt
similarity index 96%
rename from tests/serialization/KryoTests.kt
rename to tests/core/serialization/KryoTests.kt
index b58671fee3..783cb3f293 100644
--- a/tests/serialization/KryoTests.kt
+++ b/tests/core/serialization/KryoTests.kt
@@ -1,7 +1,6 @@
-package serialization
+package core.serialization
 
 import com.esotericsoftware.kryo.Kryo
-import core.serialization.*
 import org.junit.Test
 import java.time.Instant
 import kotlin.test.assertEquals
diff --git a/tests/serialization/TransactionSerializationTests.kt b/tests/core/serialization/TransactionSerializationTests.kt
similarity index 94%
rename from tests/serialization/TransactionSerializationTests.kt
rename to tests/core/serialization/TransactionSerializationTests.kt
index 182c050bfb..9e28527ac2 100644
--- a/tests/serialization/TransactionSerializationTests.kt
+++ b/tests/core/serialization/TransactionSerializationTests.kt
@@ -1,12 +1,12 @@
-package serialization
+package core.serialization
 
 import contracts.Cash
 import core.*
+import core.testutils.DUMMY_PUBKEY_1
+import core.testutils.MINI_CORP
+import core.testutils.TestUtils
 import org.junit.Before
 import org.junit.Test
-import testutils.DUMMY_PUBKEY_1
-import testutils.MINI_CORP
-import testutils.TestUtils
 import java.security.SignatureException
 import kotlin.test.assertFailsWith
 
diff --git a/tests/testutils/TestUtils.kt b/tests/core/testutils/TestUtils.kt
similarity index 99%
rename from tests/testutils/TestUtils.kt
rename to tests/core/testutils/TestUtils.kt
index 2e366ffc66..a5a977ff8d 100644
--- a/tests/testutils/TestUtils.kt
+++ b/tests/core/testutils/TestUtils.kt
@@ -1,4 +1,4 @@
-package testutils
+package core.testutils
 
 import contracts.*
 import core.*