20 files changed, 234 insertions, 24 deletions

diff --git a/src/test/java/bjc/TestUtils.java b/src/test/java/bjc/test/TestUtils.java
index 312ebaf..04cdf70 100644
--- a/src/test/java/bjc/TestUtils.java
+++ b/src/test/java/bjc/test/TestUtils.java
@@ -1,4 +1,4 @@
-package bjc;
+package bjc.test;
 
 import java.util.*;
 
@@ -21,7 +21,13 @@ public class TestUtils {
 	public static <T> void assertIteratorEquals(Iterator<T> src, T... vals) {
 		for (int i = 0; i < vals.length; i++) {
 			if (src.hasNext()) {
-				assertEquals(vals[i], src.next());
+				T actNext = src.next();
+				T expNext = vals[i];
+				
+				String fmt = "mismatch at index %d";
+				String msg = String.format(fmt, i);
+				
+				assertEquals(msg, expNext, actNext);
 			} else {
 				String msg = String.format("not enough values: got %d, wanted %d", i,
 						vals.length);
diff --git a/src/test/java/bjc/data/ArrayIteratorTest.java b/src/test/java/bjc/test/data/ArrayIteratorTest.java
index 223eea2..c446f53 100644
--- a/src/test/java/bjc/data/ArrayIteratorTest.java
+++ b/src/test/java/bjc/test/data/ArrayIteratorTest.java
@@ -1,12 +1,14 @@
 /**
  * 
  */
-package bjc.data;
+package bjc.test.data;
 
 import static org.junit.Assert.*;
 
 import org.junit.*;
 
+import bjc.data.ArrayIterator;
+
 /**
  * Test ArrayIterator
  * @author Ben Culkin
diff --git a/src/test/java/bjc/data/BooleanToggleTest.java b/src/test/java/bjc/test/data/BooleanToggleTest.java
index 0b0937f..7577340 100644
--- a/src/test/java/bjc/data/BooleanToggleTest.java
+++ b/src/test/java/bjc/test/data/BooleanToggleTest.java
@@ -1,9 +1,11 @@
-package bjc.data;
+package bjc.test.data;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
+import bjc.data.BooleanToggle;
+
 /**
  * Test for boolean toggles.
  * 
diff --git a/src/test/java/bjc/data/CircularIteratorTest.java b/src/test/java/bjc/test/data/CircularIteratorTest.java
index 8091e1c..cb7b55a 100644
--- a/src/test/java/bjc/data/CircularIteratorTest.java
+++ b/src/test/java/bjc/test/data/CircularIteratorTest.java
@@ -1,10 +1,13 @@
-package bjc.data;
+package bjc.test.data;
 
-import static bjc.TestUtils.*;
+import static bjc.test.TestUtils.*;
 import java.util.*;
 
 import org.junit.Test;
 
+import bjc.data.ArrayIterator;
+import bjc.data.CircularIterator;
+
 /**
  * Test for circular iterators.,
  *
diff --git a/src/test/java/bjc/data/EitherTest.java b/src/test/java/bjc/test/data/EitherTest.java
index ef2d12b..04cff09 100644
--- a/src/test/java/bjc/data/EitherTest.java
+++ b/src/test/java/bjc/test/data/EitherTest.java
@@ -1,4 +1,4 @@
-package bjc.data;
+package bjc.test.data;
 
 import static org.junit.Assert.*;
 
@@ -6,6 +6,8 @@ import java.util.*;
 
 import org.junit.*;
 
+import bjc.data.Either;
+
 @SuppressWarnings("javadoc")
 public class EitherTest
 {
diff --git a/src/test/java/bjc/test/data/GeneratingIteratorTest.java b/src/test/java/bjc/test/data/GeneratingIteratorTest.java
new file mode 100644
index 0000000..e1c5fbd
--- /dev/null
+++ b/src/test/java/bjc/test/data/GeneratingIteratorTest.java
@@ -0,0 +1,20 @@
+package bjc.test.data;
+
+import static bjc.test.TestUtils.assertIteratorEquals;
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import bjc.data.GeneratingIterator;
+
+@SuppressWarnings("javadoc")
+public class GeneratingIteratorTest {
+
+	@Test
+	public void test() {
+		Iterator<String> itr = new GeneratingIterator<>("", str -> str + "A", str -> str.equalsIgnoreCase("AAAA"));
+		
+		assertIteratorEquals(false, itr, "A", "AA", "AAA", "AAAA");
+	}
+
+}
diff --git a/src/test/java/bjc/test/data/MarkListIteratorTest.java b/src/test/java/bjc/test/data/MarkListIteratorTest.java
new file mode 100644
index 0000000..366755f
--- /dev/null
+++ b/src/test/java/bjc/test/data/MarkListIteratorTest.java
@@ -0,0 +1,42 @@
+package bjc.test.data;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import bjc.data.MarkListIterator;
+import bjc.test.TestUtils;
+
+/**
+ * Tests for {@link MarkListIterator}
+ * @author bjcul
+ *
+ */
+@SuppressWarnings("javadoc")
+public class MarkListIteratorTest {
+
+	@Test
+	public void test() {
+		List<String> list1 = Arrays.asList("a", "b", "c");
+		
+		MarkListIterator<String> itr1 = new MarkListIterator<>(list1);
+		itr1.mark();
+		
+		assertFalse(itr1.hasPrevious());
+		assertTrue(itr1.hasNext());
+		TestUtils.assertIteratorEquals(itr1, "a", "b", "c");
+		
+		assertTrue(itr1.hasPrevious());
+		assertFalse(itr1.hasNext());
+		
+		itr1.rollback(false);
+		
+		assertFalse(itr1.hasPrevious());
+		assertTrue(itr1.hasNext());
+		TestUtils.assertIteratorEquals(itr1, "a", "b", "c");
+	}
+
+}
diff --git a/src/test/java/bjc/data/QueuedIteratorTest.java b/src/test/java/bjc/test/data/QueuedIteratorTest.java
index b880f97..a059e96 100644
--- a/src/test/java/bjc/data/QueuedIteratorTest.java
+++ b/src/test/java/bjc/test/data/QueuedIteratorTest.java
@@ -1,10 +1,12 @@
-package bjc.data;
+package bjc.test.data;
 
 import static java.util.Arrays.asList;
 
 import org.junit.Test;
 
-import static bjc.TestUtils.*;
+import bjc.data.QueuedIterator;
+
+import static bjc.test.TestUtils.*;
 import static bjc.data.QueuedIterator.queued;
 
 /**
diff --git a/src/test/java/bjc/test/data/SimpleTreeTest.java b/src/test/java/bjc/test/data/SimpleTreeTest.java
new file mode 100644
index 0000000..db7457b
--- /dev/null
+++ b/src/test/java/bjc/test/data/SimpleTreeTest.java
@@ -0,0 +1,29 @@
+package bjc.test.data;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import bjc.data.SimpleTree;
+
+public class SimpleTreeTest {
+
+	@Test
+	public void test() {
+		SimpleTree<String> tree1 = new SimpleTree<>("a");
+		SimpleTree<String> tree2 = new SimpleTree<>("a");
+		
+		assertEquals(tree1, tree2);
+		
+		tree1.addChild("b");
+		
+		assertNotEquals(tree1, tree2);
+		
+		tree2.addChild("b");
+	
+		tree1.equals(tree2);
+		
+		assertEquals(tree1, tree2);
+	}
+
+}
diff --git a/src/test/java/bjc/test/data/TransformIteratorTest.java b/src/test/java/bjc/test/data/TransformIteratorTest.java
new file mode 100644
index 0000000..8a10b10
--- /dev/null
+++ b/src/test/java/bjc/test/data/TransformIteratorTest.java
@@ -0,0 +1,22 @@
+package bjc.test.data;
+
+import static bjc.test.TestUtils.assertIteratorEquals;
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import bjc.data.ArrayIterator;
+import bjc.data.TransformIterator;
+
+@SuppressWarnings("javadoc")
+public class TransformIteratorTest {
+
+	@Test
+	public void test() {
+		Iterator<String> itr1 = new ArrayIterator<>("a", "b", "c");
+		Iterator<String> itr2 = new TransformIterator<>(itr1, str -> str + "X");
+		
+		assertIteratorEquals(itr2, "aX", "bX", "cX");
+	}
+
+}
diff --git a/src/test/java/bjc/test/esodata/AbbrevTreeTest.java b/src/test/java/bjc/test/esodata/AbbrevTreeTest.java
new file mode 100644
index 0000000..1332b63
--- /dev/null
+++ b/src/test/java/bjc/test/esodata/AbbrevTreeTest.java
@@ -0,0 +1,46 @@
+package bjc.test.esodata;
+
+import static org.junit.Assert.*;
+import static bjc.test.TestUtils.*;
+
+import org.junit.Test;
+
+import bjc.esodata.AbbrevTree;
+
+@SuppressWarnings("javadoc")
+public class AbbrevTreeTest {
+	private static class StringTree extends AbbrevTree<String, String> {
+		// Alias type
+		public StringTree(AbbrevTree<String, String> parent, String label, String data) {
+			super(parent, label, data);
+		}
+
+		public StringTree(String label, String data) {
+			super(label, data);
+		}		
+	}
+	
+	@Test
+	public void testGet() {
+		StringTree root = new StringTree("root", "a");
+		
+		StringTree leaf1 = new StringTree(root, "leaf", "b1");
+		StringTree node1 = new StringTree(root, "node1", "b2");
+		
+		StringTree node2 = new StringTree(node1, "node2", "c1");
+		StringTree leaf2 = new StringTree(node1, "leaf", "c2");
+		
+		var list1 = root.nodes("node2");
+		assertEquals(1, list1.size());
+		assertIteratorSet(false, list1.iterator(), node2);
+		
+		var list2 = root.nodes("leaf");
+		assertEquals(2, list2.size());
+		assertIteratorSet(false, list2.iterator(), leaf1, leaf2);
+		
+		var list3 = root.nodes("leaf", "node1");
+		assertEquals(1, list3.size());
+		assertIteratorSet(false, list3.iterator(), leaf2);
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/bjc/esodata/MinMaxListTest.java b/src/test/java/bjc/test/esodata/MinMaxListTest.java
index 08901f0..0337ef7 100644
--- a/src/test/java/bjc/esodata/MinMaxListTest.java
+++ b/src/test/java/bjc/test/esodata/MinMaxListTest.java
@@ -1,4 +1,4 @@
-package bjc.esodata;
+package bjc.test.esodata;
 
 import static org.junit.Assert.*;
 
@@ -6,6 +6,8 @@ import java.util.*;
 
 import org.junit.*;
 
+import bjc.esodata.MinMaxList;
+
 @SuppressWarnings("javadoc")
 public class MinMaxListTest {
 	private final static Comparator<Integer> intComparator = (lhs, rhs) -> lhs - rhs;;
diff --git a/src/test/java/bjc/esodata/NestListTest.java b/src/test/java/bjc/test/esodata/NestListTest.java
index ff3723e..c97859e 100644
--- a/src/test/java/bjc/esodata/NestListTest.java
+++ b/src/test/java/bjc/test/esodata/NestListTest.java
@@ -1,4 +1,4 @@
-package bjc.esodata;
+package bjc.test.esodata;
 
 import static org.junit.Assert.*;
 
@@ -6,7 +6,8 @@ import java.util.*;
 
 import org.junit.*;
 
-import bjc.*;
+import bjc.esodata.NestList;
+import bjc.test.TestUtils;
 
 @SuppressWarnings("javadoc")
 public class NestListTest
diff --git a/src/test/java/bjc/esodata/StackTest.java b/src/test/java/bjc/test/esodata/StackTest.java
index b4b98cc..7f896a7 100644
--- a/src/test/java/bjc/esodata/StackTest.java
+++ b/src/test/java/bjc/test/esodata/StackTest.java
@@ -1,8 +1,11 @@
-package bjc.esodata;
+package bjc.test.esodata;
 
 import org.junit.Test;
 
-import static bjc.TestUtils.*;
+import bjc.esodata.SimpleStack;
+import bjc.esodata.Stack;
+
+import static bjc.test.TestUtils.*;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/bjc/esodata/ThresholdSetTest.java b/src/test/java/bjc/test/esodata/ThresholdSetTest.java
index c9403da..142a641 100644
--- a/src/test/java/bjc/esodata/ThresholdSetTest.java
+++ b/src/test/java/bjc/test/esodata/ThresholdSetTest.java
@@ -1,8 +1,10 @@
-package bjc.esodata;
+package bjc.test.esodata;
 
 import org.junit.Test;
 
-import static bjc.TestUtils.*;
+import bjc.esodata.ThresholdSet;
+
+import static bjc.test.TestUtils.*;
 
 import static bjc.esodata.ThresholdSet.*;
 
@@ -20,7 +22,7 @@ public class ThresholdSetTest {
 		ThresholdSet<String> thst = TS("a", "b");
 
 		assertIteratorSet(false, thst.setView().iterator(), "a", "b");
-		assertEquals(thst.setSize(), 2);
+		assertEquals(thst.setView().size(), 2);
 	}
 
 	@Test
@@ -28,7 +30,7 @@ public class ThresholdSetTest {
 		ThresholdSet<String> thst = TS("a", "b", "a");
 
 		assertIteratorSet(false, thst.setView().iterator(), "b");
-		assertEquals(thst.setSize(), 1);
+		assertEquals(thst.setView().size(), 1);
 	}
 
 	@Test
@@ -37,7 +39,7 @@ public class ThresholdSetTest {
 		thst.add("a");
 
 		assertIteratorSet(false, thst.setView().iterator(), "b");
-		assertEquals(thst.setSize(), 1);
+		assertEquals(thst.setView().size(), 1);
 	}
 
 	@Test
@@ -57,12 +59,12 @@ public class ThresholdSetTest {
 		thst.remove("a");
 
 		assertIteratorSet(false, thst.setView().iterator(), "a", "b");
-		assertEquals(2, thst.setSize());
+		assertEquals(2, thst.setView().size());
 
 		thst.remove("a");
 
 		assertIteratorSet(false, thst.setView().iterator(), "b");
-		assertEquals(1, thst.setSize());
+		assertEquals(1, thst.setView().size());
 	}
 
 	@Test
diff --git a/src/test/java/bjc/funcdata/TestMapCreation.java b/src/test/java/bjc/test/funcdata/TestMapCreation.java
index eeea591..4a06aa0 100644
--- a/src/test/java/bjc/funcdata/TestMapCreation.java
+++ b/src/test/java/bjc/test/funcdata/TestMapCreation.java
@@ -1,9 +1,11 @@
-package bjc.funcdata;
+package bjc.test.funcdata;
 
 import static org.junit.Assert.*;
 
 import org.junit.*;
 
+import bjc.funcdata.MapEx;
+
 @SuppressWarnings("javadoc")
 public class TestMapCreation {
 	@Test
diff --git a/src/test/java/bjc/funcdata/TestMapOperations.java b/src/test/java/bjc/test/funcdata/TestMapOperations.java
index 7523d02..0cc60bf 100644
--- a/src/test/java/bjc/funcdata/TestMapOperations.java
+++ b/src/test/java/bjc/test/funcdata/TestMapOperations.java
@@ -1,4 +1,4 @@
-package bjc.funcdata;
+package bjc.test.funcdata;
 
 import static org.junit.Assert.*;
 
@@ -6,6 +6,9 @@ import java.util.*;
 
 import org.junit.*;
 
+import bjc.funcdata.MapEx;
+import bjc.funcdata.ObjectFrozen;
+
 @SuppressWarnings("javadoc")
 public class TestMapOperations {
 	private MapEx<String, String> map;
diff --git a/src/test/java/bjc/functypes/IDTest.java b/src/test/java/bjc/test/functypes/IDTest.java
index 69c6133..4e31644 100644
--- a/src/test/java/bjc/functypes/IDTest.java
+++ b/src/test/java/bjc/test/functypes/IDTest.java
@@ -1,4 +1,4 @@
-package bjc.functypes;
+package bjc.test.functypes;
 
 import static org.junit.Assert.*;
 
@@ -6,6 +6,8 @@ import java.util.function.*;
 
 import org.junit.*;
 
+import bjc.functypes.ID;
+
 @SuppressWarnings("javadoc")
 public class IDTest {
 
diff --git a/src/test/java/bjc/test/functypes/optics/LensesTest.java b/src/test/java/bjc/test/functypes/optics/LensesTest.java
new file mode 100644
index 0000000..ff13a42
--- /dev/null
+++ b/src/test/java/bjc/test/functypes/optics/LensesTest.java
@@ -0,0 +1,18 @@
+package bjc.test.functypes.optics;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import bjc.data.Holder;
+import bjc.functypes.optics.Lenses;
+
+public class LensesTest {
+
+	@Test
+	public void test() {
+		Holder<Integer> holder = Holder.of(5);
+		
+	}
+
+}
diff --git a/src/test/java/bjc/test/functypes/optics/package-info.java b/src/test/java/bjc/test/functypes/optics/package-info.java
new file mode 100644
index 0000000..45e69ec
--- /dev/null
+++ b/src/test/java/bjc/test/functypes/optics/package-info.java
@@ -0,0 +1 @@
+package bjc.test.functypes.optics;
\ No newline at end of file