From 44797916bd4437729e1f13333eee7a2a2cb8ca58 Mon Sep 17 00:00:00 2001
From: Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
Date: Thu, 3 May 2012 23:44:48 +0900
Subject: Fix SI-4976 partially

If a package have a package object, generate the package's "linearization"
from the object.
---
 test/scaladoc/resources/package-object-res.scala | 14 ++++++++++++++
 test/scaladoc/run/package-object.check           |  2 ++
 test/scaladoc/run/package-object.scala           | 15 +++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 test/scaladoc/resources/package-object-res.scala
 create mode 100644 test/scaladoc/run/package-object.check
 create mode 100644 test/scaladoc/run/package-object.scala

(limited to 'test')

diff --git a/test/scaladoc/resources/package-object-res.scala b/test/scaladoc/resources/package-object-res.scala
new file mode 100644
index 0000000000..17d5c0a499
--- /dev/null
+++ b/test/scaladoc/resources/package-object-res.scala
@@ -0,0 +1,14 @@
+/** This package have A and B.
+  */
+package test {
+  trait A { def hi = "hello" }
+  trait B { def bye = "bye!" }
+}
+
+/** This package object extends A and B.
+  */
+package object test extends A with B {
+  override def hi = "good morning!"
+  override def bye = "good bye!"
+  protected def thank = "thank you!"
+}
diff --git a/test/scaladoc/run/package-object.check b/test/scaladoc/run/package-object.check
new file mode 100644
index 0000000000..4297847e73
--- /dev/null
+++ b/test/scaladoc/run/package-object.check
@@ -0,0 +1,2 @@
+List((test.B,B), (test.A,A), (scala.AnyRef,AnyRef), (scala.Any,Any))
+Done.
diff --git a/test/scaladoc/run/package-object.scala b/test/scaladoc/run/package-object.scala
new file mode 100644
index 0000000000..fd36a8df7b
--- /dev/null
+++ b/test/scaladoc/run/package-object.scala
@@ -0,0 +1,15 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+import language._
+
+object Test extends ScaladocModelTest {
+  override def resourceFile = "package-object-res.scala"
+  override def scaladocSettings = ""
+  def testModel(root: Package) = {
+    import access._
+
+    val p = root._package("test")
+    println(p.linearization)
+  }
+}
+
-- 
cgit v1.2.3