luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-07 19:05:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

-Changed behavior so that only a single Runner instance is used to run tests in multiple test groups.

Browse Source 
-Added code to support remoteArgs in test-interface 1.0.
This commit is contained in:
cheeseng
2013-04-23 11:09:50 +08:00
parent d2e40c1c56
commit 244e65cd79
6 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/src/main/scala/sbt/TestFramework.scala
+10 -15
View File
@@ -54,8 +54,7 @@ final class TestDefinition(val name: String, val fingerprint: Fingerprint)
override def hashCode: Int = (name.hashCode, TestFramework.hashCode(fingerprint)).hashCode
}
final class TestRunner(framework: Framework, loader: ClassLoader, args: Array[String], listeners: Seq[TestReportListener], log: Logger) {
val delegate = framework.runner(args, Array.empty, loader)
final class TestRunner(delegate: Runner, listeners: Seq[TestReportListener], log: Logger) {
final def run(testDefinition: TestDefinition): TestResult.Value =
{
@@ -133,7 +132,8 @@ object TestFramework
case _ => f.toString
}
def testTasks(frameworks: Seq[Framework],
def testTasks(frameworks: Map[TestFramework, Framework],
runners: Map[TestFramework, Runner],
testLoader: ClassLoader,
tests: Seq[TestDefinition],
log: Logger,
@@ -142,11 +142,11 @@ object TestFramework
(() => Unit, Seq[(String, () => TestResult.Value)], TestResult.Value => () => Unit) =
{
val arguments = testArgsByFramework withDefaultValue Nil
val mappedTests = testMap(frameworks, tests, arguments)
val mappedTests = testMap(frameworks.values.toSeq, tests, arguments)
if(mappedTests.isEmpty)
(() => (), Nil, _ => () => () )
else
createTestTasks(testLoader, mappedTests, tests, log, listeners)
createTestTasks(testLoader, runners.map { case (tf, r) => (frameworks(tf), new TestRunner(r, listeners, log))}, mappedTests, tests, log, listeners)
}
private[this] def order(mapped: Map[String, () => TestResult.Value], inputs: Seq[TestDefinition]): Seq[(String, () => TestResult.Value)] =
@@ -180,24 +180,19 @@ object TestFramework
new TestDefinition(name, pickOne(defs.map(_.fingerprint)))
uniqueDefs.toSet
}
private def createTestTasks(loader: ClassLoader, tests: Map[Framework, (Set[TestDefinition], Seq[String])], ordered: Seq[TestDefinition], log: Logger, listeners: Seq[TestReportListener]) =
private def createTestTasks(loader: ClassLoader, runners: Map[Framework, TestRunner], tests: Map[Framework, (Set[TestDefinition], Seq[String])], ordered: Seq[TestDefinition], log: Logger, listeners: Seq[TestReportListener]) =
{
val testsListeners = listeners collect { case tl: TestsListener => tl }
val runnerMap =
tests map { case (framework, (testDefinitions, testArgs)) =>
(framework, new TestRunner(framework, loader, testArgs.toArray, listeners, log))
}
def foreachListenerSafe(f: TestsListener => Unit): () => Unit = () => safeForeach(testsListeners, log)(f)
import TestResult.{Error,Passed,Failed}
import TestResult.{Error,Passed,Failed}
val startTask = foreachListenerSafe(_.doInit)
val testTasks =
tests flatMap { case (framework, (testDefinitions, testArgs)) =>
val runner = runnerMap(framework)
val runner = runners(framework)
for(testDefinition <- testDefinitions) yield
{
val runTest = () => withContextLoader(loader) { runner.run(testDefinition) }