From 04e50bd21814b1074e22af12cab7e493fec6a751 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 21 Dec 2009 21:32:10 -0500 Subject: [PATCH] Add szeiger's implementation of test-interface for JUnit to list of known frameworks --- src/main/scala/sbt/DefaultProject.scala | 4 ++-- src/main/scala/sbt/TestFramework.scala | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala index 397981119..3b8e2eb50 100644 --- a/src/main/scala/sbt/DefaultProject.scala +++ b/src/main/scala/sbt/DefaultProject.scala @@ -178,8 +178,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec * run*/ def testFrameworks: Seq[TestFramework] = { - import TestFrameworks.{ScalaCheck, ScalaTest, Specs} - ScalaCheck :: Specs :: ScalaTest :: Nil + import TestFrameworks.{JUnit, ScalaCheck, ScalaTest, Specs} + ScalaCheck :: Specs :: ScalaTest :: JUnit :: Nil } /** The list of listeners for testing. */ def testListeners: Seq[TestReportListener] = TestLogger(log) :: Nil diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala index a1ea479ed..eec1bde59 100644 --- a/src/main/scala/sbt/TestFramework.scala +++ b/src/main/scala/sbt/TestFramework.scala @@ -17,6 +17,7 @@ object TestFrameworks val ScalaCheck = new TestFramework("org.scalacheck.ScalaCheckFramework") val ScalaTest = new TestFramework("org.scalatest.tools.ScalaTestFramework") val Specs = new TestFramework("org.specs.runner.SpecsFramework") + val JUnit = new TestFramework("com.novocode.junit.JUnitFramework") } class TestFramework(val implClassName: String) extends NotNull