Change `ClassicReporter` to `TestReporter` in test sources

2 files changed, 56 insertions, 4 deletions

diff --git a/test/dotty/tools/dotc/reporting/TestReporter.scala b/test/dotty/tools/dotc/reporting/TestReporter.scala
new file mode 100644
index 000000000..70d18d031
--- /dev/null
+++ b/test/dotty/tools/dotc/reporting/TestReporter.scala
@@ -0,0 +1,52 @@
+package dotty.tools
+package dotc
+package reporting
+
+import scala.collection.mutable
+import util.SourcePosition
+import core.Contexts._
+import Reporter._
+import java.io.PrintWriter
+import scala.reflect.internal.util._
+import diagnostic.{ Message, MessageContainer, NoExplanation }
+import diagnostic.messages._
+
+class TestReporter(writer: PrintWriter) extends Reporter
+with UniqueMessagePositions with HideNonSensicalMessages {
+
+  import MessageContainer._
+
+  /** maximal number of error messages to be printed */
+  protected def ErrorLimit = 100
+
+  def printPos(pos: SourcePosition): Unit =
+    if (pos.exists) {
+      if (pos.outer.exists) {
+        writer.println(s"\ninlined at ${pos.outer}:\n")
+        printPos(pos.outer)
+      }
+    }
+
+  /** Prints the message with the given position indication. */
+  def printMessageAndPos(msg: String, pos: SourcePosition)(implicit ctx: Context): Unit = {
+    val posStr = s"${pos.line + 1}: "
+    writer.println(posStr + msg)
+    printPos(pos)
+  }
+
+  override def doReport(m: MessageContainer)(implicit ctx: Context): Unit = {
+    // Here we add extra information that we should know about the error message
+    val extra = m.contained match {
+      case pm: PatternMatchExhaustivity => s": ${pm.uncovered}"
+      case _ => ""
+    }
+
+    m match {
+      case m: Error =>
+        printMessageAndPos(m.contained.kind + extra, m.pos)
+      case w: Warning =>
+        printMessageAndPos(w.contained.kind + extra, w.pos)
+      case _ =>
+    }
+  }
+}
diff --git a/test/test/transform/PatmatExhaustivityTest.scala b/test/test/transform/PatmatExhaustivityTest.scala
index d23a1c963..c77ba501f 100644
--- a/test/test/transform/PatmatExhaustivityTest.scala
+++ b/test/test/transform/PatmatExhaustivityTest.scala
@@ -6,7 +6,7 @@ import scala.io.Source._
 import scala.reflect.io.Directory
 import org.junit.Test
 import dotty.tools.dotc.Main
-import dotty.tools.dotc.reporting.ClassicReporter
+import dotty.tools.dotc.reporting.TestReporter
 
 class PatmatExhaustivityTest {
   val testsDir = "./tests/patmat"
@@ -15,7 +15,7 @@ class PatmatExhaustivityTest {
 
   private def compileFile(file: File) = {
     val stringBuffer = new StringWriter()
-    val reporter = new ClassicReporter(writer = new PrintWriter(stringBuffer))
+    val reporter = new TestReporter(new PrintWriter(stringBuffer))
 
     try {
       Main.process((file.getPath::options).toArray, reporter, null)
@@ -38,7 +38,7 @@ class PatmatExhaustivityTest {
   /** A single test with multiple files grouped in a folder */
   private def compileDir(file: File) = {
     val stringBuffer = new StringWriter()
-    val reporter = new ClassicReporter(writer = new PrintWriter(stringBuffer))
+    val reporter = new TestReporter(new PrintWriter(stringBuffer))
 
     val files = Directory(file.getPath).list.toList
       .filter(f => f.extension == "scala" || f.extension == "java" )
@@ -77,7 +77,7 @@ class PatmatExhaustivityTest {
 
     failed.foreach { case (file, expected, actual) =>
       println(s"\n----------------- incorrect output for $file --------------\n" +
-        s"Expected:\n-------\n$expected\n\nActual\n----------\n$actual\n"
+        s"Expected:\n---------\n$expected\n\nActual:\n-------\n$actual\n"
       )
     }