Begin refactoring of group decree parsing

This begins the refactoring of how 'group' decrees (like ~{, and ~[) are
parsed. This commit contains the infrastructure for doing so, but none
of the actual group decrees have been changed yet to use it.

2 files changed, 34 insertions, 1 deletions

diff --git a/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
index 4463488..b7e20c7 100644
--- a/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
+++ b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
@@ -1,6 +1,5 @@
 package bjc.utils.test.ioutils;
 
-
 import java.io.*;
 import java.util.*;
 
@@ -24,6 +23,8 @@ public class CLFormatterTest {
 
 	@Test
 	public void testLiteralString() {
+		// @TODO :assertFormat Ben Culkin 1/3/20
+		// Convert all of these 'assertEquals(..., format(...))' to use assertFormat instead
 		// Print literal strings exactly
 		assertEquals("foo", format("foo"));
 	}
diff --git a/clformat/src/test/java/bjc/utils/test/ioutils/CLTokenizerTest.java b/clformat/src/test/java/bjc/utils/test/ioutils/CLTokenizerTest.java
new file mode 100644
index 0000000..71fa069
--- /dev/null
+++ b/clformat/src/test/java/bjc/utils/test/ioutils/CLTokenizerTest.java
@@ -0,0 +1,32 @@
+package bjc.utils.test.ioutils;
+
+import java.io.*;
+import java.util.*;
+
+import bjc.utils.ioutils.format.*;
+
+import org.junit.Test;
+
+import static java.util.Arrays.asList;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests for CLTokenizer.
+ *
+ * @author Ben Culkin
+ */
+@SuppressWarnings("javadoc")
+public class CLTokenizerTest {
+	@Test
+	public void testEmptyTokenizer() {
+		CLTokenizer tokenzer = new CLTokenizer("");
+
+		assertTrue("Empty tokenizer has a decree", tokenzer.hasNext());
+		Decree dec = tokenzer.next();
+		assertFalse("Empty tokenizer has only one decree", tokenzer.hasNext());
+		
+		assertTrue("Decree from empty tokenizer is a literal", dec.isLiteral);
+		assertEquals("Decree from empty tokenizer is empty", "", dec.name);
+	}
+}