aboutsummaryrefslogtreecommitdiff
path: root/dottydoc/test
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2016-08-11 17:18:14 +0200
committerFelix Mulder <felix.mulder@gmail.com>2016-08-19 15:37:34 +0200
commitbd7751924d9c145accf04b69e71621347d2b77f6 (patch)
tree961e90b8f9250589fb200648b05e3e4aa21d208a /dottydoc/test
parenta25207472c8b64beeb264f118ed1bb4f9a37418c (diff)
downloaddotty-bd7751924d9c145accf04b69e71621347d2b77f6.tar.gz
dotty-bd7751924d9c145accf04b69e71621347d2b77f6.tar.bz2
dotty-bd7751924d9c145accf04b69e71621347d2b77f6.zip
Implement working docs requiring manually specifying resources and template for html docs
Diffstat (limited to 'dottydoc/test')
-rw-r--r--dottydoc/test/BaseTest.scala3
-rw-r--r--dottydoc/test/WhitelistedStdLibMain.scala30
2 files changed, 16 insertions, 17 deletions
diff --git a/dottydoc/test/BaseTest.scala b/dottydoc/test/BaseTest.scala
index 0c6fad1c8..7f077d27b 100644
--- a/dottydoc/test/BaseTest.scala
+++ b/dottydoc/test/BaseTest.scala
@@ -17,12 +17,11 @@ trait DottyTest {
val ctx = base.initialCtx.fresh
ctx.setSetting(ctx.settings.language, List("Scala2"))
ctx.setSetting(ctx.settings.YkeepComments, true)
- ctx.setSetting(ctx.settings.YDocNoWrite, true)
base.initialize()(ctx)
ctx
}
- private def compilerWithChecker(assertion: DocASTPhase => Unit) = new DottyDocCompiler {
+ private def compilerWithChecker(assertion: DocASTPhase => Unit) = new DocCompiler {
private[this] val docPhase = new DocASTPhase
override def phases =
diff --git a/dottydoc/test/WhitelistedStdLibMain.scala b/dottydoc/test/WhitelistedStdLibMain.scala
index d1168bf15..95d4afbae 100644
--- a/dottydoc/test/WhitelistedStdLibMain.scala
+++ b/dottydoc/test/WhitelistedStdLibMain.scala
@@ -7,7 +7,7 @@ object WhitelistedStandardLib extends dottydoc.api.java.Dottydoc {
import scala.collection.JavaConverters._
val files: List[String] = {
- val whitelist = "../test/dotc/scala-collections.whitelist"
+ val whitelist = "./test/dotc/scala-collections.whitelist"
Source.fromFile(whitelist, "UTF8")
.getLines()
@@ -21,20 +21,20 @@ object WhitelistedStandardLib extends dottydoc.api.java.Dottydoc {
}
private val resources = List(
- "../../dottydoc-client/resources/MaterialIcons-Regular.eot",
- "../../dottydoc-client/resources/MaterialIcons-Regular.ijmap",
- "../../dottydoc-client/resources/MaterialIcons-Regular.svg",
- "../../dottydoc-client/resources/MaterialIcons-Regular.ttf",
- "../../dottydoc-client/resources/MaterialIcons-Regular.woff",
- "../../dottydoc-client/resources/MaterialIcons-Regular.woff2",
- "../../dottydoc-client/resources/codepoints",
- "../../dottydoc-client/resources/github.css",
- "../../dottydoc-client/resources/highlight.pack.js",
- "../../dottydoc-client/resources/index.css",
- "../../dottydoc-client/resources/material-icons.css",
- "../../dottydoc-client/resources/material.min.css",
- "../../dottydoc-client/resources/material.min.js",
- "../../dottydoc-client/target/scala-2.11/dottydoc-client-fastopt.js"
+ "../dottydoc-client/resources/MaterialIcons-Regular.eot",
+ "../dottydoc-client/resources/MaterialIcons-Regular.ijmap",
+ "../dottydoc-client/resources/MaterialIcons-Regular.svg",
+ "../dottydoc-client/resources/MaterialIcons-Regular.ttf",
+ "../dottydoc-client/resources/MaterialIcons-Regular.woff",
+ "../dottydoc-client/resources/MaterialIcons-Regular.woff2",
+ "../dottydoc-client/resources/codepoints",
+ "../dottydoc-client/resources/github.css",
+ "../dottydoc-client/resources/highlight.pack.js",
+ "../dottydoc-client/resources/index.css",
+ "../dottydoc-client/resources/material-icons.css",
+ "../dottydoc-client/resources/material.min.css",
+ "../dottydoc-client/resources/material.min.js",
+ "../dottydoc-client/target/scala-2.11/dottydoc-client-fastopt.js"
)
override def main(args: Array[String]) = {