10 files changed, 82 insertions, 10 deletions
diff --git a/base/src/test/java/bjc/utils/cli/objects/CommandTest.java b/base/src/test/java/bjc/utils/test/cli/objects/CommandTest.java
index 2bebaa9..1e253be 100644
--- a/base/src/test/java/bjc/utils/cli/objects/CommandTest.java
+++ b/base/src/test/java/bjc/utils/test/cli/objects/CommandTest.java
@@ -1,9 +1,11 @@
-package bjc.utils.cli.objects;
+package bjc.utils.test.cli.objects;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import bjc.utils.cli.objects.Command;
+
 /**
  * Test that CLI command objects work correctly.
  * 
diff --git a/base/src/test/java/bjc/utils/data/BooleanToggleTest.java b/base/src/test/java/bjc/utils/test/data/BooleanToggleTest.java
index 66f44c0..1373389 100644
--- a/base/src/test/java/bjc/utils/data/BooleanToggleTest.java
+++ b/base/src/test/java/bjc/utils/test/data/BooleanToggleTest.java
@@ -1,9 +1,11 @@
-package bjc.utils.data;
+package bjc.utils.test.data;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import bjc.utils.data.BooleanToggle;
+
 /**
  * Test for boolean toggles.
  * @author bjculkin
diff --git a/base/src/test/java/bjc/utils/data/CircularIteratorTest.java b/base/src/test/java/bjc/utils/test/data/CircularIteratorTest.java
index 5e20a17..7aae211 100644
--- a/base/src/test/java/bjc/utils/data/CircularIteratorTest.java
+++ b/base/src/test/java/bjc/utils/test/data/CircularIteratorTest.java
@@ -1,4 +1,4 @@
-package bjc.utils.data;
+package bjc.utils.test.data;
 
 import static bjc.utils.funcutils.TestUtils.assertIteratorEquals;
 
@@ -7,6 +7,8 @@ import java.util.List;
 
 import org.junit.Test;
 
+import bjc.utils.data.CircularIterator;
+
 /**
  * Test for circular iterators.,
  * 
diff --git a/base/src/test/java/bjc/utils/data/QueuedIteratorTest.java b/base/src/test/java/bjc/utils/test/data/QueuedIteratorTest.java
index bbbca56..b34723e 100644
--- a/base/src/test/java/bjc/utils/data/QueuedIteratorTest.java
+++ b/base/src/test/java/bjc/utils/test/data/QueuedIteratorTest.java
@@ -1,4 +1,4 @@
-package bjc.utils.data;
+package bjc.utils.test.data;
 
 import static bjc.utils.data.QueuedIterator.queued;
 import static bjc.utils.funcutils.TestUtils.assertIteratorEquals;
@@ -6,6 +6,8 @@ import static java.util.Arrays.asList;
 
 import org.junit.Test;
 
+import bjc.utils.data.QueuedIterator;
+
 /**
  * Test of QueuedIterator.
  * 
diff --git a/base/src/test/java/bjc/utils/funcutils/IteratorUtilsTest.java b/base/src/test/java/bjc/utils/test/funcutils/IteratorUtilsTest.java
index bf88038..965582b 100644
--- a/base/src/test/java/bjc/utils/funcutils/IteratorUtilsTest.java
+++ b/base/src/test/java/bjc/utils/test/funcutils/IteratorUtilsTest.java
@@ -1,4 +1,4 @@
-package bjc.utils.funcutils;
+package bjc.utils.test.funcutils;
 
 import org.junit.Test;
 
diff --git a/base/src/test/java/bjc/utils/funcutils/StringUtilsTest.java b/base/src/test/java/bjc/utils/test/funcutils/StringUtilsTest.java
index 434912c..b53d3e9 100644
--- a/base/src/test/java/bjc/utils/funcutils/StringUtilsTest.java
+++ b/base/src/test/java/bjc/utils/test/funcutils/StringUtilsTest.java
@@ -1,4 +1,4 @@
-package bjc.utils.funcutils;
+package bjc.utils.test.funcutils;
 
 import java.io.StringReader;
 
diff --git a/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java b/base/src/test/java/bjc/utils/test/ioutils/LevelSplitterTest.java
index bdc5d8d..aadea72 100644
--- a/base/src/test/java/bjc/utils/ioutils/LevelSplitterTest.java
+++ b/base/src/test/java/bjc/utils/test/ioutils/LevelSplitterTest.java
@@ -1,10 +1,12 @@
-package bjc.utils.ioutils;
+package bjc.utils.test.ioutils;
 
 import static bjc.utils.funcutils.TestUtils.assertListEquals;
-import static bjc.utils.ioutils.LevelSplitterTest.RXPair.pair;
+import static bjc.utils.test.ioutils.LevelSplitterTest.RXPair.pair;
 
 import org.junit.Test;
 
+import bjc.utils.ioutils.LevelSplitter;
+
 /**
  * Test of LevelSplitter.
  * 
diff --git a/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java b/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java
index a9f7072..4918b95 100644
--- a/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java
+++ b/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java
@@ -1,4 +1,4 @@
-package bjc.utils.ioutils;
+package bjc.utils.test.ioutils;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,6 +7,8 @@ import java.io.StringWriter;
 
 import org.junit.Test;
 
+import bjc.utils.ioutils.ReportWriter;
+
 /**
  * Tests for ReportWriter.
  * 
diff --git a/base/src/test/java/bjc/utils/test/ioutils/SimplePropertiesTest.java b/base/src/test/java/bjc/utils/test/ioutils/SimplePropertiesTest.java
new file mode 100644
index 0000000..81f7ac8
--- /dev/null
+++ b/base/src/test/java/bjc/utils/test/ioutils/SimplePropertiesTest.java
@@ -0,0 +1,60 @@
+package bjc.utils.test.ioutils;
+
+import static org.junit.Assert.*;
+
+import java.io.StringReader;
+
+import org.junit.Test;
+
+import bjc.utils.ioutils.SimpleProperties;
+import bjc.utils.ioutils.SimpleProperties.DuplicateKeys;
+import bjc.utils.ioutils.SimpleProperties.InvalidLineFormat;
+
+/**
+ * Tests for SimpleProperties.
+ * 
+ * @author Ben Culkin
+ *
+ */
+public class SimplePropertiesTest {
+
+	@Test
+	public void testSimpleProperties() {
+		SimpleProperties props = new SimpleProperties();
+		
+		assertEquals(0, props.size());
+		assertTrue(props.isEmpty());
+	}
+
+	@Test
+	public void testLoadFrom() {
+		SimpleProperties props = new SimpleProperties();
+		
+		StringReader rdr = new StringReader("a a\nb b\nc c1\nc c2\n#c c3");
+		
+		props.loadFrom(rdr, true);
+		
+		assertEquals(3, props.size());
+		assertEquals("a", props.get("a"));
+		assertEquals("b", props.get("b"));
+		assertEquals("c2", props.get("c"));
+	}
+
+	@Test(expected = DuplicateKeys.class)
+	public void testDuplicateKeys() {
+		SimpleProperties props = new SimpleProperties();
+		
+		StringReader rdr = new StringReader("a a\nb b\nb b");
+		
+		props.loadFrom(rdr, false);
+	}
+	
+	@Test(expected = InvalidLineFormat.class)
+	public void testInvalidFormat() {
+		SimpleProperties props = new SimpleProperties();
+		
+		StringReader rdr = new StringReader("a");
+		
+		props.loadFrom(rdr, false);
+	}
+}
+\ No newline at end of file
diff --git a/base/src/test/java/bjc/utils/parserutils/TokenUtilsTest.java b/base/src/test/java/bjc/utils/test/parserutils/TokenUtilsTest.java
index 08606b3..99593ed 100644
--- a/base/src/test/java/bjc/utils/parserutils/TokenUtilsTest.java
+++ b/base/src/test/java/bjc/utils/test/parserutils/TokenUtilsTest.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils;
+package bjc.utils.test.parserutils;
 
 import static bjc.utils.parserutils.TokenUtils.descapeString;
 import static bjc.utils.parserutils.TokenUtils.removeDQuotedStrings;