2 files changed, 78 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index f54e22e564..6b22fd6549 100644
--- a/build.xml
+++ b/build.xml
@@ -1588,7 +1588,16 @@ BOOTRAPING TEST AND TEST SUITE
     </partest>
   </target>
 
-  <target name="test.done" depends="test.suite, test.continuations.suite, test.stability"/>
+  <target name="test.scaladoc" depends="pack.done">
+    <partest erroronfailed="yes" scalacopts="${scalac.args.optimise}">
+      <compilationpath>
+        <path refid="pack.classpath"/>
+      </compilationpath>
+      <scalachecktests dir="test/scaladoc" includes="**/*.scala"/>
+    </partest>
+  </target>
+
+  <target name="test.done" depends="test.suite, test.continuations.suite, test.scaladoc, test.stability"/>
 
 <!-- ===========================================================================
 DISTRIBUTION
diff --git a/test/scaladoc/model/CommentFactoryTest.scala b/test/scaladoc/model/CommentFactoryTest.scala
new file mode 100644
index 0000000000..20b52b91f7
--- /dev/null
+++ b/test/scaladoc/model/CommentFactoryTest.scala
@@ -0,0 +1,68 @@
+import org.scalacheck._
+
+import scala.tools.nsc.Global
+import scala.tools.nsc.doc
+import scala.tools.nsc.doc.model.comment._
+
+class Factory(val g: Global, val s: doc.Settings)
+  extends doc.model.ModelFactory(g, s) {
+  thisFactory: Factory with CommentFactory with doc.model.TreeFactory =>
+
+  def strip(c: Comment): Option[Inline] = {
+    c.body match {
+      case Body(List(Paragraph(Chain(List(Summary(inner)))))) => Some(inner)
+      case _ => None
+    }
+  }
+
+  def parseComment(s: String): Option[Inline] =
+    strip(parse(s, "", scala.tools.nsc.util.NoPosition))
+}
+
+object Test extends Properties("CommentFactory") {
+  val factory = {
+    val settings = new doc.Settings((str: String) => {})
+    val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings)
+    val g = new Global(settings, reporter)
+    (new Factory(g, settings) with CommentFactory with doc.model.TreeFactory)
+  }
+
+  def parse(src: String, dst: Inline) = {
+    factory.parseComment(src) match {
+        case Some(inline) =>
+          inline == dst
+        case _ =>
+          false
+    }
+  }
+
+  property("parse") = parse(
+      "/** One two three */",
+      Text("One two three")
+  )
+  property("parse") = parse(
+    "/** One `two` three */",
+    Chain(List(Text("One "), Monospace("two"), Text(" three")))
+  )
+
+  property("parse") = parse(
+      """
+/** One two
+  * three */""",
+      Text("One two\nthree")
+  )
+  property("parse") = parse(
+      """
+/** One `two`
+  * three */""",
+      Chain(List(Text("One "), Monospace("two"), Text("\nthree")))
+  )
+
+  property("parse") = parse(
+      """
+/** One `two`
+ *  three */""",
+      Chain(List(Text("One "), Monospace("two"), Text("\n three")))
+  )
+
+}