diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2017-01-08 16:00:35 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2017-01-31 14:31:04 +0100 |
| commit | de4787898fbf91662cd894c5a9a0f30ad097fa5f (patch) | |
| tree | 12828f1b20780bc70bddd5bc7fb374d4a33e15e7 /doc-tool/test | |
| parent | 87f1f5f44585e855a8c8234955e1e48dcbbc3a21 (diff) | |
| download | dotty-de4787898fbf91662cd894c5a9a0f30ad097fa5f.tar.gz dotty-de4787898fbf91662cd894c5a9a0f30ad097fa5f.tar.bz2 dotty-de4787898fbf91662cd894c5a9a0f30ad097fa5f.zip | |
Fix recursive expansion of templates
Diffstat (limited to 'doc-tool/test')
| -rw-r--r-- | doc-tool/test/dotty/tools/dottydoc/staticsite/PageTests.scala (renamed from doc-tool/test/StaticPageTests.scala) | 5 | ||||
| -rw-r--r-- | doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala (renamed from doc-tool/test/StaticSiteTests.scala) | 27 |
2 files changed, 25 insertions, 7 deletions
diff --git a/doc-tool/test/StaticPageTests.scala b/doc-tool/test/dotty/tools/dottydoc/staticsite/PageTests.scala index 1b22665c8..87358d738 100644 --- a/doc-tool/test/StaticPageTests.scala +++ b/doc-tool/test/dotty/tools/dottydoc/staticsite/PageTests.scala @@ -1,12 +1,11 @@ package dotty.tools package dottydoc +package staticsite import org.junit.Test import org.junit.Assert._ -import staticsite.{ MarkdownPage, HtmlPage, IllegalFrontMatter } - -class StaticPageTests extends DottyDocTest { +class PageTests extends DottyDocTest { import scala.collection.JavaConverters._ @Test def mdHas1Key = { diff --git a/doc-tool/test/StaticSiteTests.scala b/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala index a2f174eb3..b73d7555b 100644 --- a/doc-tool/test/StaticSiteTests.scala +++ b/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala @@ -1,19 +1,18 @@ package dotty.tools package dottydoc +package staticsite import org.junit.Test import org.junit.Assert._ -import staticsite.{ Site, HtmlPage } - -class StaticSiteTests extends DottyDocTest { +class SiteTests extends DottyDocTest { @Test def hasCorrectLayoutFiles = { val site = new Site(new java.io.File("../doc-tool/resources/")) assert(site.root.exists && site.root.isDirectory, s"'${site.root.getName}' is not a directory") - val expectedLayouts = Set("main") + val expectedLayouts = Set("main", "index") assert(site.layouts.keys == expectedLayouts, s"Incorrect layouts in: ${site.layouts.keys}, expected: $expectedLayouts") } @@ -37,4 +36,24 @@ class StaticSiteTests extends DottyDocTest { "html page did not render properly" ) } + + @Test def renderMultipleTemplates = { + val site = new Site(new java.io.File("../doc-tool/resources/")) + + val renderedPage = site.render(new HtmlPage( + """|--- + |layout: index + |--- + |Hello, world!""".stripMargin, + Map.empty + ), Map.empty) + + assert( + renderedPage.contains("<h1>Hello, world!</h1>") && + !renderedPage.contains("---\nlayout: main\n---\n") && + !renderedPage.contains("---\nlayout: index\n---\n") && + renderedPage.contains("<!DOCTYPE html>"), + "html page did not render properly" + ) + } } |