Better abstraction for JUnit run tests

2 files changed, 22 insertions, 11 deletions

diff --git a/test/junit/scala/issues/RunTest.scala b/test/junit/scala/issues/RunTest.scala
index 3ebdc8a72f..0686d73d9b 100644
--- a/test/junit/scala/issues/RunTest.scala
+++ b/test/junit/scala/issues/RunTest.scala
@@ -1,13 +1,11 @@
 package scala.issues
 
+import org.junit.Assert._
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import org.junit.{AfterClass, BeforeClass, Test}
-import org.junit.Assert._
 
-import scala.reflect.runtime._
-import scala.tools.reflect.ToolBox
-import scala.tools.testing.ClearAfterClass
+import scala.tools.testing.RunTesting
 
 object RunTest {
   class VC(val x: Any) extends AnyVal
@@ -15,12 +13,8 @@ object RunTest {
 }
 
 @RunWith(classOf[JUnit4])
-class RunTest extends ClearAfterClass {
-  val toolBox = cached("toolbox", () => universe.runtimeMirror(getClass.getClassLoader).mkToolBox())
-
-  def run[T](code: String): T = {
-    toolBox.eval(toolBox.parse(code)).asInstanceOf[T]
-  }
+class RunTest extends RunTesting {
+  import runner._
 
   @Test
   def classOfValueClassAlias(): Unit = {
diff --git a/test/junit/scala/tools/testing/RunTesting.scala b/test/junit/scala/tools/testing/RunTesting.scala
new file mode 100644
index 0000000000..1320db4230
--- /dev/null
+++ b/test/junit/scala/tools/testing/RunTesting.scala
@@ -0,0 +1,17 @@
+package scala.tools.testing
+
+import scala.reflect.runtime._
+import scala.tools.reflect.ToolBox
+
+trait RunTesting extends ClearAfterClass {
+  def compilerArgs = "" // to be overridden
+  val runner = cached("toolbox", () => Runner.make(compilerArgs))
+}
+
+class Runner(val toolBox: ToolBox[universe.type]) {
+  def run[T](code: String): T = toolBox.eval(toolBox.parse(code)).asInstanceOf[T]
+}
+
+object Runner {
+  def make(compilerArgs: String) = new Runner(universe.runtimeMirror(getClass.getClassLoader).mkToolBox(options = compilerArgs))
+}