From f6b4d8e24fb2db928697f680020b588c80d86d6a Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 27 Feb 2013 23:47:31 -0600 Subject: try to name this a bit better --- src/main/scala/org/perl8/test/Test.scala | 4 ++-- src/main/scala/org/perl8/test/TestMore.scala | 10 +++++----- .../org/perl8/test/harness/SummaryReporter.scala | 2 +- .../scala/org/perl8/test/harness/TAPReporter.scala | 2 +- src/main/scala/org/perl8/test/sbt/SBTReporter.scala | 2 +- src/main/scala/org/perl8/test/tap/TestBuilder.scala | 20 ++++++++++++-------- src/test/scala/org/perl8/test/ExtensionTest.scala | 2 +- src/test/scala/org/perl8/test/TestMoreTest.scala | 2 +- 8 files changed, 24 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/main/scala/org/perl8/test/Test.scala b/src/main/scala/org/perl8/test/Test.scala index 9868174..b877a3f 100644 --- a/src/main/scala/org/perl8/test/Test.scala +++ b/src/main/scala/org/perl8/test/Test.scala @@ -9,8 +9,8 @@ trait Test { def run: Int = runTests(false) - def runRaw: Int = + def runInHarness: Int = runTests(true) - protected def runTests (raw: Boolean): Int + protected def runTests (terminalInUse: Boolean): Int } diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala index 3cb0cfa..86a61d4 100644 --- a/src/main/scala/org/perl8/test/TestMore.scala +++ b/src/main/scala/org/perl8/test/TestMore.scala @@ -9,19 +9,19 @@ class TestMore (plan: Option[Plan] = None) extends Test with DelayedInit { this(Some(plan)) def delayedInit (body: => Unit) { - testBody = { raw => + testBody = { terminalInUse => todo = NoMessage - builder = new TestBuilder(plan, "", raw) + builder = new TestBuilder(plan, "", terminalInUse) body } } - def runTests (raw: Boolean): Int = { + def runTests (terminalInUse: Boolean): Int = { if (testBody == null) { delayedInit { } } - testBody(raw) + testBody(terminalInUse) builder.doneTesting builder.exitCode } @@ -125,7 +125,7 @@ class TestMore (plan: Option[Plan] = None) extends Test with DelayedInit { builder = new TestBuilder( plan, oldBuilder.indent + " ", - oldBuilder.raw + oldBuilder.terminalInUse ) body builder.doneTesting diff --git a/src/main/scala/org/perl8/test/harness/SummaryReporter.scala b/src/main/scala/org/perl8/test/harness/SummaryReporter.scala index fdf7967..273a7dc 100644 --- a/src/main/scala/org/perl8/test/harness/SummaryReporter.scala +++ b/src/main/scala/org/perl8/test/harness/SummaryReporter.scala @@ -29,7 +29,7 @@ class SummaryReporter extends MultiTestReporter { val testFuture = Future { Console.withOut(out) { - test.run + test.runInHarness } out.close } diff --git a/src/main/scala/org/perl8/test/harness/TAPReporter.scala b/src/main/scala/org/perl8/test/harness/TAPReporter.scala index 340c0db..d6f27fd 100644 --- a/src/main/scala/org/perl8/test/harness/TAPReporter.scala +++ b/src/main/scala/org/perl8/test/harness/TAPReporter.scala @@ -7,5 +7,5 @@ import org.perl8.test.Test class TAPReporter extends Reporter { def run (testName: String): Int = - newInstance[Test](testName).runRaw + newInstance[Test](testName).run } diff --git a/src/main/scala/org/perl8/test/sbt/SBTReporter.scala b/src/main/scala/org/perl8/test/sbt/SBTReporter.scala index 5da3a82..2af5c09 100644 --- a/src/main/scala/org/perl8/test/sbt/SBTReporter.scala +++ b/src/main/scala/org/perl8/test/sbt/SBTReporter.scala @@ -17,7 +17,7 @@ class SBTReporter ( val out = new ByteArrayOutputStream Console.withOut(out) { - test.run + test.runInHarness } val result = (new tap.Parser).parse(out) diff --git a/src/main/scala/org/perl8/test/tap/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala index 9f7e874..17edccd 100644 --- a/src/main/scala/org/perl8/test/tap/TestBuilder.scala +++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala @@ -2,14 +2,18 @@ package org.perl8.test.tap import org.perl8.test._ -class TestBuilder (plan: Option[Plan], val indent: String, val raw: Boolean) { +class TestBuilder ( + plan: Option[Plan], + val indent: String, + val terminalInUse: Boolean +) { plan.foreach(p => outLine(Producer.plan(p))) - def this (plan: Plan, indent: String = "", raw: Boolean = true) = - this(Some(plan), indent, raw) + def this (plan: Plan, indent: String = "", terminalInUse: Boolean = false) = + this(Some(plan), indent, terminalInUse) - def this (indent: String = "", raw: Boolean = true) = - this(None, indent, raw) + def this (indent: String = "", terminalInUse: Boolean = false) = + this(None, indent, terminalInUse) def ok ( test: Boolean, @@ -29,9 +33,6 @@ class TestBuilder (plan: Option[Plan], val indent: String, val raw: Boolean) { def diag (message: Message) { message.foreach { m => - if (!raw) { - Console.err.print("\n") - } errLine(Producer.comment(m)) } } @@ -99,6 +100,9 @@ class TestBuilder (plan: Option[Plan], val indent: String, val raw: Boolean) { } private def errLine (str: String) { + if (terminalInUse) { + Console.err.print("\n") + } Console.err.println(withIndent(str)) } diff --git a/src/test/scala/org/perl8/test/ExtensionTest.scala b/src/test/scala/org/perl8/test/ExtensionTest.scala index 70b50a1..a74392e 100644 --- a/src/test/scala/org/perl8/test/ExtensionTest.scala +++ b/src/test/scala/org/perl8/test/ExtensionTest.scala @@ -30,7 +30,7 @@ class ExtensionTest extends TestMore { val out = new ByteArrayOutputStream val exitCode = Console.withOut(out) { Console.withErr(out) { - (new ExtensionTestTest).runRaw + (new ExtensionTestTest).run } } diff --git a/src/test/scala/org/perl8/test/TestMoreTest.scala b/src/test/scala/org/perl8/test/TestMoreTest.scala index f80e7c3..8555a71 100644 --- a/src/test/scala/org/perl8/test/TestMoreTest.scala +++ b/src/test/scala/org/perl8/test/TestMoreTest.scala @@ -60,7 +60,7 @@ class TestMoreTest extends TestMore { val out = new ByteArrayOutputStream val exitCode = Console.withOut(out) { Console.withErr(out) { - (new MyBasicTest).runRaw + (new MyBasicTest).run } } -- cgit v1.2.3-54-g00ecf