clean ups

4 files changed, 23 insertions, 19 deletions

diff --git a/src/main/scala/org/perl8/test/sbt/Fingerprint.scala b/src/main/scala/org/perl8/test/sbt/Fingerprint.scala
index cbe9403..9cea6f1 100644
--- a/src/main/scala/org/perl8/test/sbt/Fingerprint.scala
+++ b/src/main/scala/org/perl8/test/sbt/Fingerprint.scala
@@ -1,6 +1,8 @@
 package org.perl8.test.sbt
 
-object Fingerprint extends org.scalatools.testing.SubclassFingerprint {
+import org.scalatools.testing
+
+object Fingerprint extends testing.SubclassFingerprint {
   def isModule:       Boolean = false
   def superClassName: String  = "org.perl8.test.Test"
 }
diff --git a/src/main/scala/org/perl8/test/sbt/Framework.scala b/src/main/scala/org/perl8/test/sbt/Framework.scala
index 2fb4c7b..74ea6d8 100644
--- a/src/main/scala/org/perl8/test/sbt/Framework.scala
+++ b/src/main/scala/org/perl8/test/sbt/Framework.scala
@@ -1,13 +1,15 @@
 package org.perl8.test.sbt
 
-class Framework extends org.scalatools.testing.Framework {
-  val name:  String                                    = "Perl8 Test"
-  val tests: Array[org.scalatools.testing.Fingerprint] = Array(Fingerprint)
+import org.scalatools.testing
+
+class Framework extends testing.Framework {
+  val name:  String                     = "Perl8 Test"
+  val tests: Array[testing.Fingerprint] = Array(Fingerprint)
 
   def testRunner (
     testClassLoader: ClassLoader,
-    loggers: Array[org.scalatools.testing.Logger]
-  ): org.scalatools.testing.Runner = {
+    loggers:         Array[testing.Logger]
+  ): testing.Runner = {
     new Runner(testClassLoader, loggers)
   }
 }
diff --git a/src/main/scala/org/perl8/test/sbt/Runner.scala b/src/main/scala/org/perl8/test/sbt/Runner.scala
index 6dc040e..f403b32 100644
--- a/src/main/scala/org/perl8/test/sbt/Runner.scala
+++ b/src/main/scala/org/perl8/test/sbt/Runner.scala
@@ -1,18 +1,18 @@
 package org.perl8.test.sbt
 
-import org.scalatools.testing.{EventHandler,Logger}
+import org.scalatools.testing
 
 import org.perl8.test.harness.SummaryReporter
 import org.perl8.test.Test
 
 class Runner (
   loader:  ClassLoader,
-  loggers: Array[Logger]
-) extends org.scalatools.testing.Runner2 {
+  loggers: Array[testing.Logger]
+) extends testing.Runner2 {
   def run (
     testClassName: String,
-    fingerprint:   org.scalatools.testing.Fingerprint,
-    eventHandler:  EventHandler,
+    fingerprint:   testing.Fingerprint,
+    eventHandler:  testing.EventHandler,
     args:          Array[String]
   ) {
     val reporter = new SBTReporter(loader, loggers, eventHandler)
diff --git a/src/main/scala/org/perl8/test/sbt/SBTReporter.scala b/src/main/scala/org/perl8/test/sbt/SBTReporter.scala
index 2af5c09..a4f414a 100644
--- a/src/main/scala/org/perl8/test/sbt/SBTReporter.scala
+++ b/src/main/scala/org/perl8/test/sbt/SBTReporter.scala
@@ -1,7 +1,7 @@
 package org.perl8.test.sbt
 
 import java.io.ByteArrayOutputStream
-import org.scalatools.testing.{EventHandler,Event,Result,Logger}
+import org.scalatools.testing
 
 import org.perl8.test.harness._
 import org.perl8.test.tap
@@ -9,8 +9,8 @@ import org.perl8.test.Test
 
 class SBTReporter (
   loader:       ClassLoader,
-  loggers:      Array[Logger],
-  eventHandler: EventHandler
+  loggers:      Array[testing.Logger],
+  eventHandler: testing.EventHandler
 ) extends Reporter {
   def run (testName: String): Int = {
     val test = loader.loadClass(testName).newInstance.asInstanceOf[Test]
@@ -23,18 +23,18 @@ class SBTReporter (
     val result = (new tap.Parser).parse(out)
 
     result.results.foreach { r =>
-      val event = new Event {
+      val event = new testing.Event {
         val testName:    String = r.description
         val description: String = r.description
-        val result:      Result =
+        val result:      testing.Result =
           if (r.passed) {
-            Result.Success
+            testing.Result.Success
           }
           else if (r.directive.isDefined) {
-            Result.Skipped
+            testing.Result.Skipped
           }
           else {
-            Result.Failure
+            testing.Result.Failure
           }
         val error: Throwable = null
       }