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

drop compatibility framework definitions (dead anyway)

This commit is contained in:
Mark Harrah 2012-02-07 21:56:37 -05:00
parent 111dfba6a3
commit bb765db6c2
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/Defaults.scala
View File

@ -276,7 +276,7 @@ object Defaults extends BuildCommon
testLoader <<= (fullClasspath, scalaInstance, taskTemporaryDirectory) map { (cp, si, temp) => TestFramework.createTestLoader(data(cp), si, IO.createUniqueDirectory(temp)) }, testLoader <<= (fullClasspath, scalaInstance, taskTemporaryDirectory) map { (cp, si, temp) => TestFramework.createTestLoader(data(cp), si, IO.createUniqueDirectory(temp)) },
testFrameworks in GlobalScope :== { testFrameworks in GlobalScope :== {
import sbt.TestFrameworks._ import sbt.TestFrameworks._
Seq(ScalaCheck, Specs2, Specs, ScalaTest, ScalaCheckCompat, ScalaTestCompat, SpecsCompat, JUnit) Seq(ScalaCheck, Specs2, Specs, ScalaTest, JUnit)
}, },
loadedTestFrameworks <<= (testFrameworks, streams, testLoader) map { (frameworks, s, loader) => loadedTestFrameworks <<= (testFrameworks, streams, testLoader) map { (frameworks, s, loader) =>
frameworks.flatMap(f => f.create(loader, s.log).map( x => (f,x)).toIterable).toMap frameworks.flatMap(f => f.create(loader, s.log).map( x => (f,x)).toIterable).toMap

4
testing/TestFramework.scala
View File

@ -21,10 +21,6 @@ object TestFrameworks
val Specs = new TestFramework("org.specs.runner.SpecsFramework") val Specs = new TestFramework("org.specs.runner.SpecsFramework")
val Specs2 = new TestFramework("org.specs2.runner.SpecsFramework") val Specs2 = new TestFramework("org.specs2.runner.SpecsFramework")
val JUnit = new TestFramework("com.novocode.junit.JUnitFramework") val JUnit = new TestFramework("com.novocode.junit.JUnitFramework")
// These are compatibility frameworks included in the 'test-compat' library
val ScalaCheckCompat = new TestFramework("sbt.impl.ScalaCheckFramework")
val ScalaTestCompat = new TestFramework("sbt.impl.ScalaTestFramework")
val SpecsCompat = new TestFramework("sbt.impl.SpecsFramework")
} }
class TestFramework(val implClassName: String) class TestFramework(val implClassName: String)