Convert CLFormatter to use ReportWriter

This is in preparation for implementing the T and < directives

2 files changed, 46 insertions, 5 deletions

diff --git a/base/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java b/base/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
index f8b06cf..1e80dcd 100644
--- a/base/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
+++ b/base/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
@@ -2,6 +2,8 @@ package bjc.utils.test.ioutils;
 
 import static org.junit.Assert.*;
 
+import java.io.IOException;
+
 import bjc.utils.ioutils.format.CLFormatter;
 
 import org.junit.Test;
@@ -18,18 +20,25 @@ public class CLFormatterTest {
 
 	@Test
 	public void testFormatStringLiteral() {
-		assertEquals(fmt.formatString("foo"), "foo");
+		assertEquals("foo", format("foo"));
 	}
 
 	@Test
 	public void testFormatStringD() {
-		assertEquals(fmt.formatString("~D", 5), "5");
-		assertEquals(fmt.formatString("~3D", 5), "  5");
-		assertEquals(fmt.formatString("~3,'0D", 5), "005");
+		assertEquals("5",   format("~D", 5));
+		assertEquals("  5", format("~3D", 5));
+		assertEquals("005", format("~3,'0D", 5));
 	}
 
 	public void testFormatStringR() {
-		assertEquals(fmt.formatString("~R dog~:*~[s are~; is~] here", 3, 3 == 1), "3 dogs are here");
+		assertEquals("3 dogs are here", format("~R dog~:*~[s are~; is~] here", 3, 3 == 1));
 	}
 
+	private String format(String str, Object... params) {
+		try {
+			return fmt.formatString(str, params);
+		} catch (IOException ioex) {
+			return null;
+		}
+	}
 }
diff --git a/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java b/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java
new file mode 100644
index 0000000..11e104c
--- /dev/null
+++ b/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java
@@ -0,0 +1,32 @@
+package bjc.utils.test.ioutils;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import bjc.utils.ioutils.ReportWriter;
+
+import org.junit.Test;
+
+/**
+ * Tests for ReportWriter.
+ * 
+ * @author EVE
+ *
+ */
+@SuppressWarnings("javadoc")
+public class ReportWriterTest {
+	@Test
+	public void testWriteString() {
+		ReportWriter rw = new ReportWriter(new StringWriter());
+
+		try {
+			rw.write("foo");
+
+			assertEquals("foo", rw.toString());
+		} catch (IOException ioex) {
+
+		}
+	}
+}