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

make it easier to create new test-* actions with different options

This commit is contained in:
Mark Harrah 2010-05-11 13:05:17 -04:00
parent fed0e5329f
commit ead0c5a68f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sbt/src/main/scala/sbt/DefaultProject.scala
View File

@ -98,7 +98,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
getMainClass(false).map(MainClass(_)).toList getMainClass(false).map(MainClass(_)).toList
private def succeededTestPath = testAnalysisPath / "succeeded-tests" private def succeededTestPath = testAnalysisPath / "succeeded-tests"
private def quickOptions(failedOnly: Boolean) = protected final def quickOptions(failedOnly: Boolean) =
{ {
val path = succeededTestPath val path = succeededTestPath
val analysis = testCompileConditional.analysis val analysis = testCompileConditional.analysis
@ -281,12 +281,11 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
protected def docTestAction = scaladocTask(testLabel, testSources, testDocPath, docClasspath, documentOptions).dependsOn(testCompile) describedAs TestDocDescription protected def docTestAction = scaladocTask(testLabel, testSources, testDocPath, docClasspath, documentOptions).dependsOn(testCompile) describedAs TestDocDescription
protected def testAction = defaultTestTask(testOptions) protected def testAction = defaultTestTask(testOptions)
protected def testOnlyAction = testQuickMethod(testCompileConditional.analysis, testOptions)((options) => { protected def testOnlyAction = testOnlyTask(testOptions)
defaultTestTask(options) protected def testOnlyTask(testOptions: => Seq[TestOption]) = testQuickMethod(testCompileConditional.analysis, testOptions)(o => defaultTestTask(o)) describedAs (TestOnlyDescription)
}) describedAs (TestOnlyDescription) protected def testQuickAction = defaultTestQuickMethod(false, testOptions) describedAs (TestQuickDescription)
protected def testQuickAction = defaultTestQuickMethod(false) describedAs (TestQuickDescription) protected def testFailedAction = defaultTestQuickMethod(true, testOptions) describedAs (TestFailedDescription)
protected def testFailedAction = defaultTestQuickMethod(true) describedAs (TestFailedDescription) protected def defaultTestQuickMethod(failedOnly: Boolean, testOptions: => Seq[TestOption]) =
protected def defaultTestQuickMethod(failedOnly: Boolean) =
testQuickMethod(testCompileConditional.analysis, testOptions)(options => defaultTestTask(quickOptions(failedOnly) ::: options.toList)) testQuickMethod(testCompileConditional.analysis, testOptions)(options => defaultTestTask(quickOptions(failedOnly) ::: options.toList))
protected def defaultTestTask(testOptions: => Seq[TestOption]) = protected def defaultTestTask(testOptions: => Seq[TestOption]) =
testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile, copyResources, copyTestResources) describedAs TestDescription testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile, copyResources, copyTestResources) describedAs TestDescription