From f0b7fa0e1a663d381abcf5f43eeb5f178a21fefe Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 29 Jan 2010 20:48:59 -0500 Subject: [PATCH] Test for specs/sbt detecting specifications as classes/objects --- .../changes/ClassFailModuleFail.scala | 15 ++++++++++++ .../changes/ClassFailModuleSuccess.scala | 15 ++++++++++++ .../changes/ClassSuccessModuleFail.scala | 15 ++++++++++++ .../changes/ClassSuccessModuleSuccess.scala | 15 ++++++++++++ .../tests/specs-run/project/build.properties | 2 ++ .../specs-run/project/build/TestProject.scala | 6 +++++ src/sbt-test/tests/specs-run/test | 23 +++++++++++++++++++ 7 files changed, 91 insertions(+) create mode 100644 src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala create mode 100644 src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala create mode 100644 src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala create mode 100644 src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala create mode 100644 src/sbt-test/tests/specs-run/project/build.properties create mode 100644 src/sbt-test/tests/specs-run/project/build/TestProject.scala create mode 100644 src/sbt-test/tests/specs-run/test diff --git a/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala b/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala new file mode 100644 index 000000000..002c8ddbf --- /dev/null +++ b/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala @@ -0,0 +1,15 @@ +import org.specs._ + +class A extends Specification +{ + "this" should { + "not work" in { 1 must_== 2 } + } +} + +object A extends Specification +{ + "this" should { + "not work" in { 1 must_== 2 } + } +} \ No newline at end of file diff --git a/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala b/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala new file mode 100644 index 000000000..8c3b7eb0f --- /dev/null +++ b/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala @@ -0,0 +1,15 @@ +import org.specs._ + +class A extends Specification +{ + "this" should { + "not work" in { 1 must_== 2 } + } +} + +object A extends Specification +{ + "this" should { + "work" in { 1 must_== 1 } + } +} \ No newline at end of file diff --git a/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala b/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala new file mode 100644 index 000000000..37801473b --- /dev/null +++ b/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala @@ -0,0 +1,15 @@ +import org.specs._ + +class A extends Specification +{ + "this" should { + "work" in { 1 must_== 1 } + } +} + +object A extends Specification +{ + "this" should { + "not work" in { 1 must_== 2 } + } +} \ No newline at end of file diff --git a/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala b/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala new file mode 100644 index 000000000..2827d30ea --- /dev/null +++ b/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala @@ -0,0 +1,15 @@ +import org.specs._ + +class A extends Specification +{ + "this" should { + "work" in { 1 must_== 1 } + } +} + +object A extends Specification +{ + "this" should { + "work" in { 1 must_== 1 } + } +} \ No newline at end of file diff --git a/src/sbt-test/tests/specs-run/project/build.properties b/src/sbt-test/tests/specs-run/project/build.properties new file mode 100644 index 000000000..fe72372e7 --- /dev/null +++ b/src/sbt-test/tests/specs-run/project/build.properties @@ -0,0 +1,2 @@ +project.name=Specs Test Type Test +project.version=1.0 \ No newline at end of file diff --git a/src/sbt-test/tests/specs-run/project/build/TestProject.scala b/src/sbt-test/tests/specs-run/project/build/TestProject.scala new file mode 100644 index 000000000..cba60bdda --- /dev/null +++ b/src/sbt-test/tests/specs-run/project/build/TestProject.scala @@ -0,0 +1,6 @@ +import sbt._ + +class TestProject(info: ProjectInfo) extends DefaultProject(info) +{ + val specs = "org.scala-tools.testing" %% "specs" % "1.6.1" +} \ No newline at end of file diff --git a/src/sbt-test/tests/specs-run/test b/src/sbt-test/tests/specs-run/test new file mode 100644 index 000000000..b3266bfb4 --- /dev/null +++ b/src/sbt-test/tests/specs-run/test @@ -0,0 +1,23 @@ +> ++2.8.0.Beta1-RC7 +> update + +> clean +$ delete src/ +$ copy-file changes/ClassFailModuleSuccess.scala src/test/scala/Test.scala +-> test + +> clean +$ delete src/ +$ copy-file changes/ClassFailModuleFail.scala src/test/scala/Test.scala +-> test + +> clean +$ delete src/ +$ copy-file changes/ClassSuccessModuleFail.scala src/test/scala/Test.scala +-> test + + +> clean +$ delete src/ +$ copy-file changes/ClassSuccessModuleSuccess.scala src/test/scala/Test.scala +> test \ No newline at end of file