[scaladoc] Closes #4452 again. Review by malayeri.

2 files changed, 24 insertions, 5 deletions

diff --git a/test/scaladoc/resources/Trac4452.scala b/test/scaladoc/resources/Trac4452.scala
index b49a174517..b844437dba 100644
--- a/test/scaladoc/resources/Trac4452.scala
+++ b/test/scaladoc/resources/Trac4452.scala
@@ -1,11 +1,30 @@
 /**
  * @define MacroWithNewLine
- * blah blah blah
+ * This macro should not include "*".
+ *
+ * @define MacroWithoutNewLine This macro
+ * should
+ * include "*".
  */
 class Test
 
 /**
  * TestA class
- *
- * $MacroWithNewLine */
-class Trac4452 extends Test
+ */
+class Trac4452 extends Test {
+  /** $MacroWithNewLine */
+  def a = 1
+
+  /** $MacroWithoutNewLine */
+  def b = 2
+
+  /**
+   * $MacroWithNewLine
+   */
+  def c = 3
+
+  /**
+   * $MacroWithoutNewLine
+   */
+  def d = 4
+}
diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala
index 4e5c0bcdee..15f5249c90 100644
--- a/test/scaladoc/scala/html/HtmlFactoryTest.scala
+++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala
@@ -270,7 +270,7 @@ object Test extends Properties("HtmlFactory") {
   property("Trac #4452") = {
     createTemplate("Trac4452.scala") match {
       case node: scala.xml.Node =>
-        ! node.toString.contains("* blah blah blah")
+        ! node.toString.contains(">*")
       case _ => false
     }
   }