You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2013/02/21 19:00:37 UTC

[lucy-commits] [2/4] Add TestFormatter to TestBatch constructor

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestMatchAllQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestMatchAllQuery.cfh b/core/Lucy/Test/Search/TestMatchAllQuery.cfh
index 3dc823e..8f66e34 100644
--- a/core/Lucy/Test/Search/TestMatchAllQuery.cfh
+++ b/core/Lucy/Test/Search/TestMatchAllQuery.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestMatchAllQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestMatchAllQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestMatchAllQuery*
-    init(TestMatchAllQuery *self);
+    init(TestMatchAllQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestMatchAllQuery *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestNOTQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNOTQuery.c b/core/Lucy/Test/Search/TestNOTQuery.c
index 780f3c7..58c7f4a 100644
--- a/core/Lucy/Test/Search/TestNOTQuery.c
+++ b/core/Lucy/Test/Search/TestNOTQuery.c
@@ -18,6 +18,7 @@
 #include "Lucy/Util/ToolSet.h"
 #include <math.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Search/TestNOTQuery.h"
@@ -25,14 +26,14 @@
 #include "Lucy/Search/LeafQuery.h"
 
 TestNOTQuery*
-TestNOTQuery_new() {
+TestNOTQuery_new(TestFormatter *formatter) {
     TestNOTQuery *self = (TestNOTQuery*)VTable_Make_Obj(TESTNOTQUERY);
-    return TestNOTQuery_init(self);
+    return TestNOTQuery_init(self, formatter);
 }
 
 TestNOTQuery*
-TestNOTQuery_init(TestNOTQuery *self) {
-    return (TestNOTQuery*)TestBatch_init((TestBatch*)self, 4);
+TestNOTQuery_init(TestNOTQuery *self, TestFormatter *formatter) {
+    return (TestNOTQuery*)TestBatch_init((TestBatch*)self, 4, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestNOTQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNOTQuery.cfh b/core/Lucy/Test/Search/TestNOTQuery.cfh
index 7969afb..38a138a 100644
--- a/core/Lucy/Test/Search/TestNOTQuery.cfh
+++ b/core/Lucy/Test/Search/TestNOTQuery.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestNOTQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestNOTQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestNOTQuery*
-    init(TestNOTQuery *self);
+    init(TestNOTQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestNOTQuery *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestNoMatchQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNoMatchQuery.c b/core/Lucy/Test/Search/TestNoMatchQuery.c
index 7477a34..94fb3d3 100644
--- a/core/Lucy/Test/Search/TestNoMatchQuery.c
+++ b/core/Lucy/Test/Search/TestNoMatchQuery.c
@@ -18,20 +18,21 @@
 #include "Lucy/Util/ToolSet.h"
 #include <math.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Search/TestNoMatchQuery.h"
 #include "Lucy/Search/NoMatchQuery.h"
 
 TestNoMatchQuery*
-TestNoMatchQuery_new() {
+TestNoMatchQuery_new(TestFormatter *formatter) {
     TestNoMatchQuery *self = (TestNoMatchQuery*)VTable_Make_Obj(TESTNOMATCHQUERY);
-    return TestNoMatchQuery_init(self);
+    return TestNoMatchQuery_init(self, formatter);
 }
 
 TestNoMatchQuery*
-TestNoMatchQuery_init(TestNoMatchQuery *self) {
-    return (TestNoMatchQuery*)TestBatch_init((TestBatch*)self, 2);
+TestNoMatchQuery_init(TestNoMatchQuery *self, TestFormatter *formatter) {
+    return (TestNoMatchQuery*)TestBatch_init((TestBatch*)self, 2, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestNoMatchQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNoMatchQuery.cfh b/core/Lucy/Test/Search/TestNoMatchQuery.cfh
index 4c82860..3e679ad 100644
--- a/core/Lucy/Test/Search/TestNoMatchQuery.cfh
+++ b/core/Lucy/Test/Search/TestNoMatchQuery.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestNoMatchQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestNoMatchQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestNoMatchQuery*
-    init(TestNoMatchQuery *self);
+    init(TestNoMatchQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestNoMatchQuery *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestPhraseQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestPhraseQuery.c b/core/Lucy/Test/Search/TestPhraseQuery.c
index 870d487..6759b49 100644
--- a/core/Lucy/Test/Search/TestPhraseQuery.c
+++ b/core/Lucy/Test/Search/TestPhraseQuery.c
@@ -18,20 +18,21 @@
 #include "Lucy/Util/ToolSet.h"
 #include <math.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Search/TestPhraseQuery.h"
 #include "Lucy/Search/PhraseQuery.h"
 
 TestPhraseQuery*
-TestPhraseQuery_new() {
+TestPhraseQuery_new(TestFormatter *formatter) {
     TestPhraseQuery *self = (TestPhraseQuery*)VTable_Make_Obj(TESTPHRASEQUERY);
-    return TestPhraseQuery_init(self);
+    return TestPhraseQuery_init(self, formatter);
 }
 
 TestPhraseQuery*
-TestPhraseQuery_init(TestPhraseQuery *self) {
-    return (TestPhraseQuery*)TestBatch_init((TestBatch*)self, 1);
+TestPhraseQuery_init(TestPhraseQuery *self, TestFormatter *formatter) {
+    return (TestPhraseQuery*)TestBatch_init((TestBatch*)self, 1, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestPhraseQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestPhraseQuery.cfh b/core/Lucy/Test/Search/TestPhraseQuery.cfh
index bd90b48..e183818 100644
--- a/core/Lucy/Test/Search/TestPhraseQuery.cfh
+++ b/core/Lucy/Test/Search/TestPhraseQuery.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestPhraseQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestPhraseQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestPhraseQuery*
-    init(TestPhraseQuery *self);
+    init(TestPhraseQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestPhraseQuery *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestPolyQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestPolyQuery.c b/core/Lucy/Test/Search/TestPolyQuery.c
index e39bdda..93b560c 100644
--- a/core/Lucy/Test/Search/TestPolyQuery.c
+++ b/core/Lucy/Test/Search/TestPolyQuery.c
@@ -18,6 +18,7 @@
 #include "Lucy/Util/ToolSet.h"
 #include <math.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Search/TestPolyQuery.h"
@@ -27,25 +28,25 @@
 #include "Lucy/Search/LeafQuery.h"
 
 TestANDQuery*
-TestANDQuery_new() {
+TestANDQuery_new(TestFormatter *formatter) {
     TestANDQuery *self = (TestANDQuery*)VTable_Make_Obj(TESTANDQUERY);
-    return TestANDQuery_init(self);
+    return TestANDQuery_init(self, formatter);
 }
 
 TestANDQuery*
-TestANDQuery_init(TestANDQuery *self) {
-    return (TestANDQuery*)TestBatch_init((TestBatch*)self, 4);
+TestANDQuery_init(TestANDQuery *self, TestFormatter *formatter) {
+    return (TestANDQuery*)TestBatch_init((TestBatch*)self, 4, formatter);
 }
 
 TestORQuery*
-TestORQuery_new() {
+TestORQuery_new(TestFormatter *formatter) {
     TestORQuery *self = (TestORQuery*)VTable_Make_Obj(TESTORQUERY);
-    return TestORQuery_init(self);
+    return TestORQuery_init(self, formatter);
 }
 
 TestORQuery*
-TestORQuery_init(TestORQuery *self) {
-    return (TestORQuery*)TestBatch_init((TestBatch*)self, 4);
+TestORQuery_init(TestORQuery *self, TestFormatter *formatter) {
+    return (TestORQuery*)TestBatch_init((TestBatch*)self, 4, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestPolyQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestPolyQuery.cfh b/core/Lucy/Test/Search/TestPolyQuery.cfh
index 6a60bd9..fbc1f24 100644
--- a/core/Lucy/Test/Search/TestPolyQuery.cfh
+++ b/core/Lucy/Test/Search/TestPolyQuery.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestANDQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestANDQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestANDQuery*
-    init(TestANDQuery *self);
+    init(TestANDQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestANDQuery *self);
@@ -33,10 +33,10 @@ class Lucy::Test::Search::TestORQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestORQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestORQuery*
-    init(TestORQuery *self);
+    init(TestORQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestORQuery *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestQueryParserLogic.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserLogic.c b/core/Lucy/Test/Search/TestQueryParserLogic.c
index ace6e4e..02b398e 100644
--- a/core/Lucy/Test/Search/TestQueryParserLogic.c
+++ b/core/Lucy/Test/Search/TestQueryParserLogic.c
@@ -19,6 +19,7 @@
 #include "Lucy/Util/ToolSet.h"
 #include <string.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Search/TestQueryParserLogic.h"
 #include "Lucy/Test/Search/TestQueryParser.h"
@@ -46,14 +47,14 @@
 #define make_poly_query   (Query*)lucy_TestUtils_make_poly_query
 
 TestQueryParserLogic*
-TestQPLogic_new() {
+TestQPLogic_new(TestFormatter *formatter) {
     TestQueryParserLogic *self = (TestQueryParserLogic*)VTable_Make_Obj(TESTQUERYPARSERLOGIC);
-    return TestQPLogic_init(self);
+    return TestQPLogic_init(self, formatter);
 }
 
 TestQueryParserLogic*
-TestQPLogic_init(TestQueryParserLogic *self) {
-    return (TestQueryParserLogic*)TestBatch_init((TestBatch*)self, 258);
+TestQPLogic_init(TestQueryParserLogic *self, TestFormatter *formatter) {
+    return (TestQueryParserLogic*)TestBatch_init((TestBatch*)self, 258, formatter);
 }
 
 static TestQueryParser*

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestQueryParserLogic.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserLogic.cfh b/core/Lucy/Test/Search/TestQueryParserLogic.cfh
index b1f98a3..94f1486 100644
--- a/core/Lucy/Test/Search/TestQueryParserLogic.cfh
+++ b/core/Lucy/Test/Search/TestQueryParserLogic.cfh
@@ -23,10 +23,10 @@ class Lucy::Test::Search::TestQueryParserLogic cnick TestQPLogic
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestQueryParserLogic*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestQueryParserLogic*
-    init(TestQueryParserLogic *self);
+    init(TestQueryParserLogic *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestQueryParserLogic *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestQueryParserSyntax.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserSyntax.c b/core/Lucy/Test/Search/TestQueryParserSyntax.c
index 13ce638..1d2025a 100644
--- a/core/Lucy/Test/Search/TestQueryParserSyntax.c
+++ b/core/Lucy/Test/Search/TestQueryParserSyntax.c
@@ -19,6 +19,7 @@
 #include "Lucy/Util/ToolSet.h"
 #include <string.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Search/TestQueryParserSyntax.h"
 #include "Lucy/Test/Search/TestQueryParser.h"
@@ -49,15 +50,15 @@
 #define make_poly_query   (Query*)lucy_TestUtils_make_poly_query
 
 TestQueryParserSyntax*
-TestQPSyntax_new() {
+TestQPSyntax_new(TestFormatter *formatter) {
     TestQueryParserSyntax *self
         = (TestQueryParserSyntax*)VTable_Make_Obj(TESTQUERYPARSERSYNTAX);
-    return TestQPSyntax_init(self);
+    return TestQPSyntax_init(self, formatter);
 }
 
 TestQueryParserSyntax*
-TestQPSyntax_init(TestQueryParserSyntax *self) {
-    return (TestQueryParserSyntax*)TestBatch_init((TestBatch*)self, 68);
+TestQPSyntax_init(TestQueryParserSyntax *self, TestFormatter *formatter) {
+    return (TestQueryParserSyntax*)TestBatch_init((TestBatch*)self, 68, formatter);
 }
 
 static Folder*

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserSyntax.cfh b/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
index 6b7826c..6b12d9d 100644
--- a/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
+++ b/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
@@ -23,10 +23,10 @@ class Lucy::Test::Search::TestQueryParserSyntax cnick TestQPSyntax
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestQueryParserSyntax*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestQueryParserSyntax*
-    init(TestQueryParserSyntax *self);
+    init(TestQueryParserSyntax *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestQueryParserSyntax *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestRangeQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestRangeQuery.c b/core/Lucy/Test/Search/TestRangeQuery.c
index c94da0f..8fc75ed 100644
--- a/core/Lucy/Test/Search/TestRangeQuery.c
+++ b/core/Lucy/Test/Search/TestRangeQuery.c
@@ -18,20 +18,21 @@
 #include "Lucy/Util/ToolSet.h"
 #include <math.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Search/TestRangeQuery.h"
 #include "Lucy/Search/RangeQuery.h"
 
 TestRangeQuery*
-TestRangeQuery_new() {
+TestRangeQuery_new(TestFormatter *formatter) {
     TestRangeQuery *self = (TestRangeQuery*)VTable_Make_Obj(TESTRANGEQUERY);
-    return TestRangeQuery_init(self);
+    return TestRangeQuery_init(self, formatter);
 }
 
 TestRangeQuery*
-TestRangeQuery_init(TestRangeQuery *self) {
-    return (TestRangeQuery*)TestBatch_init((TestBatch*)self, 5);
+TestRangeQuery_init(TestRangeQuery *self, TestFormatter *formatter) {
+    return (TestRangeQuery*)TestBatch_init((TestBatch*)self, 5, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestRangeQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestRangeQuery.cfh b/core/Lucy/Test/Search/TestRangeQuery.cfh
index a9db698..d885f29 100644
--- a/core/Lucy/Test/Search/TestRangeQuery.cfh
+++ b/core/Lucy/Test/Search/TestRangeQuery.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestRangeQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestRangeQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestRangeQuery*
-    init(TestRangeQuery *self);
+    init(TestRangeQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestRangeQuery *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestReqOptQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestReqOptQuery.c b/core/Lucy/Test/Search/TestReqOptQuery.c
index 9f8fc40..097cee3 100644
--- a/core/Lucy/Test/Search/TestReqOptQuery.c
+++ b/core/Lucy/Test/Search/TestReqOptQuery.c
@@ -18,6 +18,7 @@
 #include "Lucy/Util/ToolSet.h"
 #include <math.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Search/TestReqOptQuery.h"
@@ -25,14 +26,14 @@
 #include "Lucy/Search/LeafQuery.h"
 
 TestReqOptQuery*
-TestReqOptQuery_new() {
+TestReqOptQuery_new(TestFormatter *formatter) {
     TestReqOptQuery *self = (TestReqOptQuery*)VTable_Make_Obj(TESTREQOPTQUERY);
-    return TestReqOptQuery_init(self);
+    return TestReqOptQuery_init(self, formatter);
 }
 
 TestReqOptQuery*
-TestReqOptQuery_init(TestReqOptQuery *self) {
-    return (TestReqOptQuery*)TestBatch_init((TestBatch*)self, 4);
+TestReqOptQuery_init(TestReqOptQuery *self, TestFormatter *formatter) {
+    return (TestReqOptQuery*)TestBatch_init((TestBatch*)self, 4, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestReqOptQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestReqOptQuery.cfh b/core/Lucy/Test/Search/TestReqOptQuery.cfh
index f5f7ffd..7011ebe 100644
--- a/core/Lucy/Test/Search/TestReqOptQuery.cfh
+++ b/core/Lucy/Test/Search/TestReqOptQuery.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestReqOptQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestReqOptQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestReqOptQuery*
-    init(TestReqOptQuery *self);
+    init(TestReqOptQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestReqOptQuery *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestSeriesMatcher.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSeriesMatcher.c b/core/Lucy/Test/Search/TestSeriesMatcher.c
index 64a1565..1c0c297 100644
--- a/core/Lucy/Test/Search/TestSeriesMatcher.c
+++ b/core/Lucy/Test/Search/TestSeriesMatcher.c
@@ -18,20 +18,21 @@
 #include "Lucy/Util/ToolSet.h"
 #include <math.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Search/TestSeriesMatcher.h"
 #include "Lucy/Search/BitVecMatcher.h"
 #include "Lucy/Search/SeriesMatcher.h"
 
 TestSeriesMatcher*
-TestSeriesMatcher_new() {
+TestSeriesMatcher_new(TestFormatter *formatter) {
     TestSeriesMatcher *self = (TestSeriesMatcher*)VTable_Make_Obj(TESTSERIESMATCHER);
-    return TestSeriesMatcher_init(self);
+    return TestSeriesMatcher_init(self, formatter);
 }
 
 TestSeriesMatcher*
-TestSeriesMatcher_init(TestSeriesMatcher *self) {
-    return (TestSeriesMatcher*)TestBatch_init((TestBatch*)self, 135);
+TestSeriesMatcher_init(TestSeriesMatcher *self, TestFormatter *formatter) {
+    return (TestSeriesMatcher*)TestBatch_init((TestBatch*)self, 135, formatter);
 }
 
 static SeriesMatcher*

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestSeriesMatcher.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSeriesMatcher.cfh b/core/Lucy/Test/Search/TestSeriesMatcher.cfh
index 4e270cb..00c6c11 100644
--- a/core/Lucy/Test/Search/TestSeriesMatcher.cfh
+++ b/core/Lucy/Test/Search/TestSeriesMatcher.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestSeriesMatcher
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestSeriesMatcher*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestSeriesMatcher*
-    init(TestSeriesMatcher *self);
+    init(TestSeriesMatcher *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestSeriesMatcher *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestSortSpec.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSortSpec.c b/core/Lucy/Test/Search/TestSortSpec.c
index 284bcdf..5836293 100644
--- a/core/Lucy/Test/Search/TestSortSpec.c
+++ b/core/Lucy/Test/Search/TestSortSpec.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Search/TestSortSpec.h"
 #include "Lucy/Test/TestUtils.h"
@@ -68,14 +69,14 @@ static CharBuf *random_int32s_cb;
 static CharBuf *random_int64s_cb;
 
 TestSortSpec*
-TestSortSpec_new() {
+TestSortSpec_new(TestFormatter *formatter) {
     TestSortSpec *self = (TestSortSpec*)VTable_Make_Obj(TESTSORTSPEC);
-    return TestSortSpec_init(self);
+    return TestSortSpec_init(self, formatter);
 }
 
 TestSortSpec*
-TestSortSpec_init(TestSortSpec *self) {
-    return (TestSortSpec*)TestBatch_init((TestBatch*)self, 18);
+TestSortSpec_init(TestSortSpec *self, TestFormatter *formatter) {
+    return (TestSortSpec*)TestBatch_init((TestBatch*)self, 18, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestSortSpec.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSortSpec.cfh b/core/Lucy/Test/Search/TestSortSpec.cfh
index 9b01ff3..7d96228 100644
--- a/core/Lucy/Test/Search/TestSortSpec.cfh
+++ b/core/Lucy/Test/Search/TestSortSpec.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestSortSpec
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestSortSpec*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestSortSpec*
-    init(TestSortSpec *self);
+    init(TestSortSpec *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestSortSpec *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestSpan.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSpan.c b/core/Lucy/Test/Search/TestSpan.c
index ee4b4ab..2dd41a6 100644
--- a/core/Lucy/Test/Search/TestSpan.c
+++ b/core/Lucy/Test/Search/TestSpan.c
@@ -17,19 +17,20 @@
 #define C_LUCY_TESTTERMINFO
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Search/TestSpan.h"
 #include "Lucy/Search/Span.h"
 
 TestSpan*
-TestSpan_new() {
+TestSpan_new(TestFormatter *formatter) {
     TestSpan *self = (TestSpan*)VTable_Make_Obj(TESTSPAN);
-    return TestSpan_init(self);
+    return TestSpan_init(self, formatter);
 }
 
 TestSpan*
-TestSpan_init(TestSpan *self) {
-    return (TestSpan*)TestBatch_init((TestBatch*)self, 6);
+TestSpan_init(TestSpan *self, TestFormatter *formatter) {
+    return (TestSpan*)TestBatch_init((TestBatch*)self, 6, formatter);
 }
 
 void 

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestSpan.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSpan.cfh b/core/Lucy/Test/Search/TestSpan.cfh
index 6a5a08e..83a91ef 100644
--- a/core/Lucy/Test/Search/TestSpan.cfh
+++ b/core/Lucy/Test/Search/TestSpan.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestSpan
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestSpan*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestSpan*
-    init(TestSpan *self);
+    init(TestSpan *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestSpan *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestTermQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestTermQuery.c b/core/Lucy/Test/Search/TestTermQuery.c
index 3d3cc9b..65291b2 100644
--- a/core/Lucy/Test/Search/TestTermQuery.c
+++ b/core/Lucy/Test/Search/TestTermQuery.c
@@ -18,20 +18,21 @@
 #include "Lucy/Util/ToolSet.h"
 #include <math.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Search/TestTermQuery.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Search/TermQuery.h"
 
 TestTermQuery*
-TestTermQuery_new() {
+TestTermQuery_new(TestFormatter *formatter) {
     TestTermQuery *self = (TestTermQuery*)VTable_Make_Obj(TESTTERMQUERY);
-    return TestTermQuery_init(self);
+    return TestTermQuery_init(self, formatter);
 }
 
 TestTermQuery*
-TestTermQuery_init(TestTermQuery *self) {
-    return (TestTermQuery*)TestBatch_init((TestBatch*)self, 4);
+TestTermQuery_init(TestTermQuery *self, TestFormatter *formatter) {
+    return (TestTermQuery*)TestBatch_init((TestBatch*)self, 4, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Search/TestTermQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestTermQuery.cfh b/core/Lucy/Test/Search/TestTermQuery.cfh
index b5b0dc9..b8ecf6a 100644
--- a/core/Lucy/Test/Search/TestTermQuery.cfh
+++ b/core/Lucy/Test/Search/TestTermQuery.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Search::TestTermQuery
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestTermQuery*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestTermQuery*
-    init(TestTermQuery *self);
+    init(TestTermQuery *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestTermQuery *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestCompoundFileReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileReader.c b/core/Lucy/Test/Store/TestCompoundFileReader.c
index a0dc5d2..101b5a0 100644
--- a/core/Lucy/Test/Store/TestCompoundFileReader.c
+++ b/core/Lucy/Test/Store/TestCompoundFileReader.c
@@ -17,6 +17,7 @@
 #define C_LUCY_RAMFOLDER
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestCompoundFileReader.h"
 #include "Lucy/Store/CompoundFileReader.h"
@@ -37,14 +38,14 @@ static CharBuf *seg_1       = NULL;
 static CharBuf *stuff       = NULL;
 
 TestCompoundFileReader*
-TestCFReader_new() {
+TestCFReader_new(TestFormatter *formatter) {
     TestCompoundFileReader *self = (TestCompoundFileReader*)VTable_Make_Obj(TESTCOMPOUNDFILEREADER);
-    return TestCFReader_init(self);
+    return TestCFReader_init(self, formatter);
 }
 
 TestCompoundFileReader*
-TestCFReader_init(TestCompoundFileReader *self) {
-    return (TestCompoundFileReader*)TestBatch_init((TestBatch*)self, 48);
+TestCFReader_init(TestCompoundFileReader *self, TestFormatter *formatter) {
+    return (TestCompoundFileReader*)TestBatch_init((TestBatch*)self, 48, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestCompoundFileReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileReader.cfh b/core/Lucy/Test/Store/TestCompoundFileReader.cfh
index 8acbf26..fb2e300 100644
--- a/core/Lucy/Test/Store/TestCompoundFileReader.cfh
+++ b/core/Lucy/Test/Store/TestCompoundFileReader.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestCompoundFileReader cnick TestCFReader
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestCompoundFileReader*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestCompoundFileReader*
-    init(TestCompoundFileReader *self);
+    init(TestCompoundFileReader *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestCompoundFileReader *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestCompoundFileWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileWriter.c b/core/Lucy/Test/Store/TestCompoundFileWriter.c
index e0e9db5..e2b9281 100644
--- a/core/Lucy/Test/Store/TestCompoundFileWriter.c
+++ b/core/Lucy/Test/Store/TestCompoundFileWriter.c
@@ -16,6 +16,7 @@
 
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestCompoundFileWriter.h"
 #include "Lucy/Store/CompoundFileWriter.h"
@@ -32,14 +33,14 @@ static CharBuf *bar         = NULL;
 static CharBuf *seg_1       = NULL;
 
 TestCompoundFileWriter*
-TestCFWriter_new() {
+TestCFWriter_new(TestFormatter *formatter) {
     TestCompoundFileWriter *self = (TestCompoundFileWriter*)VTable_Make_Obj(TESTCOMPOUNDFILEWRITER);
-    return TestCFWriter_init(self);
+    return TestCFWriter_init(self, formatter);
 }
 
 TestCompoundFileWriter*
-TestCFWriter_init(TestCompoundFileWriter *self) {
-    return (TestCompoundFileWriter*)TestBatch_init((TestBatch*)self, 7);
+TestCFWriter_init(TestCompoundFileWriter *self, TestFormatter *formatter) {
+    return (TestCompoundFileWriter*)TestBatch_init((TestBatch*)self, 7, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileWriter.cfh b/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
index 1cb9849..073aee8 100644
--- a/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
+++ b/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestCompoundFileWriter cnick TestCFWriter
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestCompoundFileWriter*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestCompoundFileWriter*
-    init(TestCompoundFileWriter *self);
+    init(TestCompoundFileWriter *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestCompoundFileWriter *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFSDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSDirHandle.c b/core/Lucy/Test/Store/TestFSDirHandle.c
index d8d1d63..4c9ea2d 100644
--- a/core/Lucy/Test/Store/TestFSDirHandle.c
+++ b/core/Lucy/Test/Store/TestFSDirHandle.c
@@ -26,6 +26,7 @@
   #include <unistd.h>
 #endif
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestFSDirHandle.h"
 #include "Lucy/Store/FSDirHandle.h"
@@ -33,14 +34,14 @@
 #include "Lucy/Store/OutStream.h"
 
 TestFSDirHandle*
-TestFSDH_new() {
+TestFSDH_new(TestFormatter *formatter) {
     TestFSDirHandle *self = (TestFSDirHandle*)VTable_Make_Obj(TESTFSDIRHANDLE);
-    return TestFSDH_init(self);
+    return TestFSDH_init(self, formatter);
 }
 
 TestFSDirHandle*
-TestFSDH_init(TestFSDirHandle *self) {
-    return (TestFSDirHandle*)TestBatch_init((TestBatch*)self, 5);
+TestFSDH_init(TestFSDirHandle *self, TestFormatter *formatter) {
+    return (TestFSDirHandle*)TestBatch_init((TestBatch*)self, 5, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFSDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSDirHandle.cfh b/core/Lucy/Test/Store/TestFSDirHandle.cfh
index 2908695..e12601b 100644
--- a/core/Lucy/Test/Store/TestFSDirHandle.cfh
+++ b/core/Lucy/Test/Store/TestFSDirHandle.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestFSDirHandle cnick TestFSDH
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestFSDirHandle*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestFSDirHandle*
-    init(TestFSDirHandle *self);
+    init(TestFSDirHandle *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestFSDirHandle *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFSFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFileHandle.c b/core/Lucy/Test/Store/TestFSFileHandle.c
index 1151fc4..b9aec6c 100644
--- a/core/Lucy/Test/Store/TestFSFileHandle.c
+++ b/core/Lucy/Test/Store/TestFSFileHandle.c
@@ -26,20 +26,21 @@
   #include <io.h> // close
 #endif
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestFSFileHandle.h"
 #include "Lucy/Store/FSFileHandle.h"
 #include "Lucy/Store/FileWindow.h"
 
 TestFSFileHandle*
-TestFSFH_new() {
+TestFSFH_new(TestFormatter *formatter) {
     TestFSFileHandle *self = (TestFSFileHandle*)VTable_Make_Obj(TESTFSFILEHANDLE);
-    return TestFSFH_init(self);
+    return TestFSFH_init(self, formatter);
 }
 
 TestFSFileHandle*
-TestFSFH_init(TestFSFileHandle *self) {
-    return (TestFSFileHandle*)TestBatch_init((TestBatch*)self, 46);
+TestFSFH_init(TestFSFileHandle *self, TestFormatter *formatter) {
+    return (TestFSFileHandle*)TestBatch_init((TestBatch*)self, 46, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFSFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFileHandle.cfh b/core/Lucy/Test/Store/TestFSFileHandle.cfh
index 2c57810..6a7e7f4 100644
--- a/core/Lucy/Test/Store/TestFSFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestFSFileHandle.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestFSFileHandle cnick TestFSFH
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestFSFileHandle*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestFSFileHandle*
-    init(TestFSFileHandle *self);
+    init(TestFSFileHandle *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestFSFileHandle *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFSFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFolder.c b/core/Lucy/Test/Store/TestFSFolder.c
index 6986963..78b98a0 100644
--- a/core/Lucy/Test/Store/TestFSFolder.c
+++ b/core/Lucy/Test/Store/TestFSFolder.c
@@ -31,6 +31,7 @@
   #include <sys/stat.h>
 #endif
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestFSFolder.h"
 #include "Lucy/Test/Store/TestFolderCommon.h"
@@ -48,15 +49,15 @@ S_create_test_symlinks(void);
 #endif /* CHY_HAS_WINDOWS_H */
 
 TestFSFolder*
-TestFSFolder_new() {
+TestFSFolder_new(TestFormatter *formatter) {
     TestFSFolder *self = (TestFSFolder*)VTable_Make_Obj(TESTFSFOLDER);
-    return TestFSFolder_init(self);
+    return TestFSFolder_init(self, formatter);
 }
 
 TestFSFolder*
-TestFSFolder_init(TestFSFolder *self) {
+TestFSFolder_init(TestFSFolder *self, TestFormatter *formatter) {
     uint32_t num_tests = TestFolderCommon_num_tests() + 9;
-    return (TestFSFolder*)TestBatch_init((TestBatch*)self, num_tests);
+    return (TestFSFolder*)TestBatch_init((TestBatch*)self, num_tests, formatter);
 }
 
 static Folder*

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFSFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFolder.cfh b/core/Lucy/Test/Store/TestFSFolder.cfh
index 26895e5..0793c88 100644
--- a/core/Lucy/Test/Store/TestFSFolder.cfh
+++ b/core/Lucy/Test/Store/TestFSFolder.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestFSFolder
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestFSFolder*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestFSFolder*
-    init(TestFSFolder *self);
+    init(TestFSFolder *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestFSFolder *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFileHandle.c b/core/Lucy/Test/Store/TestFileHandle.c
index 6f26b49..1c54276 100644
--- a/core/Lucy/Test/Store/TestFileHandle.c
+++ b/core/Lucy/Test/Store/TestFileHandle.c
@@ -19,20 +19,21 @@
 #define C_LUCY_FILEWINDOW
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestFileHandle.h"
 #include "Lucy/Store/FileHandle.h"
 #include "Lucy/Store/FileWindow.h"
 
 TestFileHandle*
-TestFH_new() {
+TestFH_new(TestFormatter *formatter) {
     TestFileHandle *self = (TestFileHandle*)VTable_Make_Obj(TESTFILEHANDLE);
-    return TestFH_init(self);
+    return TestFH_init(self, formatter);
 }
 
 TestFileHandle*
-TestFH_init(TestFileHandle *self) {
-    return (TestFileHandle*)TestBatch_init((TestBatch*)self, 2);
+TestFH_init(TestFileHandle *self, TestFormatter *formatter) {
+    return (TestFileHandle*)TestBatch_init((TestBatch*)self, 2, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFileHandle.cfh b/core/Lucy/Test/Store/TestFileHandle.cfh
index eedf168..6f24a6a 100644
--- a/core/Lucy/Test/Store/TestFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestFileHandle.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestFileHandle cnick TestFH
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestFileHandle*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestFileHandle*
-    init(TestFileHandle *self);
+    init(TestFileHandle *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestFileHandle *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolder.c b/core/Lucy/Test/Store/TestFolder.c
index 251a056..1de7699 100644
--- a/core/Lucy/Test/Store/TestFolder.c
+++ b/core/Lucy/Test/Store/TestFolder.c
@@ -17,6 +17,7 @@
 #define C_LUCY_RAMFOLDER
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestFolder.h"
 #include "Lucy/Store/DirHandle.h"
@@ -38,14 +39,14 @@ static CharBuf *foo_foo           = NULL;
 static CharBuf *nope              = NULL;
 
 TestFolder*
-TestFolder_new() {
+TestFolder_new(TestFormatter *formatter) {
     TestFolder *self = (TestFolder*)VTable_Make_Obj(TESTFOLDER);
-    return TestFolder_init(self);
+    return TestFolder_init(self, formatter);
 }
 
 TestFolder*
-TestFolder_init(TestFolder *self) {
-    return (TestFolder*)TestBatch_init((TestBatch*)self, 79);
+TestFolder_init(TestFolder *self, TestFormatter *formatter) {
+    return (TestFolder*)TestBatch_init((TestBatch*)self, 79, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolder.cfh b/core/Lucy/Test/Store/TestFolder.cfh
index b472086..37af079 100644
--- a/core/Lucy/Test/Store/TestFolder.cfh
+++ b/core/Lucy/Test/Store/TestFolder.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestFolder
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestFolder*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestFolder*
-    init(TestFolder *self);
+    init(TestFolder *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestFolder *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestIOChunks.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOChunks.c b/core/Lucy/Test/Store/TestIOChunks.c
index e16de71..ffaf148 100644
--- a/core/Lucy/Test/Store/TestIOChunks.c
+++ b/core/Lucy/Test/Store/TestIOChunks.c
@@ -21,6 +21,7 @@
 #include <time.h>
 
 #include "Lucy/Util/ToolSet.h"
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Store/TestIOChunks.h"
@@ -31,14 +32,14 @@
 #include "Clownfish/Util/NumberUtils.h"
 
 TestIOChunks*
-TestIOChunks_new() {
+TestIOChunks_new(TestFormatter *formatter) {
     TestIOChunks *self = (TestIOChunks*)VTable_Make_Obj(TESTIOCHUNKS);
-    return TestIOChunks_init(self);
+    return TestIOChunks_init(self, formatter);
 }
 
 TestIOChunks*
-TestIOChunks_init(TestIOChunks *self) {
-    return (TestIOChunks*)TestBatch_init((TestBatch*)self, 36);
+TestIOChunks_init(TestIOChunks *self, TestFormatter *formatter) {
+    return (TestIOChunks*)TestBatch_init((TestBatch*)self, 36, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestIOChunks.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOChunks.cfh b/core/Lucy/Test/Store/TestIOChunks.cfh
index 46d71f0..753ad19 100644
--- a/core/Lucy/Test/Store/TestIOChunks.cfh
+++ b/core/Lucy/Test/Store/TestIOChunks.cfh
@@ -22,10 +22,10 @@ class Lucy::Test::Store::TestIOChunks
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestIOChunks*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestIOChunks*
-    init(TestIOChunks *self);
+    init(TestIOChunks *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestIOChunks *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestIOPrimitives.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOPrimitives.c b/core/Lucy/Test/Store/TestIOPrimitives.c
index 6a598f4..542655e 100644
--- a/core/Lucy/Test/Store/TestIOPrimitives.c
+++ b/core/Lucy/Test/Store/TestIOPrimitives.c
@@ -21,6 +21,7 @@
 #include <time.h>
 
 #include "Lucy/Util/ToolSet.h"
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Store/TestIOPrimitives.h"
@@ -31,14 +32,14 @@
 #include "Clownfish/Util/NumberUtils.h"
 
 TestIOPrimitives*
-TestIOPrimitives_new() {
+TestIOPrimitives_new(TestFormatter *formatter) {
     TestIOPrimitives *self = (TestIOPrimitives*)VTable_Make_Obj(TESTIOPRIMITIVES);
-    return TestIOPrimitives_init(self);
+    return TestIOPrimitives_init(self, formatter);
 }
 
 TestIOPrimitives*
-TestIOPrimitives_init(TestIOPrimitives *self) {
-    return (TestIOPrimitives*)TestBatch_init((TestBatch*)self, 11);
+TestIOPrimitives_init(TestIOPrimitives *self, TestFormatter *formatter) {
+    return (TestIOPrimitives*)TestBatch_init((TestBatch*)self, 11, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestIOPrimitives.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOPrimitives.cfh b/core/Lucy/Test/Store/TestIOPrimitives.cfh
index 72be55e..dddd202 100644
--- a/core/Lucy/Test/Store/TestIOPrimitives.cfh
+++ b/core/Lucy/Test/Store/TestIOPrimitives.cfh
@@ -22,10 +22,10 @@ class Lucy::Test::Store::TestIOPrimitives
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestIOPrimitives*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestIOPrimitives*
-    init(TestIOPrimitives *self);
+    init(TestIOPrimitives *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestIOPrimitives *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestInStream.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestInStream.c b/core/Lucy/Test/Store/TestInStream.c
index e3921f1..e15139f 100644
--- a/core/Lucy/Test/Store/TestInStream.c
+++ b/core/Lucy/Test/Store/TestInStream.c
@@ -19,6 +19,7 @@
 #define C_LUCY_FILEWINDOW
 
 #include "Lucy/Util/ToolSet.h"
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Store/TestInStream.h"
@@ -31,14 +32,14 @@
 #include "Clownfish/Util/NumberUtils.h"
 
 TestInStream*
-TestInStream_new() {
+TestInStream_new(TestFormatter *formatter) {
     TestInStream *self = (TestInStream*)VTable_Make_Obj(TESTINSTREAM);
-    return TestInStream_init(self);
+    return TestInStream_init(self, formatter);
 }
 
 TestInStream*
-TestInStream_init(TestInStream *self) {
-    return (TestInStream*)TestBatch_init((TestBatch*)self, 37);
+TestInStream_init(TestInStream *self, TestFormatter *formatter) {
+    return (TestInStream*)TestBatch_init((TestBatch*)self, 37, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestInStream.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestInStream.cfh b/core/Lucy/Test/Store/TestInStream.cfh
index 9957f3b..b20668d 100644
--- a/core/Lucy/Test/Store/TestInStream.cfh
+++ b/core/Lucy/Test/Store/TestInStream.cfh
@@ -24,10 +24,10 @@ class Lucy::Test::Store::TestInStream
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestInStream*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestInStream*
-    init(TestInStream *self);
+    init(TestInStream *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestInStream *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestRAMDirHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMDirHandle.c b/core/Lucy/Test/Store/TestRAMDirHandle.c
index 4767f65..69e3e28 100644
--- a/core/Lucy/Test/Store/TestRAMDirHandle.c
+++ b/core/Lucy/Test/Store/TestRAMDirHandle.c
@@ -17,6 +17,7 @@
 #define C_LUCY_RAMFOLDER
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestRAMDirHandle.h"
 #include "Lucy/Store/FileHandle.h"
@@ -24,14 +25,14 @@
 #include "Lucy/Store/RAMDirHandle.h"
 
 TestRAMDirHandle*
-TestRAMDH_new() {
+TestRAMDH_new(TestFormatter *formatter) {
     TestRAMDirHandle *self = (TestRAMDirHandle*)VTable_Make_Obj(TESTRAMDIRHANDLE);
-    return TestRAMDH_init(self);
+    return TestRAMDH_init(self, formatter);
 }
 
 TestRAMDirHandle*
-TestRAMDH_init(TestRAMDirHandle *self) {
-    return (TestRAMDirHandle*)TestBatch_init((TestBatch*)self, 6);
+TestRAMDH_init(TestRAMDirHandle *self, TestFormatter *formatter) {
+    return (TestRAMDirHandle*)TestBatch_init((TestBatch*)self, 6, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestRAMDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMDirHandle.cfh b/core/Lucy/Test/Store/TestRAMDirHandle.cfh
index 02e706a..460889c 100644
--- a/core/Lucy/Test/Store/TestRAMDirHandle.cfh
+++ b/core/Lucy/Test/Store/TestRAMDirHandle.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestRAMDirHandle cnick TestRAMDH
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestRAMDirHandle*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestRAMDirHandle*
-    init(TestRAMDirHandle *self);
+    init(TestRAMDirHandle *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestRAMDirHandle *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestRAMFileHandle.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFileHandle.c b/core/Lucy/Test/Store/TestRAMFileHandle.c
index 2b254d2..7c7df13 100644
--- a/core/Lucy/Test/Store/TestRAMFileHandle.c
+++ b/core/Lucy/Test/Store/TestRAMFileHandle.c
@@ -21,6 +21,7 @@
 #define C_LUCY_FILEWINDOW
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestRAMFileHandle.h"
 #include "Lucy/Store/RAMFileHandle.h"
@@ -28,14 +29,14 @@
 #include "Lucy/Store/RAMFile.h"
 
 TestRAMFileHandle*
-TestRAMFH_new() {
+TestRAMFH_new(TestFormatter *formatter) {
     TestRAMFileHandle *self = (TestRAMFileHandle*)VTable_Make_Obj(TESTRAMFILEHANDLE);
-    return TestRAMFH_init(self);
+    return TestRAMFH_init(self, formatter);
 }
 
 TestRAMFileHandle*
-TestRAMFH_init(TestRAMFileHandle *self) {
-    return (TestRAMFileHandle*)TestBatch_init((TestBatch*)self, 32);
+TestRAMFH_init(TestRAMFileHandle *self, TestFormatter *formatter) {
+    return (TestRAMFileHandle*)TestBatch_init((TestBatch*)self, 32, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestRAMFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFileHandle.cfh b/core/Lucy/Test/Store/TestRAMFileHandle.cfh
index 0e4d273..87fa5bc 100644
--- a/core/Lucy/Test/Store/TestRAMFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestRAMFileHandle.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestRAMFileHandle cnick TestRAMFH
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestRAMFileHandle*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestRAMFileHandle*
-    init(TestRAMFileHandle *self);
+    init(TestRAMFileHandle *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestRAMFileHandle *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestRAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFolder.c b/core/Lucy/Test/Store/TestRAMFolder.c
index 3b1f6d8..0261fe3 100644
--- a/core/Lucy/Test/Store/TestRAMFolder.c
+++ b/core/Lucy/Test/Store/TestRAMFolder.c
@@ -17,6 +17,7 @@
 #define C_LUCY_RAMFOLDER
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Store/TestRAMFolder.h"
 #include "Lucy/Store/RAMFolder.h"
@@ -38,14 +39,14 @@ static CharBuf *nope          = NULL;
 static CharBuf *nope_nyet     = NULL;
 
 TestRAMFolder*
-TestRAMFolder_new() {
+TestRAMFolder_new(TestFormatter *formatter) {
     TestRAMFolder *self = (TestRAMFolder*)VTable_Make_Obj(TESTRAMFOLDER);
-    return TestRAMFolder_init(self);
+    return TestRAMFolder_init(self, formatter);
 }
 
 TestRAMFolder*
-TestRAMFolder_init(TestRAMFolder *self) {
-    return (TestRAMFolder*)TestBatch_init((TestBatch*)self, 98);
+TestRAMFolder_init(TestRAMFolder *self, TestFormatter *formatter) {
+    return (TestRAMFolder*)TestBatch_init((TestBatch*)self, 98, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Store/TestRAMFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFolder.cfh b/core/Lucy/Test/Store/TestRAMFolder.cfh
index 2ee988a..b1877b6 100644
--- a/core/Lucy/Test/Store/TestRAMFolder.cfh
+++ b/core/Lucy/Test/Store/TestRAMFolder.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Store::TestRAMFolder
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestRAMFolder*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestRAMFolder*
-    init(TestRAMFolder *self);
+    init(TestRAMFolder *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestRAMFolder *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/TestSchema.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestSchema.c b/core/Lucy/Test/TestSchema.c
index 9cedef1..0fe51b3 100644
--- a/core/Lucy/Test/TestSchema.c
+++ b/core/Lucy/Test/TestSchema.c
@@ -17,6 +17,7 @@
 #define C_LUCY_TESTSCHEMA
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Plan/TestArchitecture.h"
 #include "Lucy/Test/TestSchema.h"
@@ -52,14 +53,14 @@ TestSchema_architecture(TestSchema *self) {
 }
 
 TestBatchSchema*
-TestBatchSchema_new() {
+TestBatchSchema_new(TestFormatter *formatter) {
     TestBatchSchema *self = (TestBatchSchema*)VTable_Make_Obj(TESTBATCHSCHEMA);
-    return TestBatchSchema_init(self);
+    return TestBatchSchema_init(self, formatter);
 }
 
 TestBatchSchema*
-TestBatchSchema_init(TestBatchSchema *self) {
-    return (TestBatchSchema*)TestBatch_init((TestBatch*)self, 4);
+TestBatchSchema_init(TestBatchSchema *self, TestFormatter *formatter) {
+    return (TestBatchSchema*)TestBatch_init((TestBatch*)self, 4, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/TestSchema.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/TestSchema.cfh b/core/Lucy/Test/TestSchema.cfh
index b2c9173..9296edc 100644
--- a/core/Lucy/Test/TestSchema.cfh
+++ b/core/Lucy/Test/TestSchema.cfh
@@ -37,10 +37,10 @@ class Lucy::Test::TestBatchSchema
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestBatchSchema*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestBatchSchema*
-    init(TestBatchSchema *self);
+    init(TestBatchSchema *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestBatchSchema *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestAtomic.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestAtomic.c b/core/Lucy/Test/Util/TestAtomic.c
index cc23acf..c4d8554 100644
--- a/core/Lucy/Test/Util/TestAtomic.c
+++ b/core/Lucy/Test/Util/TestAtomic.c
@@ -16,19 +16,20 @@
 
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Util/TestAtomic.h"
 #include "Clownfish/Util/Atomic.h"
 
 TestAtomic*
-TestAtomic_new() {
+TestAtomic_new(TestFormatter *formatter) {
     TestAtomic *self = (TestAtomic*)VTable_Make_Obj(TESTATOMIC);
-    return TestAtomic_init(self);
+    return TestAtomic_init(self, formatter);
 }
 
 TestAtomic*
-TestAtomic_init(TestAtomic *self) {
-    return (TestAtomic*)TestBatch_init((TestBatch*)self, 6);
+TestAtomic_init(TestAtomic *self, TestFormatter *formatter) {
+    return (TestAtomic*)TestBatch_init((TestBatch*)self, 6, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestAtomic.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestAtomic.cfh b/core/Lucy/Test/Util/TestAtomic.cfh
index 53d568d..fc7060c 100644
--- a/core/Lucy/Test/Util/TestAtomic.cfh
+++ b/core/Lucy/Test/Util/TestAtomic.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Util::TestAtomic
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestAtomic*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestAtomic*
-    init(TestAtomic *self);
+    init(TestAtomic *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestAtomic *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestIndexFileNames.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestIndexFileNames.c b/core/Lucy/Test/Util/TestIndexFileNames.c
index 72e0e3c..d98b92c 100644
--- a/core/Lucy/Test/Util/TestIndexFileNames.c
+++ b/core/Lucy/Test/Util/TestIndexFileNames.c
@@ -16,19 +16,20 @@
 
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Util/TestIndexFileNames.h"
 #include "Lucy/Util/IndexFileNames.h"
 
 TestIndexFileNames*
-TestIxFileNames_new() {
+TestIxFileNames_new(TestFormatter *formatter) {
     TestIndexFileNames *self = (TestIndexFileNames*)VTable_Make_Obj(TESTINDEXFILENAMES);
-    return TestIxFileNames_init(self);
+    return TestIxFileNames_init(self, formatter);
 }
 
 TestIndexFileNames*
-TestIxFileNames_init(TestIndexFileNames *self) {
-    return (TestIndexFileNames*)TestBatch_init((TestBatch*)self, 10);
+TestIxFileNames_init(TestIndexFileNames *self, TestFormatter *formatter) {
+    return (TestIndexFileNames*)TestBatch_init((TestBatch*)self, 10, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestIndexFileNames.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestIndexFileNames.cfh b/core/Lucy/Test/Util/TestIndexFileNames.cfh
index 00027b7..5702eb4 100644
--- a/core/Lucy/Test/Util/TestIndexFileNames.cfh
+++ b/core/Lucy/Test/Util/TestIndexFileNames.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Util::TestIndexFileNames cnick TestIxFileNames
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestIndexFileNames*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestIndexFileNames*
-    init(TestIndexFileNames *self);
+    init(TestIndexFileNames *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestIndexFileNames *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestJson.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestJson.c b/core/Lucy/Test/Util/TestJson.c
index 2ef1d16..cc3a872 100644
--- a/core/Lucy/Test/Util/TestJson.c
+++ b/core/Lucy/Test/Util/TestJson.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Util/TestJson.h"
 #include "Lucy/Util/Json.h"
@@ -24,18 +25,18 @@
 #include "Lucy/Store/RAMFolder.h"
 
 TestJson*
-TestJson_new() {
+TestJson_new(TestFormatter *formatter) {
     TestJson *self = (TestJson*)VTable_Make_Obj(TESTJSON);
-    return TestJson_init(self);
+    return TestJson_init(self, formatter);
 }
 
 TestJson*
-TestJson_init(TestJson *self) {
+TestJson_init(TestJson *self, TestFormatter *formatter) {
     int num_tests = 107;
 #ifndef LUCY_VALGRIND
     num_tests += 28; // FIXME: syntax errors leak memory.
 #endif
-    return (TestJson*)TestBatch_init((TestBatch*)self, num_tests);
+    return (TestJson*)TestBatch_init((TestBatch*)self, num_tests, formatter);
 }
 
 // Create a test data structure including at least one each of Hash, VArray,

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestJson.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestJson.cfh b/core/Lucy/Test/Util/TestJson.cfh
index dfbbb5f..c7728c1 100644
--- a/core/Lucy/Test/Util/TestJson.cfh
+++ b/core/Lucy/Test/Util/TestJson.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Util::TestJson
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestJson*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestJson*
-    init(TestJson *self);
+    init(TestJson *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestJson *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestMemory.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestMemory.c b/core/Lucy/Test/Util/TestMemory.c
index 8d2676f..429c6bc 100644
--- a/core/Lucy/Test/Util/TestMemory.c
+++ b/core/Lucy/Test/Util/TestMemory.c
@@ -18,18 +18,19 @@
 #define C_LUCY_MEMORYPOOL
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Util/TestMemory.h"
 
 TestMemory*
-TestMemory_new() {
+TestMemory_new(TestFormatter *formatter) {
     TestMemory *self = (TestMemory*)VTable_Make_Obj(TESTMEMORY);
-    return TestMemory_init(self);
+    return TestMemory_init(self, formatter);
 }
 
 TestMemory*
-TestMemory_init(TestMemory *self) {
-    return (TestMemory*)TestBatch_init((TestBatch*)self, 30);
+TestMemory_init(TestMemory *self, TestFormatter *formatter) {
+    return (TestMemory*)TestBatch_init((TestBatch*)self, 30, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestMemory.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestMemory.cfh b/core/Lucy/Test/Util/TestMemory.cfh
index 004585c..9b95716 100644
--- a/core/Lucy/Test/Util/TestMemory.cfh
+++ b/core/Lucy/Test/Util/TestMemory.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Util::TestMemory
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestMemory*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestMemory*
-    init(TestMemory *self);
+    init(TestMemory *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestMemory *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestMemoryPool.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestMemoryPool.c b/core/Lucy/Test/Util/TestMemoryPool.c
index 90c5f7e..4c9d96c 100644
--- a/core/Lucy/Test/Util/TestMemoryPool.c
+++ b/core/Lucy/Test/Util/TestMemoryPool.c
@@ -18,19 +18,20 @@
 #define C_LUCY_MEMORYPOOL
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Util/TestMemoryPool.h"
 #include "Lucy/Util/MemoryPool.h"
 
 TestMemoryPool*
-TestMemPool_new() {
+TestMemPool_new(TestFormatter *formatter) {
     TestMemoryPool *self = (TestMemoryPool*)VTable_Make_Obj(TESTMEMORYPOOL);
-    return TestMemPool_init(self);
+    return TestMemPool_init(self, formatter);
 }
 
 TestMemoryPool*
-TestMemPool_init(TestMemoryPool *self) {
-    return (TestMemoryPool*)TestBatch_init((TestBatch*)self, 4);
+TestMemPool_init(TestMemoryPool *self, TestFormatter *formatter) {
+    return (TestMemoryPool*)TestBatch_init((TestBatch*)self, 4, formatter);
 }
 
 void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestMemoryPool.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestMemoryPool.cfh b/core/Lucy/Test/Util/TestMemoryPool.cfh
index b4b32b0..7cd1b9f 100644
--- a/core/Lucy/Test/Util/TestMemoryPool.cfh
+++ b/core/Lucy/Test/Util/TestMemoryPool.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Util::TestMemoryPool cnick TestMemPool
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestMemoryPool*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestMemoryPool*
-    init(TestMemoryPool *self);
+    init(TestMemoryPool *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestMemoryPool *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestNumberUtils.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestNumberUtils.c b/core/Lucy/Test/Util/TestNumberUtils.c
index 8acee0a..fecab9a 100644
--- a/core/Lucy/Test/Util/TestNumberUtils.c
+++ b/core/Lucy/Test/Util/TestNumberUtils.c
@@ -19,20 +19,21 @@
 #include <stdlib.h>
 #include <time.h>
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/TestUtils.h"
 #include "Lucy/Test/Util/TestNumberUtils.h"
 #include "Clownfish/Util/NumberUtils.h"
 
 TestNumberUtils*
-TestNumUtil_new() {
+TestNumUtil_new(TestFormatter *formatter) {
     TestNumberUtils *self = (TestNumberUtils*)VTable_Make_Obj(TESTNUMBERUTILS);
-    return TestNumUtil_init(self);
+    return TestNumUtil_init(self, formatter);
 }
 
 TestNumberUtils*
-TestNumUtil_init(TestNumberUtils *self) {
-    return (TestNumberUtils*)TestBatch_init((TestBatch*)self, 1196);
+TestNumUtil_init(TestNumberUtils *self, TestFormatter *formatter) {
+    return (TestNumberUtils*)TestBatch_init((TestBatch*)self, 1196, formatter);
 }
 
 static void

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestNumberUtils.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestNumberUtils.cfh b/core/Lucy/Test/Util/TestNumberUtils.cfh
index d99551c..0c5236d 100644
--- a/core/Lucy/Test/Util/TestNumberUtils.cfh
+++ b/core/Lucy/Test/Util/TestNumberUtils.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Util::TestNumberUtils cnick TestNumUtil
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestNumberUtils*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestNumberUtils*
-    init(TestNumberUtils *self);
+    init(TestNumberUtils *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestNumberUtils *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestPriorityQueue.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestPriorityQueue.c b/core/Lucy/Test/Util/TestPriorityQueue.c
index f756efc..a4a5a97 100644
--- a/core/Lucy/Test/Util/TestPriorityQueue.c
+++ b/core/Lucy/Test/Util/TestPriorityQueue.c
@@ -17,19 +17,20 @@
 #define C_LUCY_TESTPRIORITYQUEUE
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Util/TestPriorityQueue.h"
 #include "Lucy/Util/PriorityQueue.h"
 
 TestPriorityQueue*
-TestPriQ_new() {
+TestPriQ_new(TestFormatter *formatter) {
     TestPriorityQueue *self = (TestPriorityQueue*)VTable_Make_Obj(TESTPRIORITYQUEUE);
-    return TestPriQ_init(self);
+    return TestPriQ_init(self, formatter);
 }
 
 TestPriorityQueue*
-TestPriQ_init(TestPriorityQueue *self) {
-    return (TestPriorityQueue*)TestBatch_init((TestBatch*)self, 17);
+TestPriQ_init(TestPriorityQueue *self, TestFormatter *formatter) {
+    return (TestPriorityQueue*)TestBatch_init((TestBatch*)self, 17, formatter);
 }
 
 NumPriorityQueue*

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestPriorityQueue.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestPriorityQueue.cfh b/core/Lucy/Test/Util/TestPriorityQueue.cfh
index bffcd48..7fc7e56 100644
--- a/core/Lucy/Test/Util/TestPriorityQueue.cfh
+++ b/core/Lucy/Test/Util/TestPriorityQueue.cfh
@@ -30,10 +30,10 @@ class Lucy::Test::Util::TestPriorityQueue cnick TestPriQ
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestPriorityQueue*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestPriorityQueue*
-    init(TestPriorityQueue *self);
+    init(TestPriorityQueue *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestPriorityQueue *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestStringHelper.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestStringHelper.c b/core/Lucy/Test/Util/TestStringHelper.c
index 1c5ec8b..04a5ba9 100644
--- a/core/Lucy/Test/Util/TestStringHelper.c
+++ b/core/Lucy/Test/Util/TestStringHelper.c
@@ -16,6 +16,7 @@
 
 #include "Lucy/Util/ToolSet.h"
 
+#include "Clownfish/Test/TestFormatter.h"
 #include "Lucy/Test.h"
 #include "Lucy/Test/Util/TestStringHelper.h"
 #include "Lucy/Test/TestUtils.h"
@@ -28,14 +29,14 @@
  */
 #define TRAIL_OK(n) (n >= 0x80 && n <= 0xBF)
 TestStringHelper*
-TestStrHelp_new() {
+TestStrHelp_new(TestFormatter *formatter) {
     TestStringHelper *self = (TestStringHelper*)VTable_Make_Obj(TESTSTRINGHELPER);
-    return TestStrHelp_init(self);
+    return TestStrHelp_init(self, formatter);
 }
 
 TestStringHelper*
-TestStrHelp_init(TestStringHelper *self) {
-    return (TestStringHelper*)TestBatch_init((TestBatch*)self, 41);
+TestStrHelp_init(TestStringHelper *self, TestFormatter *formatter) {
+    return (TestStringHelper*)TestBatch_init((TestBatch*)self, 41, formatter);
 }
 
 static bool

http://git-wip-us.apache.org/repos/asf/lucy/blob/08c61bf3/core/Lucy/Test/Util/TestStringHelper.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestStringHelper.cfh b/core/Lucy/Test/Util/TestStringHelper.cfh
index ed09db5..d36008c 100644
--- a/core/Lucy/Test/Util/TestStringHelper.cfh
+++ b/core/Lucy/Test/Util/TestStringHelper.cfh
@@ -20,10 +20,10 @@ class Lucy::Test::Util::TestStringHelper cnick TestStrHelp
     inherits Clownfish::Test::TestBatch {
 
     inert incremented TestStringHelper*
-    new();
+    new(TestFormatter *formatter);
 
     inert TestStringHelper*
-    init(TestStringHelper *self);
+    init(TestStringHelper *self, TestFormatter *formatter);
 
     void
     Run_Tests(TestStringHelper *self);