split out the tap stream parser from the individual line parsers

3 files changed, 10 insertions, 9 deletions

diff --git a/src/test/scala/org/perl8/test/ExtensionTest.scala b/src/test/scala/org/perl8/test/ExtensionTest.scala
index 5a9c1ac..f5635c4 100644
--- a/src/test/scala/org/perl8/test/ExtensionTest.scala
+++ b/src/test/scala/org/perl8/test/ExtensionTest.scala
@@ -2,7 +2,7 @@ package org.perl8.test
 
 import java.io.ByteArrayOutputStream
 
-import org.perl8.test.tap.Consumer
+import org.perl8.test.tap.Parser
 
 trait NumberZero { this: TestMore =>
   def is_zero (i: Int, desc: String): Boolean = hideTestMethod {
@@ -34,7 +34,7 @@ class ExtensionTest extends TestMore {
     }
   }
 
-  is(Consumer.parse(out).exitCode, 2)
+  is((new Parser).parse(out).exitCode, 2)
 
   val tap =
     "ok 1 - it's zero\n" +
diff --git a/src/test/scala/org/perl8/test/TestMoreTest.scala b/src/test/scala/org/perl8/test/TestMoreTest.scala
index bee1e64..b1af5da 100644
--- a/src/test/scala/org/perl8/test/TestMoreTest.scala
+++ b/src/test/scala/org/perl8/test/TestMoreTest.scala
@@ -2,7 +2,7 @@ package org.perl8.test
 
 import java.io.ByteArrayOutputStream
 
-import org.perl8.test.tap.Consumer
+import org.perl8.test.tap.Parser
 
 class TestMoreTest extends TestMore {
   val lineZero = Thread.currentThread.getStackTrace()(1).getLineNumber + 3
@@ -64,7 +64,7 @@ class TestMoreTest extends TestMore {
     }
   }
 
-  is(Consumer.parse(out).exitCode, 9, "got the right plan")
+  is((new Parser).parse(out).exitCode, 9, "got the right plan")
 
   val expected =
     "# ok\n" +
diff --git a/src/test/scala/org/perl8/test/tap/ConsumerTest.scala b/src/test/scala/org/perl8/test/tap/ParserTest.scala
index e07e73d..0781399 100644
--- a/src/test/scala/org/perl8/test/tap/ConsumerTest.scala
+++ b/src/test/scala/org/perl8/test/tap/ParserTest.scala
@@ -1,14 +1,15 @@
 package org.perl8.test.tap
 
 import org.perl8.test.{TestMore,SkipAll,NumericPlan}
+import org.perl8.test.tap.Consumer.{SkipDirective,TodoDirective}
 
-class ConsumerTest extends TestMore {
+class ParserTest extends TestMore {
   subtest ("basic") {
     val tap =
       "1..1\n" +
       "ok 1\n"
 
-    val result = Consumer.parse(tap)
+    val result = (new Parser).parse(tap)
     is(result.plan, NumericPlan(1), "got the right plan")
     is(result.results.map(_.passed), Seq(true), "got the right results")
   }
@@ -17,7 +18,7 @@ class ConsumerTest extends TestMore {
     val tap =
       "1..0 # SKIP nope\n"
 
-    val result = Consumer.parse(tap)
+    val result = (new Parser).parse(tap)
     is(result.plan, SkipAll("nope"), "got the right plan")
     is(result.results, Nil, "got the right results")
   }
@@ -34,7 +35,7 @@ class ConsumerTest extends TestMore {
       "1..4\n" +
       "# Looks like you failed 1 test of 4.\n"
 
-    val result = Consumer.parse(tap)
+    val result = (new Parser).parse(tap)
     is(result.plan, NumericPlan(4))
     is(result.results.map(_.passed), Seq(true, false, false, true))
     is(result.results.map(_.number), Seq(1, 2, 3, 4))
@@ -74,7 +75,7 @@ class ConsumerTest extends TestMore {
       "1..2\n" +
       "# Looks like you failed 1 test of 2.\n"
 
-    val result = Consumer.parse(tap)
+    val result = (new Parser).parse(tap)
     is(result.plan, NumericPlan(2))
     is(result.results.map(_.passed), Seq(true, false))
     is(result.results.map(_.number), Seq(1, 2))