stop threading outputstreams through everything

it's not really necessary, since we can already capture output if
necessary externally

5 files changed, 19 insertions, 35 deletions

diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala
index dddd468..fa3b6d4 100644
--- a/src/main/scala/org/perl8/test/TestMore.scala
+++ b/src/main/scala/org/perl8/test/TestMore.scala
@@ -3,22 +3,15 @@ package org.perl8.test
 import org.perl8.test.tap.TestBuilder
 import org.perl8.test.Utils._
 
-import java.io.OutputStream
 import scala.util.matching.Regex
 
-class TestMore (
-  plan: Option[Plan],
-  out:  OutputStream
-) extends Test with DelayedInit {
-  def this (plan: Plan, out: OutputStream = System.out) =
-    this(Some(plan), out)
-
-  def this (out: OutputStream = System.out) =
-    this(None, out)
+class TestMore (plan: Option[Plan] = None) extends Test with DelayedInit {
+  def this (plan: Plan) =
+    this(Some(plan))
 
   def delayedInit (body: => Unit) {
     todo     = NoMessage
-    builder  = new TestBuilder(plan, out, 0, NoMessage)
+    builder  = new TestBuilder(plan, "", NoMessage)
     testBody = () => body
   }
 
@@ -126,8 +119,7 @@ class TestMore (
     val success = try {
       builder = new TestBuilder(
         plan,
-        out,
-        oldBuilder.indent + 1,
+        oldBuilder.indent + "    ",
         name.map(n => "- " + n)
       )
       body
diff --git a/src/main/scala/org/perl8/test/harness/SummaryReporter.scala b/src/main/scala/org/perl8/test/harness/SummaryReporter.scala
index 08544ce..23e5244 100644
--- a/src/main/scala/org/perl8/test/harness/SummaryReporter.scala
+++ b/src/main/scala/org/perl8/test/harness/SummaryReporter.scala
@@ -1,6 +1,6 @@
 package org.perl8.test.harness
 
-import java.io.{OutputStream,ByteArrayOutputStream}
+import java.io.ByteArrayOutputStream
 
 import org.perl8.test.Test
 import org.perl8.test.tap
@@ -22,8 +22,10 @@ class SummaryReporter extends MultiTestReporter {
       print(name + ("." * (maxLength - name.length)) + "... ")
 
       val out = new ByteArrayOutputStream
-      val test = newInstance[Test, OutputStream](name, out)
-      val exitCode = test.run
+      val test = newInstance[Test](name)
+      val exitCode = Console.withOut(out) {
+        test.run
+      }
       val result = tap.Consumer.parse(out)
 
       if (exitCode == 0) {
diff --git a/src/main/scala/org/perl8/test/harness/TAPReporter.scala b/src/main/scala/org/perl8/test/harness/TAPReporter.scala
index c9e353a..e478880 100644
--- a/src/main/scala/org/perl8/test/harness/TAPReporter.scala
+++ b/src/main/scala/org/perl8/test/harness/TAPReporter.scala
@@ -1,11 +1,9 @@
 package org.perl8.test.harness
 
-import java.io.OutputStream
-
 import org.perl8.test.Test
 import Utils._
 
 class TAPReporter extends Reporter {
   def run (testName: String): Int =
-    newInstance[Test, OutputStream](testName, System.out).run
+    newInstance[Test](testName).run
 }
diff --git a/src/main/scala/org/perl8/test/sbt/Runner.scala b/src/main/scala/org/perl8/test/sbt/Runner.scala
index 86abbc9..cd68fd1 100644
--- a/src/main/scala/org/perl8/test/sbt/Runner.scala
+++ b/src/main/scala/org/perl8/test/sbt/Runner.scala
@@ -1,7 +1,6 @@
 package org.perl8.test.sbt
 
 import org.scalatools.testing.{EventHandler,Event,Result}
-import java.io.{OutputStream,ByteArrayOutputStream}
 
 import org.perl8.test.harness.Utils._
 import org.perl8.test.harness.SummaryReporter
diff --git a/src/main/scala/org/perl8/test/tap/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala
index f9c684c..ac576d8 100644
--- a/src/main/scala/org/perl8/test/tap/TestBuilder.scala
+++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala
@@ -1,31 +1,26 @@
 package org.perl8.test.tap
 
-import java.io.OutputStream
-
 import org.perl8.test.Utils._
 
 class TestBuilder (
   plan:             Option[Plan],
-  out:              OutputStream,
-  val indent:       Int,
+  val indent:       String,
   private val name: Message
 ) {
   plan.foreach(p => println(Producer.plan(p)))
 
   def this (
     plan:   Plan,
-    out:    OutputStream = System.out,
-    indent: Int          = 0,
+    indent: String       = "",
     name:   Message      = NoMessage
   ) =
-    this(Some(plan), out, indent, name)
+    this(Some(plan), indent, name)
 
   def this (
-    out:    OutputStream = System.out,
-    indent: Int          = 0,
+    indent: String       = "",
     name:   Message      = NoMessage
   ) =
-    this(None, out, indent, name)
+    this(None, indent, name)
 
   def ok (
     test:        Boolean,
@@ -92,11 +87,9 @@ class TestBuilder (
   private val state = new TestState
 
   private def println (str: String) {
-    Console.withOut(out) {
-      val indented =
-        str.split("\n").map(s => (" " * (indent * 4)) + s).mkString("\n")
-      Console.println(indented)
-    }
+    val indented =
+      str.split("\n").map(s => indent + s).mkString("\n")
+    Console.println(indented)
   }
 
   private class TestState {