From 9acb3f5609b19c2b9a93c08e19b732932328161e Mon Sep 17 00:00:00 2001 From: Kato Kazuyoshi Date: Mon, 21 Mar 2011 13:47:57 +0000 Subject: [scaladoc] Add a test for #4306. --- test/scaladoc/resources/Trac4306.scala | 5 +++++ test/scaladoc/scala/html/HtmlFactoryTest.scala | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 test/scaladoc/resources/Trac4306.scala (limited to 'test') diff --git a/test/scaladoc/resources/Trac4306.scala b/test/scaladoc/resources/Trac4306.scala new file mode 100644 index 0000000000..f86b83292c --- /dev/null +++ b/test/scaladoc/resources/Trac4306.scala @@ -0,0 +1,5 @@ +package com.example.trac4306 + +package object foo { + class Bar +} diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala index 98f0c94805..f0f1cd7e49 100644 --- a/test/scaladoc/scala/html/HtmlFactoryTest.scala +++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala @@ -52,22 +52,22 @@ object Test extends Properties("HtmlFactory") { (paths ++ morepaths).mkString(java.io.File.pathSeparator) } - val docFactory = { - val settings = new Settings({Console.err.println(_)}) - settings.classpath.value = getClasspath - - val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings) - new DocFactory(reporter, settings) - } - def createTemplates(basename: String) = { val result = scala.collection.mutable.Map[String, scala.xml.NodeSeq]() - docFactory.makeUniverse(List("test/scaladoc/resources/"+basename)) match { + val factory = { + val settings = new Settings({Console.err.println(_)}) + settings.classpath.value = getClasspath + + val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings) + new DocFactory(reporter, settings) + } + + factory.makeUniverse(List("test/scaladoc/resources/"+basename)) match { case Some(universe) => { val index = IndexModelFactory.makeIndex(universe) (new HtmlFactory(universe, index)).writeTemplates((page) => { - result += (page.path.mkString("") -> page.body) + result += (page.absoluteLinkTo(page.path) -> page.body) }) } case _ => ; @@ -94,4 +94,8 @@ object Test extends Properties("HtmlFactory") { } } + property("Trac #4306") = { + val files = createTemplates("Trac4306.scala") + files("com/example/trac4306/foo/package$$Bar.html") != None + } } -- cgit v1.2.3