Separete index.js to parallelize downloads.

2 files changed, 52 insertions, 20 deletions

diff --git a/test/scaladoc/scala/IndexScriptTest.scala b/test/scaladoc/scala/IndexScriptTest.scala
new file mode 100644
index 0000000000..991491c376
--- /dev/null
+++ b/test/scaladoc/scala/IndexScriptTest.scala
@@ -0,0 +1,52 @@
+import org.scalacheck._
+import org.scalacheck.Prop._
+
+import scala.tools.nsc.doc
+import scala.tools.nsc.doc.html.page.IndexScript
+import java.net.URLClassLoader
+
+object Test extends Properties("IndexScript") {
+
+  def getClasspath = {
+    val loader = Thread.currentThread.getContextClassLoader
+    val paths = loader.asInstanceOf[URLClassLoader].getURLs
+    val morepaths = loader.getParent.asInstanceOf[URLClassLoader].getURLs
+    (paths ++ morepaths).map(_.getPath).mkString(java.io.File.pathSeparator)
+  }
+
+  val docFactory = {
+    val settings = new doc.Settings({Console.err.println(_)})
+    settings.classpath.value = getClasspath
+    val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings)
+    new doc.DocFactory(reporter, settings)
+  }
+
+  val indexModelFactory = doc.model.IndexModelFactory
+
+  def createIndexScript(path: String) =
+    docFactory.makeUniverse(List(path)) match {
+      case Some(universe) => {
+        val index = new IndexScript(universe,
+                                    indexModelFactory.makeIndex(universe))
+        Some(index)
+      }
+      case _ =>
+        None
+    }
+
+  property("allPackages") = {
+    createIndexScript("src/compiler/scala/tools/nsc/doc/html/page/Index.scala") match {
+      case Some(index) =>
+        index.allPackages.map(_.toString) == List(
+          "scala",
+          "scala.tools",
+          "scala.tools.nsc",
+          "scala.tools.nsc.doc",
+          "scala.tools.nsc.doc.html",
+          "scala.tools.nsc.doc.html.page"
+        )
+      case None =>
+        false
+    }
+  }
+}
diff --git a/test/scaladoc/scala/IndexTest.scala b/test/scaladoc/scala/IndexTest.scala
index 5e3d02e045..7679bab0c6 100644
--- a/test/scaladoc/scala/IndexTest.scala
+++ b/test/scaladoc/scala/IndexTest.scala
@@ -79,24 +79,4 @@ object Test extends Properties("Index") {
       case None => false
     }
   }
-
-  property("allPackages") = {
-    createIndex("src/compiler/scala/tools/nsc/doc/html/page/Index.scala") match {
-
-      case Some(index) =>
-        index.allPackages.map(_.toString) == List(
-          "scala",
-          "scala.tools",
-          "scala.tools.nsc",
-          "scala.tools.nsc.doc",
-          "scala.tools.nsc.doc.html",
-          "scala.tools.nsc.doc.html.page"
-        )
-
-      case None =>
-        false
-
-    }
-  }
-
 }