Some additional simplification of AbstractRunner initialization

Author: szeiger

src/partest/scala/tools/partest/nest/AbstractRunner.scala

@@ -18,13 +18,11 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeUnit.NANOSECONDS
 
-abstract class AbstractRunner {
+class AbstractRunner(val config: RunnerSpec.Config, protected final val testSourcePath: String, val fileManager: FileManager) {
 
-  val config: RunnerSpec.Config
-  val fileManager: FileManager
-  protected val testSourcePath: String
-
-  lazy val nestUI: NestUI = new NestUI(
+  // lazy because colorEnabled is overridden in SBTRunner
+  // TODO: integrate NestUI into AbstractRunner
+  private lazy val nestUI: NestUI = new NestUI(
     verbose = config.optVerbose,
     debug = config.optDebug || propOrFalse("partest.debug"),
     terse = config.optTerse,

src/partest/scala/tools/partest/nest/ConsoleRunner.scala

@@ -6,14 +6,14 @@
 package scala.tools.partest
 package nest
 
-class ConsoleRunner(val config: RunnerSpec.Config) extends AbstractRunner {
-  val testSourcePath = config.optSourcePath getOrElse PartestDefaults.sourcePath
-  val fileManager = new FileManager(ClassPath split PathResolver.Environment.javaUserClassPath map (Path(_))) // the script sets up our classpath for us via ant
-}
-
 object ConsoleRunner {
   def main(args: Array[String]): Unit = {
-    val r = new ConsoleRunner(RunnerSpec.forArgs(args))
+    val config = RunnerSpec.forArgs(args)
+    val r = new AbstractRunner(
+      config,
+      config.optSourcePath getOrElse PartestDefaults.sourcePath,
+      new FileManager(ClassPath split PathResolver.Environment.javaUserClassPath map (Path(_))) // the script sets up our classpath for us via ant
+    )
     // So we can ctrl-C a test run and still hear all
     // the buffered failure info.
     scala.sys addShutdownHook r.issueSummaryReport()

src/partest/scala/tools/partest/nest/Runner.scala

@@ -753,21 +753,7 @@ class Runner(val testFile: File, val suiteRunner: AbstractRunner, val nestUI: Ne
 /** Loads `library.properties` from the jar. */
 object Properties extends scala.util.PropertiesTrait {
   protected def propCategory    = "partest"
-  protected def pickJarBasedOn  = classOf[SuiteRunner]
-}
-
-/** Used by SBT- and ConsoleRunner for running a set of tests. */
-class SuiteRunner(
-  val config: RunnerSpec.Config,
-  val testSourcePath: String, // relative path, like "files", or "pending"
-  val fileManager: FileManager,
-  val nestUI: NestUI,
-  val javaCmdPath: String = PartestDefaults.javaCmd,
-  val javacCmdPath: String = PartestDefaults.javacCmd,
-  val scalacExtraArgs: Seq[String] = Seq.empty,
-  val javaOpts: String = PartestDefaults.javaOpts,
-  val scalacOpts: String = PartestDefaults.scalacOpts) {
-
+  protected def pickJarBasedOn  = classOf[AbstractRunner]
 }
 
 case class TimeoutException(duration: Duration) extends RuntimeException

src/partest/scala/tools/partest/sbt/SBTRunner.scala

@@ -14,12 +14,16 @@ import _root_.sbt.testing._
 
 import scala.tools.partest.TestState._
 import scala.tools.partest._
-import scala.tools.partest.nest.{AbstractRunner, FileManager, RunnerSpec, SuiteRunner}
+import scala.tools.partest.nest.{AbstractRunner, FileManager, RunnerSpec}
 
-class SBTRunner(val config: RunnerSpec.Config,
+class SBTRunner(config: RunnerSpec.Config,
                 partestFingerprint: Fingerprint, eventHandler: EventHandler, loggers: Array[Logger],
                 srcDir: String, testClassLoader: URLClassLoader, javaCmd: File, javacCmd: File,
-                scalacArgs: Array[String], args: Array[String]) extends AbstractRunner {
+                scalacArgs: Array[String], args: Array[String]) extends AbstractRunner(
+  config,
+  config.optSourcePath orElse Option(srcDir) getOrElse PartestDefaults.sourcePath,
+  new FileManager(testClassLoader = testClassLoader)
+) {
 
   // no summary, SBT will do that for us
   override protected val printSummary = false
@@ -58,9 +62,6 @@ class SBTRunner(val config: RunnerSpec.Config,
   override val javacCmdPath = Option(javacCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javacCmd
   override val scalacExtraArgs = scalacArgs.toIndexedSeq
 
-  val testSourcePath: String = config.optSourcePath orElse Option(srcDir) getOrElse PartestDefaults.sourcePath
-  val fileManager = new FileManager(testClassLoader = testClassLoader)
-
   override def onFinishTest(testFile: File, result: TestState, durationMs: Long): TestState = {
     synchronized {
       eventHandler.handle(new Event {