From e071cf04ba20fd1608f138abe6e03878c7fe70bf Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Thu, 28 Feb 2013 01:02:22 -0600 Subject: case class cleanups --- src/main/scala/org/perl8/test/package.scala | 4 +-- src/main/scala/org/perl8/test/tap/Consumer.scala | 31 ++++++------------------ src/main/scala/org/perl8/test/tap/Parser.scala | 4 +-- 3 files changed, 12 insertions(+), 27 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/org/perl8/test/package.scala b/src/main/scala/org/perl8/test/package.scala index 2a39eb4..5d7ba32 100644 --- a/src/main/scala/org/perl8/test/package.scala +++ b/src/main/scala/org/perl8/test/package.scala @@ -43,7 +43,7 @@ package object test { } sealed trait Message - case class HasMessage (val contents: String) extends Message + case class HasMessage (contents: String) extends Message case object NoMessage extends Message implicit def messageToOption (message: Message): Option[String] = @@ -58,6 +58,6 @@ package object test { case None => NoMessage } - case class BailOutException (val message: String) + case class BailOutException (message: String) extends RuntimeException(message) } diff --git a/src/main/scala/org/perl8/test/tap/Consumer.scala b/src/main/scala/org/perl8/test/tap/Consumer.scala index e9fd6d4..b15b03b 100644 --- a/src/main/scala/org/perl8/test/tap/Consumer.scala +++ b/src/main/scala/org/perl8/test/tap/Consumer.scala @@ -57,17 +57,11 @@ object Consumer { indent + contents } - case class CommentLine ( - val text: String, - override val indent: String - ) extends Line { + case class CommentLine (text: String, indent: String) extends Line { def contents = "# " + text } - case class PlanLine ( - val plan: Plan, - override val indent: String - ) extends Line { + case class PlanLine (plan: Plan, indent: String) extends Line { def contents = { val count = plan.plan val comment = plan match { @@ -78,11 +72,8 @@ object Consumer { } } - case class ResultLine( - val result: TestResult, - override val indent: String - ) extends Line { - def contents = { + case class ResultLine (result: TestResult, indent: String) extends Line { + def contents = { val success = (if (result.passed) "ok" else "not ok") + " " val number = result.number + " " val description = result.description match { @@ -107,14 +98,10 @@ object Consumer { sealed trait Directive { val message: Option[String] } - case class SkipDirective ( - override val message: Option[String] - ) extends Directive - case class TodoDirective ( - override val message: Option[String] - ) extends Directive + case class SkipDirective (message: Option[String]) extends Directive + case class TodoDirective (message: Option[String]) extends Directive - case class TestResult ( + class TestResult ( val passed: Boolean, val number: Int, val description: String, @@ -149,7 +136,5 @@ object Consumer { } } - case class ParseException ( - val message: String - ) extends RuntimeException(message) + case class ParseException (message: String) extends RuntimeException(message) } diff --git a/src/main/scala/org/perl8/test/tap/Parser.scala b/src/main/scala/org/perl8/test/tap/Parser.scala index 676d507..8b38ebc 100644 --- a/src/main/scala/org/perl8/test/tap/Parser.scala +++ b/src/main/scala/org/perl8/test/tap/Parser.scala @@ -188,8 +188,8 @@ class Parser private ( } private case class LinePosition ( - override val line: Int, - override val lineContents: String + line: Int, + lineContents: String ) extends Position { def column: Int = 1 } -- cgit v1.2.3-54-g00ecf