diff --git a/src/sbt-test/run/console-project/project/build.properties b/src/sbt-test/run/console-project/project/build.properties new file mode 100644 index 000000000..2b4d7e5a1 --- /dev/null +++ b/src/sbt-test/run/console-project/project/build.properties @@ -0,0 +1,2 @@ +project.name=Test +project.version=1.0 \ No newline at end of file diff --git a/src/sbt-test/run/console-project/test b/src/sbt-test/run/console-project/test new file mode 100644 index 000000000..671942e06 --- /dev/null +++ b/src/sbt-test/run/console-project/test @@ -0,0 +1 @@ +> console-project \ No newline at end of file diff --git a/src/sbt-test/source-dependencies/default-params/test b/src/sbt-test/source-dependencies/default-params/test index 666b17986..32defd9a8 100644 --- a/src/sbt-test/source-dependencies/default-params/test +++ b/src/sbt-test/source-dependencies/default-params/test @@ -1,5 +1,5 @@ # default parameters are only in 2.8 -> ++2.8.0-SNAPSHOT +> ++2.8.0.Beta1-RC7 > compile # switch which 'x' method has a default for the second parameter in A diff --git a/src/sbt-test/tests/test-failed/changes/Fail.scala b/src/sbt-test/tests/test-failed/changes/Fail.scala index 1fa4e4bdd..5b03dff12 100644 --- a/src/sbt-test/tests/test-failed/changes/Fail.scala +++ b/src/sbt-test/tests/test-failed/changes/Fail.scala @@ -1,7 +1,10 @@ -import org.scalatest._ +import org.specs._ -class TestQuickSuite extends FunSuite { - test("a test") { - throw new IllegalStateException - } -} +class helloWorldFailure extends Specification { + "'hello world' has 11 characters" in { + "hello world".size must be equalTo(12) + } + "'hello world' matches 'h.* w.*'" in { + "hello world" must be matching("h.* w.*") + } +} \ No newline at end of file diff --git a/src/sbt-test/tests/test-failed/changes/Success.scala b/src/sbt-test/tests/test-failed/changes/Success.scala index 85489d7e6..eb88b25f6 100644 --- a/src/sbt-test/tests/test-failed/changes/Success.scala +++ b/src/sbt-test/tests/test-failed/changes/Success.scala @@ -1,7 +1,10 @@ -import org.scalatest._ +import org.specs._ -class TestQuickSuite extends FunSuite { - test("a test") { - true - } -} +class helloWorldSuccess extends Specification { + "'hello world' has 11 characters" in { + "hello world".size must be equalTo(11) + } + "'hello world' matches 'h.* w.*'" in { + "hello world" must be matching("h.* w.*") + } +} \ No newline at end of file diff --git a/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala index 3c7232f01..92c151476 100644 --- a/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala +++ b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala @@ -2,5 +2,5 @@ import sbt._ class TestQuickProject(info: ProjectInfo) extends DefaultProject(info) { val snapshots = ScalaToolsSnapshots - val scalatest = "org.scalatest" % "scalatest" % "1.0.1-for-scala-2.8.0.Beta1-RC1-with-test-interfaces-0.2-SNAPSHOT" + val specs = "org.scala-tools.testing" %% "specs" % "1.6.1" } diff --git a/src/sbt-test/tests/test-failed/test b/src/sbt-test/tests/test-failed/test index b33f1c120..826a46d29 100644 --- a/src/sbt-test/tests/test-failed/test +++ b/src/sbt-test/tests/test-failed/test @@ -1,12 +1,12 @@ -> ++2.8.0.Beta1-RC1 +> ++2.8.0.Beta1-RC7 > update -$ copy-file changes/Fail.scala src/test/scala/TestQuickSuite.scala +$ copy-file changes/Fail.scala src/test/scala/TestQuick.scala -> test-failed -> test-failed * --> test-failed TestQuickSuite +-> test-failed helloWorldFailure -$ copy-file changes/Success.scala src/test/scala/TestQuickSuite.scala +$ copy-file changes/Success.scala src/test/scala/TestQuick.scala > test-failed > test-failed * -> test-failed TestQuickSuite \ No newline at end of file +> test-failed helloWorldSuccess \ No newline at end of file