diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-06 15:55:39 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-06 15:55:39 +0000 |
commit | 1a9a264f8b2a8f17b9d9c8d77cfe5bb623056426 (patch) | |
tree | 116d3a78ad8422249d286f3103c38149241109f2 | |
parent | f22b627730aecff56443083816c36b3e145a2474 (diff) | |
download | scala-1a9a264f8b2a8f17b9d9c8d77cfe5bb623056426.tar.gz scala-1a9a264f8b2a8f17b9d9c8d77cfe5bb623056426.tar.bz2 scala-1a9a264f8b2a8f17b9d9c8d77cfe5bb623056426.zip |
Fixed a failing test. No review
-rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 3 | ||||
-rw-r--r-- | test/scaladoc/IndexTest.scala | 28 |
2 files changed, 21 insertions, 10 deletions
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 1a6e2bd30e..6631d476a8 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -483,7 +483,8 @@ class Worker(val fileManager: FileManager, scalaCheckParentClassLoader: ScalaCla val passedok = lines filter (_ startsWith "+") forall (_ contains "OK") failures.isEmpty && passedok } - }) + NestUI.verbose("test for '" + file + "' success: " + succeeded) + }) case "pos" => runTestCommon(file, kind, expectFailure = false)((_, _) => ()) diff --git a/test/scaladoc/IndexTest.scala b/test/scaladoc/IndexTest.scala index 21b14d4bf0..fea2fe33e3 100644 --- a/test/scaladoc/IndexTest.scala +++ b/test/scaladoc/IndexTest.scala @@ -5,12 +5,23 @@ import scala.tools.nsc.doc.html.page.Index import java.net.URLClassLoader object Test extends Properties("Index") { + def getClasspath = { + // these things can be tricky + // this test previously relied on the assumption that the current thread's classloader is an url classloader and contains all the classpaths + // does partest actually guarantee this? to quote Leonard Nimoy: The answer, of course, is no. + // this test _will_ fail again some time in the future. + val paths = Thread.currentThread.getContextClassLoader.asInstanceOf[URLClassLoader].getURLs.map(_.getPath) + val morepaths = Thread.currentThread.getContextClassLoader.getParent.asInstanceOf[URLClassLoader].getURLs.map(_.getPath) + (paths ++ morepaths).mkString(java.io.File.pathSeparator) + } + val docFactory = { val settings = new doc.Settings((s: String) => { Console.err.println(s) }) - settings.classpath.value = - Thread.currentThread.getContextClassLoader.asInstanceOf[URLClassLoader].getURLs.map(_.getPath).mkString(":") + + settings.classpath.value = getClasspath + println(settings.classpath.value) val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings) @@ -21,8 +32,7 @@ object Test extends Properties("Index") { val settings = new doc.Settings((s: String) => { Console.err.println(s) }) - settings.classpath.value = - Thread.currentThread.getContextClassLoader.asInstanceOf[URLClassLoader].getURLs.map(_.getPath).mkString(":") + settings.classpath.value = getClasspath val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings) @@ -31,14 +41,14 @@ object Test extends Properties("Index") { def createIndex(path: String): Option[Index] = { val maybeModel = { - val stream = new java.io.ByteArrayOutputStream - val original = Console.out - Console.setOut(stream) + //val stream = new java.io.ByteArrayOutputStream + //val original = Console.out + //Console.setOut(stream) val result = docFactory.universe(List(path)) // assert(stream.toString == "model contains 2 documentable templates\n") - Console.setOut(original) + //Console.setOut(original) result } @@ -93,4 +103,4 @@ object Test extends Properties("Index") { case None => false } } -}
\ No newline at end of file +} |