diff options
| author | Jesse Luehrs <doy@tozt.net> | 2013-02-28 18:50:36 -0600 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2013-02-28 18:53:15 -0600 |
| commit | 15c2e6a55f11c4978f7da5c9bc53498b5feb1dd3 (patch) | |
| tree | f353bbe23b896990be2c09ef3650ffb659937e5f | |
| parent | 05e14bcf1b12be9b2500288d067cd473d50280d1 (diff) | |
| download | scala-test-more-15c2e6a55f11c4978f7da5c9bc53498b5feb1dd3.tar.gz scala-test-more-15c2e6a55f11c4978f7da5c9bc53498b5feb1dd3.zip | |
get the exit code correct for when no tests are run
| -rw-r--r-- | src/main/scala/org/perl8/test/tap/Consumer.scala | 9 | ||||
| -rw-r--r-- | src/main/scala/org/perl8/test/tap/TestBuilder.scala | 5 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/main/scala/org/perl8/test/tap/Consumer.scala b/src/main/scala/org/perl8/test/tap/Consumer.scala index b15b03b..c108b6d 100644 --- a/src/main/scala/org/perl8/test/tap/Consumer.scala +++ b/src/main/scala/org/perl8/test/tap/Consumer.scala @@ -110,7 +110,7 @@ object Consumer { ) class TAPResult (val plan: Plan, val results: Seq[TestResult]) { - val correctPlan = plan match { + val matchesPlan = plan match { case NumericPlan(n) => results.length == n case _ => results.length == 0 } @@ -122,13 +122,10 @@ object Consumer { val testsPassed = fails == 0 val success = - correctPlan && testsPassed + matchesPlan && testsPassed val exitCode = - if (success) { - 0 - } - else if (!correctPlan) { + if (!matchesPlan || results.length == 0) { 255 } else { diff --git a/src/main/scala/org/perl8/test/tap/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala index 4ccd396..9a8d2e4 100644 --- a/src/main/scala/org/perl8/test/tap/TestBuilder.scala +++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala @@ -103,10 +103,7 @@ class TestBuilder private ( state.failCount def exitCode: Int = - if (state.isPassing) { - 0 - } - else if (!state.matchesPlan) { + if (!state.matchesPlan || state.currentTest == 0) { 255 } else { |