diff options
author | Jesse Luehrs <doy@tozt.net> | 2013-02-28 00:33:28 -0600 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2013-02-28 00:33:28 -0600 |
commit | 561155bc9119c6b3836ea595a45d18a902d90ca2 (patch) | |
tree | de0c25540c1702748d2b670d7450901a6cc34dce /src/main/scala/org/perl8 | |
parent | f6b4d8e24fb2db928697f680020b588c80d86d6a (diff) | |
download | scala-test-more-561155bc9119c6b3836ea595a45d18a902d90ca2.tar.gz scala-test-more-561155bc9119c6b3836ea595a45d18a902d90ca2.zip |
make some more things private
Diffstat (limited to 'src/main/scala/org/perl8')
-rw-r--r-- | src/main/scala/org/perl8/test/TestMore.scala | 8 | ||||
-rw-r--r-- | src/main/scala/org/perl8/test/tap/TestBuilder.scala | 19 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala index 86a61d4..dc9c0ef 100644 --- a/src/main/scala/org/perl8/test/TestMore.scala +++ b/src/main/scala/org/perl8/test/TestMore.scala @@ -11,7 +11,7 @@ class TestMore (plan: Option[Plan] = None) extends Test with DelayedInit { def delayedInit (body: => Unit) { testBody = { terminalInUse => todo = NoMessage - builder = new TestBuilder(plan, "", terminalInUse) + builder = new TestBuilder(plan, terminalInUse) body } } @@ -122,11 +122,7 @@ class TestMore (plan: Option[Plan] = None) extends Test with DelayedInit { )(body: => Unit): Boolean = { val oldBuilder = builder val success = try { - builder = new TestBuilder( - plan, - oldBuilder.indent + " ", - oldBuilder.terminalInUse - ) + builder = oldBuilder.cloneForSubtest(plan) body builder.doneTesting } diff --git a/src/main/scala/org/perl8/test/tap/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala index 17edccd..26fb5d6 100644 --- a/src/main/scala/org/perl8/test/tap/TestBuilder.scala +++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala @@ -2,18 +2,21 @@ package org.perl8.test.tap import org.perl8.test._ -class TestBuilder ( - plan: Option[Plan], - val indent: String, - val terminalInUse: Boolean +class TestBuilder private ( + plan: Option[Plan], + indent: String, + terminalInUse: Boolean ) { plan.foreach(p => outLine(Producer.plan(p))) - def this (plan: Plan, indent: String = "", terminalInUse: Boolean = false) = - this(Some(plan), indent, terminalInUse) + def this (plan: Option[Plan], terminalInUse: Boolean) = + this(plan, "", terminalInUse) - def this (indent: String = "", terminalInUse: Boolean = false) = - this(None, indent, terminalInUse) + def this (plan: Option[Plan]) = + this(plan, "", false) + + def cloneForSubtest (newPlan: Option[Plan]): TestBuilder = + new TestBuilder(newPlan, indent + " ", terminalInUse) def ok ( test: Boolean, |