diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala | 8 | ||||
| -rw-r--r-- | test/files/presentation/simple-tests.check | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala b/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala index 325151b528..6eae342e76 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala @@ -38,7 +38,7 @@ abstract class InteractiveTest { val completionMarker = "/*!*/" val typedAtMarker = "/*?*/" - val TIMEOUT = 5000 // 5 seconds + val TIMEOUT = 10000 // timeout in milliseconds val settings = new Settings val reporter= new StoreReporter @@ -107,7 +107,7 @@ abstract class InteractiveTest { f(pos, members) case None => println("TIMEOUT: " + r) - case _ => + case Some(r) => println("ERROR: " + r) } } @@ -117,7 +117,7 @@ abstract class InteractiveTest { */ def completionTests() { askAllSources(completionMarker) { pos => - println("askTypeCompletion at " + pos) + println("askTypeCompletion at " + pos.source.file.name + ((pos.line, pos.column))) val r = new Response[List[compiler.Member]] compiler.askTypeCompletion(pos, r) r @@ -164,7 +164,7 @@ abstract class InteractiveTest { tester.run() } - val runRandomTests = true + val runRandomTests = false def main(args: Array[String]) { reloadSources() diff --git a/test/files/presentation/simple-tests.check b/test/files/presentation/simple-tests.check index 80bbdee46a..16eff2b532 100644 --- a/test/files/presentation/simple-tests.check +++ b/test/files/presentation/simple-tests.check @@ -1,7 +1,7 @@ reload: Tester.scala -askTypeCompletion at source-/Users/dragos/workspace/git/scala/test/files/presentation/simple-tests/src/Tester.scala,line-12,offset=268 -askTypeCompletion at source-/Users/dragos/workspace/git/scala/test/files/presentation/simple-tests/src/Tester.scala,line-23,offset=722 -askTypeCompletion at source-/Users/dragos/workspace/git/scala/test/files/presentation/simple-tests/src/Tester.scala,line-105,offset=3041 +askTypeCompletion at Tester.scala(12,39) +askTypeCompletion at Tester.scala(23,24) +askTypeCompletion at Tester.scala(105,29) ================================================================================ [response] aksTypeCompletion at (12,39) |