1 files changed, 8 insertions, 18 deletions
diff --git a/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala b/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala
index 77b49700c..a4279e18c 100644
--- a/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala
+++ b/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala
@@ -6,16 +6,6 @@ import org.junit.Test
 import org.junit.Assert._
 
 class SiteTests extends DottyDocTest with SourceFileOps {
-  import scala.collection.JavaConverters._
-  val site = new Site(new java.io.File("../doc-tool/resources/"), "test-site", Map.empty)
-
-  private def html(
-    str: String,
-    path: String = "test-page",
-    params: Map[String, AnyRef] = Map("docs" -> List.empty.asJava),
-    includes: Map[String, Include] = Map.empty
-  ) = new HtmlPage(path, stringToSource(path, str), params, includes)
-
   @Test def hasCorrectLayoutFiles = {
     assert(site.root.exists && site.root.isDirectory,
            s"'${site.root.getName}' is not a directory")
@@ -26,13 +16,13 @@ class SiteTests extends DottyDocTest with SourceFileOps {
   }
 
   @Test def renderHelloInMainLayout = {
-    val renderedPage = site.render(html(
+    val renderedPage = site.render(htmlPage(
       """|---
          |layout: main
          |---
          |
          |Hello, world!""".stripMargin
-    ), Map.empty)
+    ), Map.empty).get
 
     assert(
       renderedPage.contains("Hello, world!") &&
@@ -43,12 +33,12 @@ class SiteTests extends DottyDocTest with SourceFileOps {
   }
 
   @Test def renderMultipleTemplates = {
-    val renderedPage = site.render(html(
+    val renderedPage = site.render(htmlPage(
       """|---
          |layout: index
          |---
          |Hello, world!""".stripMargin
-    ), Map.empty)
+    ), Map.empty).get
 
     assert(
       renderedPage.contains("<h1>Hello, world!</h1>") &&
@@ -60,13 +50,13 @@ class SiteTests extends DottyDocTest with SourceFileOps {
   }
 
   @Test def preservesPageYaml = {
-    val renderedPage = site.render(html(
+    val renderedPage = site.render(htmlPage(
       """|---
          |title: Hello, world
          |layout: index
          |---
          |Hello, world!""".stripMargin
-    ), Map.empty)
+    ), Map.empty).get
 
     assert(
       renderedPage.contains("<h1>Hello, world!</h1>") &&
@@ -80,9 +70,9 @@ class SiteTests extends DottyDocTest with SourceFileOps {
 
   @Test def include = {
     val renderedInclude = site.render(
-      html("""{% include "header.html" %}""", includes = site.includes),
+      htmlPage("""{% include "header.html" %}""", includes = site.includes),
       Map.empty
-    )
+    ).get
 
     assertEquals("<h1>Some header</h1>\n", renderedInclude)
   }