diff --git a/sbt/src/sbt-test/tests/arguments/build.sbt b/sbt/src/sbt-test/tests/arguments/build.sbt index dc0273298..34c601886 100644 --- a/sbt/src/sbt-test/tests/arguments/build.sbt +++ b/sbt/src/sbt-test/tests/arguments/build.sbt @@ -1,4 +1,4 @@ -libraryDependencies += "org.scalatest" % "scalatest_2.9.1" % "1.6.1" % "test" +libraryDependencies += "org.scalatest" % "scalatest_2.10.0-RC3" % "1.8-B1" % "test" testOptions in Configurations.Test ++= { diff --git a/sbt/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala b/sbt/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala deleted file mode 100644 index e9dafcaaa..000000000 --- a/sbt/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala +++ /dev/null @@ -1,16 +0,0 @@ -import sbt._ - -class ArgumentTest(info: ProjectInfo) extends DefaultProject(info) -{ - val st = "org.scalatest" % "scalatest" % "1.3" - - override def testOptions = - super.testOptions ++ - args("success1", "-n", "test2 test3") ++ - args("success2", "-n", "test2") ++ - args("success3", "-n", "test3") ++ - args("failure1", "-n", "test1") ++ - args("failure2", "-n", "test1 test4") ++ - args("failure3", "-n", "test1 test3") - def args(path: Path, args: String*): Seq[TestOption] = if(path.exists) TestArgument(args : _*) :: Nil else Nil -} \ No newline at end of file diff --git a/sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala b/sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala index 4cfa42fef..e3595c778 100755 --- a/sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala +++ b/sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala @@ -13,9 +13,10 @@ object ForkTestsTest extends Build { def groupPrefix(idx: Int) = groupId(idx) + "_file_" lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq( + scalaVersion := "2.9.2", testGrouping <<= definedTests in Test map { tests => assert(tests.size == 1) - val groups = Stream const tests(0) take totalFiles grouped groupSize + val groups = Stream continually tests(0) take totalFiles grouped groupSize for ((ts, idx) <- groups.toSeq.zipWithIndex) yield { new Group(groupId(idx), ts, SubProcess(Seq("-Dgroup.prefix=" + groupPrefix(idx), "-Dgroup.size=" + ts.size))) } @@ -31,6 +32,6 @@ object ForkTestsTest extends Build { } }, concurrentRestrictions := Tags.limit(Tags.ForkedTestGroup, 2) :: Nil, - libraryDependencies += "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test" + libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % "test" )) } diff --git a/sbt/src/sbt-test/tests/it/project/B.scala b/sbt/src/sbt-test/tests/it/project/B.scala index 35dd74fcf..12b1223eb 100644 --- a/sbt/src/sbt-test/tests/it/project/B.scala +++ b/sbt/src/sbt-test/tests/it/project/B.scala @@ -12,5 +12,5 @@ object B extends Build resolvers += ScalaToolsReleases ) - lazy val specs = "org.specs2" % "specs2_2.9.1" % "1.7.1" % "it,test" + lazy val specs = "org.specs2" % "specs2_2.10" % "1.12.3" % "it,test" } \ No newline at end of file diff --git a/sbt/src/sbt-test/tests/resources/build.sbt b/sbt/src/sbt-test/tests/resources/build.sbt index 32c9211c7..9729bd66d 100644 --- a/sbt/src/sbt-test/tests/resources/build.sbt +++ b/sbt/src/sbt-test/tests/resources/build.sbt @@ -1,3 +1,3 @@ -libraryDependencies += "org.specs2" % "specs2_2.9.1" % "1.7.1" % "test" +libraryDependencies += "org.specs2" % "specs2_2.10" % "1.12.3" % "test" resolvers += ScalaToolsReleases \ No newline at end of file diff --git a/sbt/src/sbt-test/tests/specs-run/build.sbt b/sbt/src/sbt-test/tests/specs-run/build.sbt index 31868f0f8..03a93afc5 100644 --- a/sbt/src/sbt-test/tests/specs-run/build.sbt +++ b/sbt/src/sbt-test/tests/specs-run/build.sbt @@ -1,3 +1,5 @@ -libraryDependencies += "org.specs2" % "specs2_2.9.1" % "1.7.1" % "test" +scalaVersion := "2.9.1" + +libraryDependencies += "org.specs2" %% "specs2" % "1.7.1" % "test" resolvers += ScalaToolsReleases diff --git a/sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala b/sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala index 26e7903fc..0ccfa8381 100755 --- a/sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala +++ b/sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala @@ -10,6 +10,7 @@ object Ticket543Test extends Build { lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq( libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % "test", + scalaVersion := "2.9.2", fork := true, testListeners += new TestReportListener { def testEvent(event: TestEvent) { diff --git a/sbt/src/sbt-test/tests/test-quick/project/Build.scala b/sbt/src/sbt-test/tests/test-quick/project/Build.scala index e535ddf91..2e1a49577 100755 --- a/sbt/src/sbt-test/tests/test-quick/project/Build.scala +++ b/sbt/src/sbt-test/tests/test-quick/project/Build.scala @@ -4,7 +4,7 @@ import Defaults._ object B extends Build { lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq( - libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % "test" cross(CrossVersion.full), + libraryDependencies += "org.scalatest" %% "scalatest" % "1.8-B1" % "test" cross(CrossVersion.full), parallelExecution in test := false )) }