Refactor test structure

Tests are now in a 'test' sub-package, so it is clear that they are
indeed test code, not just disjoint parts of the main code

2 files changed, 0 insertions, 74 deletions

diff --git a/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java b/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java
deleted file mode 100644
index bdc5d8d..0000000
--- a/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package bjc.utils.ioutils;
-
-import static bjc.utils.funcutils.TestUtils.assertListEquals;
-import static bjc.utils.ioutils.LevelSplitterTest.RXPair.pair;
-
-import org.junit.Test;
-
-/**
- * Test of LevelSplitter.
- * 
- * @author bjculkin
- *
- */
-public class LevelSplitterTest {
-	static final class RXPair {
-		public String inp;
-		public String[] outp;
-
-		public RXPair(String inp, String... outp) {
-			this.inp = inp;
-			this.outp = outp;
-		}
-
-		public static RXPair pair(String inp, String... outp) {
-			return new RXPair(inp, outp);
-		}
-	}
-
-	/**
-	 * Test regex splitter.
-	 */
-	@Test
-	public void testRXSplit() {
-		//LevelSplitter splitter = LevelSplitter.def;
-
-		// Check generic splitting works
-		assertRXSplit("\\s+", pair("", ""), pair("a", "a"), pair("a b", "a", "b"), pair("a  b", "a", "b"),
-				pair("a\t \tb", "a", "b"));
-	}
-
-	private static void assertRXSplit(String pat, RXPair... pairs) {
-		for (RXPair pair : pairs) {
-			assertListEquals(LevelSplitter.def.levelSplitRX(pair.inp, pat), pair.outp);
-		}
-	}
-}
diff --git a/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java b/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java
deleted file mode 100644
index a9f7072..0000000
--- a/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package bjc.utils.ioutils;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-import org.junit.Test;
-
-/**
- * Tests for ReportWriter.
- * 
- * @author EVE
- *
- */
-@SuppressWarnings("javadoc")
-public class ReportWriterTest {
-	@Test
-	public void testWriteString() {
-		try (ReportWriter rw = new ReportWriter(new StringWriter())) {
-			rw.write("foo");
-
-			assertEquals("foo", rw.toString());
-		} catch (IOException ioex) {
-
-		}
-	}
-}