summaryrefslogtreecommitdiff
path: root/test/scaladoc/scalacheck
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-16 11:36:51 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-09-16 11:36:51 +1000
commit2724a1ce206eee03d984472b19ac908fc62e9ccc (patch)
treeba39a0e0ba6d6d896e898526316d567ea080ff5f /test/scaladoc/scalacheck
parentc154d343348218d1008e4217713246c3e23acd1d (diff)
parentabd595db299024b76f75da0728ae7ec4fca4bcae (diff)
downloadscala-2724a1ce206eee03d984472b19ac908fc62e9ccc.tar.gz
scala-2724a1ce206eee03d984472b19ac908fc62e9ccc.tar.bz2
scala-2724a1ce206eee03d984472b19ac908fc62e9ccc.zip
Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915
Diffstat (limited to 'test/scaladoc/scalacheck')
-rw-r--r--test/scaladoc/scalacheck/HtmlFactoryTest.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/scaladoc/scalacheck/HtmlFactoryTest.scala b/test/scaladoc/scalacheck/HtmlFactoryTest.scala
index fdc4f9527f..fc190b188c 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