clean up imports

1 files changed, 43 insertions, 8 deletions

diff --git a/src/main/scala/org/perl8/test/package.scala b/src/main/scala/org/perl8/test/package.scala
index 75c661c..485c200 100644
--- a/src/main/scala/org/perl8/test/package.scala
+++ b/src/main/scala/org/perl8/test/package.scala
@@ -6,14 +6,49 @@ package object test {
   implicit def intToPlan (p: Int): Plan =
     NumericPlan(p)
 
-  implicit def stringToMessage (s: String): Utils.Message =
-    new Utils.HasMessage(s)
+  implicit def stringToMessage (s: String): Message =
+    new HasMessage(s)
 
-  type Plan        = Utils.Plan
-  type NumericPlan = Utils.NumericPlan
-  val NumericPlan  = Utils.NumericPlan
-  type SkipAll     = Utils.SkipAll
-  val SkipAll      = Utils.SkipAll
+  trait Plan {
+    val plan:    Int
+    val skipAll: Boolean
+    val message: Option[String]
+  }
 
-  type BailOutException = Utils.BailOutException
+  case class NumericPlan (
+    override val plan: Int
+  ) extends Plan {
+    override val skipAll = false
+    override val message = None
+  }
+
+  case class SkipAll (
+    override val message: Option[String] = None
+  ) extends Plan {
+    override val plan    = 0
+    override val skipAll = true
+  }
+
+  object SkipAll {
+    def apply (reason: String) = new SkipAll(Some(reason))
+  }
+
+  trait Message
+  case class HasMessage (val contents: String) extends Message
+  case object NoMessage extends Message
+
+  implicit def messageToOption (message: Message): Option[String] =
+    message match {
+      case HasMessage(x) => Some(x)
+      case NoMessage     => None
+    }
+
+  implicit def optionToMessage (option: Option[String]): Message =
+    option match {
+      case Some(x) => HasMessage(x)
+      case None    => NoMessage
+    }
+
+  case class BailOutException (val message: String)
+    extends RuntimeException(message)
 }