From 7048ac2d664f876243b92cce006d06692e372859 Mon Sep 17 00:00:00 2001
From: Iulian Dragos <jaguarul@gmail.com>
Date: Fri, 28 Jan 2011 11:33:27 +0000
Subject: Made the presentation compiler reporter in inte...

Made the presentation compiler reporter in interactive tests show up
error messages.no review.
---
 .../scala/tools/nsc/interactive/tests/InteractiveTest.scala  | 11 +++++++----
 .../presentation/simple-tests/SimpleInteractiveTest.scala    |  1 +
 test/disabled/presentation/simple-tests/src/Tester.scala     | 12 ++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala b/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala
index 1d106a5c64..526919f067 100644
--- a/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala
+++ b/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala
@@ -2,7 +2,7 @@ package scala.tools.nsc.interactive
 package tests
 
 import scala.tools.nsc.Settings
-import scala.tools.nsc.reporters.StoreReporter
+import scala.tools.nsc.reporters.ConsoleReporter
 import scala.tools.nsc.util.{BatchSourceFile, SourceFile, Position}
 import scala.tools.nsc.io._
 
@@ -41,7 +41,7 @@ abstract class InteractiveTest {
   val TIMEOUT = 10000 // timeout in milliseconds
 
   val settings = new Settings
-  val reporter= new StoreReporter
+  val reporter= new ConsoleReporter(settings)
 
   // need this so that the classpath comes from what partest
   // instead of scala.home
@@ -147,7 +147,10 @@ abstract class InteractiveTest {
       println("[response] aksTypeCompletion at " + (pos.line, pos.column))
       // we skip getClass because it changed signature between 1.5 and 1.6, so there is no
       // universal check file that we can provide for this to work
-      println(members.sortBy(_.sym.name.toString).filterNot(_.sym.name.toString == "getClass").mkString("\n"))
+      println("retreived %d members".format(members.size))
+      compiler ask { () =>
+        println(members.sortBy(_.sym.name.toString).filterNot(_.sym.name.toString == "getClass").mkString("\n"))
+      }
     }
   }
 
@@ -161,7 +164,7 @@ abstract class InteractiveTest {
       r
     } { (pos, tree) =>
       println("[response] askTypeAt at " + (pos.line, pos.column))
-      println(tree)
+      compiler.ask(() => println(tree))
     }
   }
 
diff --git a/test/disabled/presentation/simple-tests/SimpleInteractiveTest.scala b/test/disabled/presentation/simple-tests/SimpleInteractiveTest.scala
index cfadc561ae..ef04defdf2 100644
--- a/test/disabled/presentation/simple-tests/SimpleInteractiveTest.scala
+++ b/test/disabled/presentation/simple-tests/SimpleInteractiveTest.scala
@@ -6,5 +6,6 @@ import scala.tools.nsc.interactive.tests._
  */
 object Test extends InteractiveTest {
   override val runRandomTests = false
+  settings.YpresentationDebug.value = true
 //  override val synchronousRequests = false
 }
diff --git a/test/disabled/presentation/simple-tests/src/Tester.scala b/test/disabled/presentation/simple-tests/src/Tester.scala
index 09e08727bf..cb62187514 100644
--- a/test/disabled/presentation/simple-tests/src/Tester.scala
+++ b/test/disabled/presentation/simple-tests/src/Tester.scala
@@ -9,14 +9,14 @@ import collection.mutable.ArrayBuffer
 
 class Tester(ntests: Int, inputs: Array[SourceFile], settings: Settings) {
 
-  val reporter/*?*/ = new StoreReporter/*!*/
-  val compiler/*?*/ = new Global(settings, reporter)
+  val reporter = new StoreReporter
+  val compiler = new Global(settings, reporter)
 
   def askAndListen[T, U](msg: String,  arg: T, op: (T, Response[U]) => Unit) {
-    if (settings.verbose.value) print(msg+" "+arg+": ")
+    if (settings.verbose./*!*/value) print(msg+" "+arg+": ")
     val TIMEOUT = 10 // ms
-    val limit = System.currentTimeMillis() + randomDelayMillis
-    val res = new Response[U]
+    val limit/*?*/ = System.currentTimeMillis() + randomDelayMillis
+    val res/*?*/ = new Response[U]
     op(arg, res)
     while (!res.isComplete && !res.isCancelled) {
       if (System.currentTimeMillis() > limit) {
@@ -24,7 +24,7 @@ class Tester(ntests: Int, inputs: Array[SourceFile], settings: Settings) {
       } else res.get(TIMEOUT) match {
         case Some(Left(t)) =>
           /**/
-          if (settings.verbose.value) println(t)
+          if (settings./*!*/verbose.value) println(t)
         case Some(Right(ex)) =>
           ex.printStackTrace()
           println(ex)
-- 
cgit v1.2.3