From 2b5ac5aa5fe46bd3eb3eba3de2eca68a09833703 Mon Sep 17 00:00:00 2001
From: Paweł Wiejacha <pawel.wiejacha@gmail.com>
Date: Fri, 22 Aug 2014 09:15:01 +0200
Subject: SI-8810 scaladoc: fixed code block indentation normalization

---
 test/scaladoc/resources/code-indent.scala      | 6 ++++++
 test/scaladoc/scalacheck/HtmlFactoryTest.scala | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'test/scaladoc')

diff --git a/test/scaladoc/resources/code-indent.scala b/test/scaladoc/resources/code-indent.scala
index 88946ffc7f..2eee3352b4 100644
--- a/test/scaladoc/resources/code-indent.scala
+++ b/test/scaladoc/resources/code-indent.scala
@@ -20,6 +20,12 @@
  *       an alternative
  *         the e l s e branch
  *    }}}
+ *    {{{
+ *    Trait example {
+ *      Val x = a
+ *      Val y = b
+ *    }
+ *    }}}
  *    NB: Trailing spaces are necessary for this test!
  *    {{{
  *       l1
diff --git a/test/scaladoc/scalacheck/HtmlFactoryTest.scala b/test/scaladoc/scalacheck/HtmlFactoryTest.scala
index ef70e0bf21..da0f253a37 100644
--- a/test/scaladoc/scalacheck/HtmlFactoryTest.scala
+++ b/test/scaladoc/scalacheck/HtmlFactoryTest.scala
@@ -659,6 +659,7 @@ object Test extends Properties("HtmlFactory") {
         s.contains("<pre>two lines, one useful</pre>") &&
         s.contains("<pre>line1\nline2\nline3\nline4</pre>") &&
         s.contains("<pre>a ragged example\na (condition)\n  the t h e n branch\nan alternative\n  the e l s e branch</pre>") &&
+        s.contains("<pre>Trait example {\n  Val x = a\n  Val y = b\n}</pre>") &&
         s.contains("<pre>l1\n\nl2\n\nl3\n\nl4\n\nl5</pre>")
       }
       case _ => false
@@ -683,7 +684,7 @@ object Test extends Properties("HtmlFactory") {
     oneAuthor match {
       case node: scala.xml.Node => {
         val s = node.toString
-        s.contains("<h6>Author:</h6>")
+        s.contains("<h6>Author:</h6>") &&
         s.contains("<p>The Only Author\n</p>")
       }
       case _ => false
@@ -696,8 +697,8 @@ object Test extends Properties("HtmlFactory") {
     twoAuthors match {
       case node: scala.xml.Node => {
         val s = node.toString
-        s.contains("<h6>Authors:</h6>")
-        s.contains("<p>The First Author\n</p>")
+        s.contains("<h6>Authors:</h6>") &&
+        s.contains("<p>The First Author</p>") &&
         s.contains("<p>The Second Author\n</p>")
       }
       case _ => false
-- 
cgit v1.2.3