aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala')
-rw-r--r--src/main/scala/org/perl8/test/TestMore.scala10
-rw-r--r--src/main/scala/org/perl8/test/tap/Producer.scala16
-rw-r--r--src/main/scala/org/perl8/test/tap/TestBuilder.scala11
3 files changed, 1 insertions, 36 deletions
diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala
index b412215..f0b29f7 100644
--- a/src/main/scala/org/perl8/test/TestMore.scala
+++ b/src/main/scala/org/perl8/test/TestMore.scala
@@ -72,10 +72,6 @@ class TestMore (plan: Plan = NoPlan) extends Test with DelayedInit {
builder.diag(message)
}
- def BAIL_OUT {
- builder.bailOut
- }
-
def BAIL_OUT (desc: String) {
builder.bailOut(desc)
}
@@ -91,12 +87,6 @@ class TestMore (plan: Plan = NoPlan) extends Test with DelayedInit {
}
}
- def skip (count: Int)(body: => Unit) {
- for (i <- 1 to count) {
- builder.skip
- }
- }
-
def skip (count: Int, reason: String)(body: => Unit) {
for (i <- 1 to count) {
builder.skip(reason)
diff --git a/src/main/scala/org/perl8/test/tap/Producer.scala b/src/main/scala/org/perl8/test/tap/Producer.scala
index 2b919af..7f5edaf 100644
--- a/src/main/scala/org/perl8/test/tap/Producer.scala
+++ b/src/main/scala/org/perl8/test/tap/Producer.scala
@@ -32,19 +32,12 @@ object Producer {
def todoResult (cond: Boolean, num: Int, desc: String, todo: String): String =
result(cond, num, desc) + " # TODO " + todo
- /** Returns a skipped test result.
- *
- * @example `ok 4 # skip`
- */
- def skip (num: Int): String =
- "ok " + num + " # skip"
-
/** Returns a skipped test result with a reason.
*
* @example `ok 4 # skip this test won't run here`
*/
def skip (num: Int, reason: String): String =
- skip(num) + " " + reason
+ "ok " + num + " # skip " + reason
/** Returns a comment.
*
@@ -61,13 +54,6 @@ object Producer {
def plan (plan: Plan): String =
plan.skipAll.map(m => "1..0 # SKIP " + m).getOrElse("1.." + plan.plan)
- /** Returns a bail out.
- *
- * @example `Bail out!`
- */
- def bailOut: String =
- "Bail out!"
-
/** Returns a bail out with a reason.
*
* @example `Bail out! Not supported on this platform.`
diff --git a/src/main/scala/org/perl8/test/tap/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala
index da6732f..15305d1 100644
--- a/src/main/scala/org/perl8/test/tap/TestBuilder.scala
+++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala
@@ -38,11 +38,6 @@ class TestBuilder private (
outLine(Producer.todoResult(test, state.currentTest, description, todo))
}
- def skip {
- state.ok(true)
- outLine(Producer.skip(state.currentTest))
- }
-
def skip (reason: String) {
state.ok(true)
outLine(Producer.skip(state.currentTest, reason))
@@ -56,12 +51,6 @@ class TestBuilder private (
outLine(Producer.comment(message))
}
- def bailOut {
- val bailOutMessage = Producer.bailOut
- outLine(bailOutMessage)
- throw new BailOutException(bailOutMessage)
- }
-
def bailOut (message: String) {
val bailOutMessage = Producer.bailOut(message)
outLine(bailOutMessage)