diff options
Diffstat (limited to 'src/main/scala/org/perl8/test')
-rw-r--r-- | src/main/scala/org/perl8/test/TestMore.scala | 8 | ||||
-rw-r--r-- | src/main/scala/org/perl8/test/tap/TestBuilder.scala | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala index 608a522..b412215 100644 --- a/src/main/scala/org/perl8/test/TestMore.scala +++ b/src/main/scala/org/perl8/test/TestMore.scala @@ -140,7 +140,7 @@ class TestMore (plan: Plan = NoPlan) extends Test with DelayedInit { desc: String ): Boolean = { todo match { - case Some(t) => builder.okTodo(cond, "- " + desc, t) + case Some(t) => builder.todo(t, cond, "- " + desc) case None => builder.ok(cond, "- " + desc) } if (!cond) { @@ -155,7 +155,7 @@ class TestMore (plan: Plan = NoPlan) extends Test with DelayedInit { reason: => String ): Boolean = { todo match { - case Some(t) => builder.okTodo(cond, "- " + desc, t) + case Some(t) => builder.todo(t, cond, "- " + desc) case None => builder.ok(cond, "- " + desc) } if (!cond) { @@ -166,7 +166,7 @@ class TestMore (plan: Plan = NoPlan) extends Test with DelayedInit { private def test (cond: Boolean): Boolean = { todo match { - case Some(t) => builder.okTodo(cond, t) + case Some(t) => builder.todo(t, cond) case None => builder.ok(cond) } if (!cond) { @@ -177,7 +177,7 @@ class TestMore (plan: Plan = NoPlan) extends Test with DelayedInit { private def test (cond: Boolean, reason: => String): Boolean = { todo match { - case Some(t) => builder.okTodo(cond, t) + case Some(t) => builder.todo(t, cond) case None => builder.ok(cond) } if (!cond) { diff --git a/src/main/scala/org/perl8/test/tap/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala index f0b4125..da6732f 100644 --- a/src/main/scala/org/perl8/test/tap/TestBuilder.scala +++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala @@ -28,12 +28,12 @@ class TestBuilder private ( outLine(Producer.result(test, state.currentTest, description)) } - def okTodo (test: Boolean, todo: String) { + def todo (todo: String, test: Boolean) { state.ok(true) outLine(Producer.todoResult(test, state.currentTest, todo)) } - def okTodo (test: Boolean, description: String, todo: String) { + def todo (todo: String, test: Boolean, description: String) { state.ok(true) outLine(Producer.todoResult(test, state.currentTest, description, todo)) } |