From 739a7f0ec6c1995c25b9e1eb06a2ed99e1cad450 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 23 Feb 2013 17:13:27 -0600 Subject: clean up imports --- src/main/scala/org/perl8/test/TestMore.scala | 1 - src/main/scala/org/perl8/test/Utils.scala | 48 -------------------- .../org/perl8/test/harness/SummaryReporter.scala | 1 - .../scala/org/perl8/test/harness/TAPReporter.scala | 1 - .../scala/org/perl8/test/harness/TestHarness.scala | 5 +-- src/main/scala/org/perl8/test/harness/Utils.scala | 21 --------- .../scala/org/perl8/test/harness/package.scala | 21 +++++++++ src/main/scala/org/perl8/test/package.scala | 51 ++++++++++++++++++---- src/main/scala/org/perl8/test/sbt/Runner.scala | 1 - src/main/scala/org/perl8/test/tap/Consumer.scala | 8 ++-- src/main/scala/org/perl8/test/tap/Producer.scala | 4 +- .../scala/org/perl8/test/tap/TestBuilder.scala | 2 +- .../scala/org/perl8/test/tap/ConsumerTest.scala | 4 +- .../scala/org/perl8/test/tap/TestBuilderTest.scala | 4 +- 14 files changed, 75 insertions(+), 97 deletions(-) delete mode 100644 src/main/scala/org/perl8/test/Utils.scala delete mode 100644 src/main/scala/org/perl8/test/harness/Utils.scala create mode 100644 src/main/scala/org/perl8/test/harness/package.scala diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala index 2253d31..abd2126 100644 --- a/src/main/scala/org/perl8/test/TestMore.scala +++ b/src/main/scala/org/perl8/test/TestMore.scala @@ -1,7 +1,6 @@ package org.perl8.test import org.perl8.test.tap.TestBuilder -import org.perl8.test.Utils._ import scala.util.matching.Regex diff --git a/src/main/scala/org/perl8/test/Utils.scala b/src/main/scala/org/perl8/test/Utils.scala deleted file mode 100644 index 66befd3..0000000 --- a/src/main/scala/org/perl8/test/Utils.scala +++ /dev/null @@ -1,48 +0,0 @@ -package org.perl8.test - -import language.implicitConversions - -object Utils { - trait Plan { - val plan: Int - val skipAll: Boolean - val message: Option[String] - } - - 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) -} diff --git a/src/main/scala/org/perl8/test/harness/SummaryReporter.scala b/src/main/scala/org/perl8/test/harness/SummaryReporter.scala index 460059a..fc03097 100644 --- a/src/main/scala/org/perl8/test/harness/SummaryReporter.scala +++ b/src/main/scala/org/perl8/test/harness/SummaryReporter.scala @@ -5,7 +5,6 @@ import java.io.ByteArrayOutputStream import org.perl8.test.Test import org.perl8.test.tap import org.perl8.test.tap.{TAPResult,TodoDirective} -import Utils._ class SummaryReporter extends MultiTestReporter { def run (testNames: Seq[String]): Int = { diff --git a/src/main/scala/org/perl8/test/harness/TAPReporter.scala b/src/main/scala/org/perl8/test/harness/TAPReporter.scala index 574dd39..87d4955 100644 --- a/src/main/scala/org/perl8/test/harness/TAPReporter.scala +++ b/src/main/scala/org/perl8/test/harness/TAPReporter.scala @@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream import org.perl8.test.tap import org.perl8.test.Test -import Utils._ class TAPReporter extends Reporter { def run (testName: String): Int = { diff --git a/src/main/scala/org/perl8/test/harness/TestHarness.scala b/src/main/scala/org/perl8/test/harness/TestHarness.scala index 1e48544..4865c2c 100644 --- a/src/main/scala/org/perl8/test/harness/TestHarness.scala +++ b/src/main/scala/org/perl8/test/harness/TestHarness.scala @@ -1,9 +1,8 @@ package org.perl8.test.harness -import org.perl8.test.Test -import Utils._ - object TestHarness { + import org.perl8.test.Test + def main (args: Array[String]) { val (reporterName, idx, multi) = if (args.length >= 2 && args(0) == "-r") { (args(1), 2, false) diff --git a/src/main/scala/org/perl8/test/harness/Utils.scala b/src/main/scala/org/perl8/test/harness/Utils.scala deleted file mode 100644 index acde332..0000000 --- a/src/main/scala/org/perl8/test/harness/Utils.scala +++ /dev/null @@ -1,21 +0,0 @@ -package org.perl8.test.harness - -import scala.reflect.{ClassTag,classTag} - -object Utils { - def loadClass[T: ClassTag] (className: String): Class[_] = - classTag[T].runtimeClass.getClassLoader.loadClass(className) - - def newInstance[T: ClassTag] (className: String): T = - loadClass[T](className).newInstance.asInstanceOf[T] - - def newInstance[T: ClassTag, U <: AnyRef: ClassTag] ( - className: String, - arg: U - ): T = { - val classObj = loadClass[T](className) - val argClassObj = classTag[U].runtimeClass - val constructor = classObj.getConstructor(argClassObj) - constructor.newInstance(arg).asInstanceOf[T] - } -} diff --git a/src/main/scala/org/perl8/test/harness/package.scala b/src/main/scala/org/perl8/test/harness/package.scala new file mode 100644 index 0000000..a5641e8 --- /dev/null +++ b/src/main/scala/org/perl8/test/harness/package.scala @@ -0,0 +1,21 @@ +package org.perl8.test + +package object harness { + import scala.reflect.{ClassTag,classTag} + + def loadClass[T: ClassTag] (className: String): Class[_] = + classTag[T].runtimeClass.getClassLoader.loadClass(className) + + def newInstance[T: ClassTag] (className: String): T = + loadClass[T](className).newInstance.asInstanceOf[T] + + def newInstance[T: ClassTag, U <: AnyRef: ClassTag] ( + className: String, + arg: U + ): T = { + val classObj = loadClass[T](className) + val argClassObj = classTag[U].runtimeClass + val constructor = classObj.getConstructor(argClassObj) + constructor.newInstance(arg).asInstanceOf[T] + } +} 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) } diff --git a/src/main/scala/org/perl8/test/sbt/Runner.scala b/src/main/scala/org/perl8/test/sbt/Runner.scala index e75f799..6dc040e 100644 --- a/src/main/scala/org/perl8/test/sbt/Runner.scala +++ b/src/main/scala/org/perl8/test/sbt/Runner.scala @@ -2,7 +2,6 @@ package org.perl8.test.sbt import org.scalatools.testing.{EventHandler,Logger} -import org.perl8.test.harness.Utils._ import org.perl8.test.harness.SummaryReporter import org.perl8.test.Test diff --git a/src/main/scala/org/perl8/test/tap/Consumer.scala b/src/main/scala/org/perl8/test/tap/Consumer.scala index 299e390..6a31c7b 100644 --- a/src/main/scala/org/perl8/test/tap/Consumer.scala +++ b/src/main/scala/org/perl8/test/tap/Consumer.scala @@ -1,11 +1,11 @@ package org.perl8.test.tap -import org.perl8.test.Utils._ - -import scala.util.parsing.combinator._ -import java.io.OutputStream +import org.perl8.test._ object Consumer { + import scala.util.parsing.combinator._ + import java.io.OutputStream + def parse (input: String): TAPResult = { import TAPParser.{parseAll,tap,Success,NoSuccess} diff --git a/src/main/scala/org/perl8/test/tap/Producer.scala b/src/main/scala/org/perl8/test/tap/Producer.scala index 28c9142..4b45970 100644 --- a/src/main/scala/org/perl8/test/tap/Producer.scala +++ b/src/main/scala/org/perl8/test/tap/Producer.scala @@ -1,8 +1,8 @@ package org.perl8.test.tap -import org.perl8.test.Utils._ - object Producer { + import org.perl8.test._ + def result ( cond: Boolean, num: Int, diff --git a/src/main/scala/org/perl8/test/tap/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala index 3dfa35a..421fa7f 100644 --- a/src/main/scala/org/perl8/test/tap/TestBuilder.scala +++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala @@ -1,6 +1,6 @@ package org.perl8.test.tap -import org.perl8.test.Utils._ +import org.perl8.test._ class TestBuilder ( plan: Option[Plan], diff --git a/src/test/scala/org/perl8/test/tap/ConsumerTest.scala b/src/test/scala/org/perl8/test/tap/ConsumerTest.scala index f43f095..e07e73d 100644 --- a/src/test/scala/org/perl8/test/tap/ConsumerTest.scala +++ b/src/test/scala/org/perl8/test/tap/ConsumerTest.scala @@ -1,8 +1,6 @@ package org.perl8.test.tap -import org.perl8.test.TestMore - -import org.perl8.test.Utils._ +import org.perl8.test.{TestMore,SkipAll,NumericPlan} class ConsumerTest extends TestMore { subtest ("basic") { diff --git a/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala b/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala index 423b823..0a3d624 100644 --- a/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala +++ b/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala @@ -1,11 +1,9 @@ package org.perl8.test.tap -import org.perl8.test.TestMore +import org.perl8.test.{TestMore,SkipAll,BailOutException} import java.io.ByteArrayOutputStream -import org.perl8.test.Utils._ - class TestBuilderTest extends TestMore { subtest ("ok") { val output = new ByteArrayOutputStream -- cgit v1.2.3-54-g00ecf