Merge branch 'master' of github.com:bculkin2442/bjc-utils2

4 files changed, 89 insertions, 5 deletions

diff --git a/base/src/test/java/bjc/utils/data/BooleanToggleTest.java b/base/src/test/java/bjc/utils/data/BooleanToggleTest.java
new file mode 100644
index 0000000..f2b4994
--- /dev/null
+++ b/base/src/test/java/bjc/utils/data/BooleanToggleTest.java
@@ -0,0 +1,36 @@
+package bjc.utils.data;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * Test for boolean toggles.
+ * @author bjculkin
+ *
+ */
+public class BooleanToggleTest {
+
+	/**
+	 * Test that boolean toggles work right.
+	 */
+	@Test
+	public void test() {
+		BooleanToggle tog = new BooleanToggle();
+		
+		// Check initial value is false.
+		assertEquals(false, tog.peek());
+		// Check that 'get' returns the old value
+		assertEquals(false, tog.get());
+		// Check that 'get' swaps the value
+		assertEquals(true, tog.peek());
+		// Check that we can round-trip back.
+		assertEquals(true, tog.get());
+		assertEquals(false, tog.peek());
+		
+		tog.set(true);
+		
+		// Check set works
+		assertEquals(true, tog.peek());
+	}
+}
diff --git a/base/src/test/java/bjc/utils/data/CircularIteratorTest.java b/base/src/test/java/bjc/utils/data/CircularIteratorTest.java
new file mode 100644
index 0000000..c08bbb1
--- /dev/null
+++ b/base/src/test/java/bjc/utils/data/CircularIteratorTest.java
@@ -0,0 +1,50 @@
+package bjc.utils.data;
+
+import static org.junit.Assert.*;
+import static bjc.utils.funcutils.TestUtils.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+/**
+ * Test for circular iterators.,
+ * 
+ * @author bjculkin
+ *
+ */
+public class CircularIteratorTest {
+
+	/**
+	 * Test regular repetition of the entire iterator.
+	 */
+	@Test
+	public void testRegular() {
+		List<String> lst = Arrays.asList("a", "b", "c");
+
+		CircularIterator<String> itr = new CircularIterator<>(lst);
+
+		// Check we get initial values correctly, and have more remaining
+		assertIteratorEquals(itr, true, "a", "b", "c");
+
+		// Check we repeat correctly, and can still repeat
+		assertIteratorEquals(itr, true, "a", "b", "c");
+	}
+
+	/**
+	 * Test that the last element repeats correctly.
+	 */
+	@Test
+	public void testRepLast() {
+		List<String> lst = Arrays.asList("a", "b", "c");
+
+		CircularIterator<String> itr = new CircularIterator<>(lst, false);
+
+		// Check we get initial values correctly, and have more remaining
+		assertIteratorEquals(itr, true, "a", "b", "c");
+
+		// Check we repeat correctly, and can still repeat
+		assertIteratorEquals(itr, true, "c", "c", "c");
+	}
+}
diff --git a/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java b/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java
index 11e104c..2092ae0 100644
--- a/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java
+++ b/base/src/test/java/bjc/utils/ioutils/ReportWriterTest.java
@@ -1,4 +1,4 @@
-package bjc.utils.test.ioutils;
+package bjc.utils.ioutils;
 
 import static org.junit.Assert.*;
 
@@ -19,9 +19,7 @@ import org.junit.Test;
 public class ReportWriterTest {
 	@Test
 	public void testWriteString() {
-		ReportWriter rw = new ReportWriter(new StringWriter());
-
-		try {
+		try (ReportWriter rw = new ReportWriter(new StringWriter())) {
 			rw.write("foo");
 
 			assertEquals("foo", rw.toString());
diff --git a/base/src/test/java/bjc/utils/test/parserutils/TokenUtilsTest.java b/base/src/test/java/bjc/utils/parserutils/TokenUtilsTest.java
index 99593ed..08606b3 100644
--- a/base/src/test/java/bjc/utils/test/parserutils/TokenUtilsTest.java
+++ b/base/src/test/java/bjc/utils/parserutils/TokenUtilsTest.java
@@ -1,4 +1,4 @@
-package bjc.utils.test.parserutils;
+package bjc.utils.parserutils;
 
 import static bjc.utils.parserutils.TokenUtils.descapeString;
 import static bjc.utils.parserutils.TokenUtils.removeDQuotedStrings;