diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-29 03:30:25 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-29 03:30:25 -0700 |
commit | 1debc74374e9c3de52d1333b695db61e7a69a57b (patch) | |
tree | 8700ca46746ef1a20970a61c67f9e7e7da931cd4 /src | |
parent | 8e64b165d8b09571f290c456794091ff5190ab90 (diff) | |
parent | 74de4ba0a295db8754d0aee12c01d51af0d12d8b (diff) | |
download | scala-1debc74374e9c3de52d1333b695db61e7a69a57b.tar.gz scala-1debc74374e9c3de52d1333b695db61e7a69a57b.tar.bz2 scala-1debc74374e9c3de52d1333b695db61e7a69a57b.zip |
Merge pull request #2316 from vigdorchik/interactive_test_framework
Improve testing interactive experience.
Diffstat (limited to 'src')
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala | 12 | ||||
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala b/src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala index a4a2de9b51..f30d896fb7 100644 --- a/src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala +++ b/src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala @@ -74,7 +74,7 @@ abstract class InteractiveTest /** Test's entry point */ def main(args: Array[String]) { try execute() - finally shutdown() + finally askShutdown() } protected def execute(): Unit = { @@ -110,14 +110,4 @@ abstract class InteractiveTest tester.run() } ****/ - - /** shutdown the presentation compiler. */ - protected def shutdown() { - askShutdown() - - // this is actually needed to force exit on test completion. - // Note: May be a bug on either the testing framework or (less likely) - // the presentation compiler - sys.exit(0) - } } diff --git a/src/interactive/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala b/src/interactive/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala index 676feeba8a..40cfc111a1 100644 --- a/src/interactive/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala +++ b/src/interactive/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala @@ -11,7 +11,7 @@ private[tests] object SourcesCollector { * With the default `filter` only .scala and .java files are collected. * */ def apply(base: Path, filter: SourceFilter): Array[SourceFile] = { - assert(base.isDirectory) + assert(base.isDirectory, base + " is not a directory") base.walk.filter(filter).map(source).toList.toArray.sortBy(_.file.name) } |