luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow setup, cleanup functions to access ClassLoader used for testing

This commit is contained in:
Mark Harrah 2010-09-13 19:43:37 -04:00
parent 15abc87c45
commit 1a122d380f
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbt/src/main/scala/sbt/ScalaProject.scala
View File

@ -69,8 +69,12 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
trait PackageOption extends ActionOption trait PackageOption extends ActionOption
trait TestOption extends ActionOption trait TestOption extends ActionOption
case class TestSetup(setup: () => Option[String]) extends TestOption case class TestSetup(setup: ClassLoader => Unit) extends TestOption {
case class TestCleanup(cleanup: () => Option[String]) extends TestOption def this(setup: () => Unit) = this(_ => setup())
}
case class TestCleanup(cleanup: ClassLoader => Unit) extends TestOption {
def this(setup: () => Unit) = this(_ => setup())
}
case class ExcludeTests(tests: Iterable[String]) extends TestOption case class ExcludeTests(tests: Iterable[String]) extends TestOption
case class TestListeners(listeners: Iterable[TestReportListener]) extends TestOption case class TestListeners(listeners: Iterable[TestReportListener]) extends TestOption
case class TestFilter(filterTest: String => Boolean) extends TestOption case class TestFilter(filterTest: String => Boolean) extends TestOption
@ -275,7 +279,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
val testFilters = new ListBuffer[String => Boolean] val testFilters = new ListBuffer[String => Boolean]
val excludeTestsSet = new HashSet[String] val excludeTestsSet = new HashSet[String]
val setup, cleanup = new ListBuffer[() => Option[String]] val setup, cleanup = new ListBuffer[ClassLoader => Unit]
val testListeners = new ListBuffer[TestReportListener] val testListeners = new ListBuffer[TestReportListener]
val testArgsByFramework = Map[TestFramework, ListBuffer[String]]() val testArgsByFramework = Map[TestFramework, ListBuffer[String]]()
def frameworkArgs(framework: TestFramework): ListBuffer[String] = def frameworkArgs(framework: TestFramework): ListBuffer[String] =

18
testing/TestFramework.scala
View File

@ -126,8 +126,8 @@ object TestFramework
log: Logger, log: Logger,
listeners: Seq[TestReportListener], listeners: Seq[TestReportListener],
endErrorsEnabled: Boolean, endErrorsEnabled: Boolean,
setup: Iterable[() => Unit], setup: Iterable[ClassLoader => Unit],
cleanup: Iterable[() => Unit], cleanup: Iterable[ClassLoader => Unit],
testArgsByFramework: Map[TestFramework, Seq[String]]): testArgsByFramework: Map[TestFramework, Seq[String]]):
(Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) = (Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
{ {
@ -135,7 +135,7 @@ object TestFramework
val arguments = immutable.Map() ++ val arguments = immutable.Map() ++
( for(framework <- frameworks; created <- framework.create(loader, log)) yield ( for(framework <- frameworks; created <- framework.create(loader, log)) yield
(created, testArgsByFramework.getOrElse(framework, Nil)) ) (created, testArgsByFramework.getOrElse(framework, Nil)) )
val cleanTmp = () => IO.delete(tempDir) val cleanTmp = (_: ClassLoader) => IO.delete(tempDir)
val mappedTests = testMap(arguments.keys.toList, tests, arguments) val mappedTests = testMap(arguments.keys.toList, tests, arguments)
if(mappedTests.isEmpty) if(mappedTests.isEmpty)
@ -162,12 +162,12 @@ object TestFramework
assignTests() assignTests()
(immutable.Map() ++ map) transform { (framework, tests) => (tests, args(framework)) } (immutable.Map() ++ map) transform { (framework, tests) => (tests, args(framework)) }
} }
private def createTasks(work: Iterable[() => Unit], baseName: String) = private def createTasks[T](work: Iterable[T => Unit], baseName: String, input: T) =
work.toList.zipWithIndex.map{ case (work, index) => new NamedTestTask(baseName + " " + (index+1), work()) } work.toList.zipWithIndex.map{ case (work, index) => new NamedTestTask(baseName + " " + (index+1), work(input)) }
private def createTestTasks(loader: ClassLoader, tests: Map[Framework, (Set[TestDefinition], Seq[String])], log: Logger, private def createTestTasks(loader: ClassLoader, tests: Map[Framework, (Set[TestDefinition], Seq[String])], log: Logger,
listeners: Seq[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Unit], listeners: Seq[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[ClassLoader => Unit],
cleanup: Iterable[() => Unit]) = cleanup: Iterable[ClassLoader => Unit]) =
{ {
val testsListeners = listeners.filter(_.isInstanceOf[TestsListener]).map(_.asInstanceOf[TestsListener]) val testsListeners = listeners.filter(_.isInstanceOf[TestsListener]).map(_.asInstanceOf[TestsListener])
def foreachListenerSafe(f: TestsListener => Unit): Unit = safeForeach(testsListeners, log)(f) def foreachListenerSafe(f: TestsListener => Unit): Unit = safeForeach(testsListeners, log)(f)
@ -179,7 +179,7 @@ object TestFramework
def apply() = synchronized { value } def apply() = synchronized { value }
def update(v: Result.Value): Unit = synchronized { if(value != Error) value = v } def update(v: Result.Value): Unit = synchronized { if(value != Error) value = v }
} }
val startTask = new NamedTestTask(TestStartName, {foreachListenerSafe(_.doInit); None}) :: createTasks(setup, "Test setup") val startTask = new NamedTestTask(TestStartName, {foreachListenerSafe(_.doInit); None}) :: createTasks(setup, "Test setup", loader)
val testTasks = val testTasks =
tests flatMap { case (framework, (testDefinitions, testArgs)) => tests flatMap { case (framework, (testDefinitions, testArgs)) =>
@ -220,7 +220,7 @@ object TestFramework
} }
} }
} }
val endTask = new NamedTestTask(TestFinishName, end() ) :: createTasks(cleanup, "Test cleanup") val endTask = new NamedTestTask(TestFinishName, end() ) :: createTasks(cleanup, "Test cleanup", loader)
(startTask, testTasks, endTask) (startTask, testTasks, endTask)
} }
def createTestLoader(classpath: Iterable[Path], scalaInstance: ScalaInstance): (ClassLoader, Path) = def createTestLoader(classpath: Iterable[Path], scalaInstance: ScalaInstance): (ClassLoader, Path) =