move more things around

4 files changed, 15 insertions, 12 deletions

diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala
index 978a871..dddd468 100644
--- a/src/main/scala/org/perl8/test/TestMore.scala
+++ b/src/main/scala/org/perl8/test/TestMore.scala
@@ -1,5 +1,6 @@
 package org.perl8.test
 
+import org.perl8.test.tap.TestBuilder
 import org.perl8.test.Utils._
 
 import java.io.OutputStream
diff --git a/src/main/scala/org/perl8/test/TestHarness.scala b/src/main/scala/org/perl8/test/harness/TestHarness.scala
index ec2aafa..2d152d8 100644
--- a/src/main/scala/org/perl8/test/TestHarness.scala
+++ b/src/main/scala/org/perl8/test/harness/TestHarness.scala
@@ -1,4 +1,6 @@
-package org.perl8.test
+package org.perl8.test.harness
+
+import org.perl8.test.Test
 
 object TestHarness {
   def main (args: Array[String]) {
diff --git a/src/main/scala/org/perl8/test/TAP.scala b/src/main/scala/org/perl8/test/tap/Producer.scala
index d283875..28c9142 100644
--- a/src/main/scala/org/perl8/test/TAP.scala
+++ b/src/main/scala/org/perl8/test/tap/Producer.scala
@@ -1,8 +1,8 @@
-package org.perl8.test
+package org.perl8.test.tap
 
-import Utils._
+import org.perl8.test.Utils._
 
-object TAP {
+object Producer {
   def result (
     cond: Boolean,
     num:  Int,
diff --git a/src/main/scala/org/perl8/test/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala
index 61533a0..f9c684c 100644
--- a/src/main/scala/org/perl8/test/TestBuilder.scala
+++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala
@@ -1,8 +1,8 @@
-package org.perl8.test
+package org.perl8.test.tap
 
 import java.io.OutputStream
 
-import Utils._
+import org.perl8.test.Utils._
 
 class TestBuilder (
   plan:             Option[Plan],
@@ -10,7 +10,7 @@ class TestBuilder (
   val indent:       Int,
   private val name: Message
 ) {
-  plan.foreach(p => println(TAP.plan(p)))
+  plan.foreach(p => println(Producer.plan(p)))
 
   def this (
     plan:   Plan,
@@ -32,29 +32,29 @@ class TestBuilder (
     description: Message = NoMessage,
     todo:        Message = NoMessage
   ) {
-    val line = TAP.result(test, state.currentTest, description, todo)
+    val line = Producer.result(test, state.currentTest, description, todo)
     state.ok(test || todo.isDefined)
     println(line)
   }
 
   def skip (reason: Message = NoMessage) {
-    val line = TAP.skip(state.currentTest, reason)
+    val line = Producer.skip(state.currentTest, reason)
     state.ok(true)
     println(line)
   }
 
   def diag (message: Message) {
-    message.foreach(m => println(TAP.comment(m)))
+    message.foreach(m => println(Producer.comment(m)))
   }
 
   def bailOut (message: Message = NoMessage) {
-    println(TAP.bailOut(message))
+    println(Producer.bailOut(message))
     throw new BailOutException(message.getOrElse(""))
   }
 
   def doneTesting () {
     plan match {
-      case None => println(TAP.plan(state.currentTest - 1))
+      case None => println(Producer.plan(state.currentTest - 1))
       case _    => ()
     }