SI-5533 Skip scaladoc packages from documentation

3 files changed, 38 insertions, 9 deletions

diff --git a/test/scaladoc/run/SI-3314-diagrams.scala b/test/scaladoc/run/SI-3314-diagrams.scala
index 0b07e4c5bd..050c6e7f48 100644
--- a/test/scaladoc/run/SI-3314-diagrams.scala
+++ b/test/scaladoc/run/SI-3314-diagrams.scala
@@ -1,5 +1,4 @@
 import scala.tools.nsc.doc.model._
-import scala.tools.nsc.doc.model.diagram._
 import scala.tools.partest.ScaladocModelTest
 
 object Test extends ScaladocModelTest {
@@ -17,14 +16,6 @@ object Test extends ScaladocModelTest {
     val base = rootPackage._package("scala")._package("test")._package("scaladoc")
 
     val diagrams = base._package("diagrams")
-    def testDiagram(doc: DocTemplateEntity, diag: Option[Diagram], nodes: Int, edges: Int) = {
-      assert(diag.isDefined, doc.qualifiedName + " diagram missing")
-      assert(diag.get.nodes.length == nodes,
-             doc.qualifiedName + "'s diagram: node count " + diag.get.nodes.length + " == " + nodes)
-      assert(diag.get.edges.length == edges,
-             doc.qualifiedName + "'s diagram: edge count " + diag.get.edges.length + " == " + edges)
-    }
-
     val templates = List(diagrams._trait("WeekDayTraitWithDiagram"), diagrams._class("WeekDayClassWithDiagram"), diagrams._object("WeekDayObjectWithDiagram"))
 
     for (template <- templates) {
diff --git a/test/scaladoc/run/SI-5533.check b/test/scaladoc/run/SI-5533.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-5533.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-5533.scala b/test/scaladoc/run/SI-5533.scala
new file mode 100644
index 0000000000..e7b5f57860
--- /dev/null
+++ b/test/scaladoc/run/SI-5533.scala
@@ -0,0 +1,37 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+
+  // Working around the fact that usecases have the form Coll[T] and not Coll[T, U], as required by Map
+  override def code = """
+      package a {
+        class A { class Z }
+        class C extends b.B { class X extends Y }
+      }
+
+      package b {
+        /** @contentDiagram */
+        class B extends a.A { class Y extends Z }
+        /** @contentDiagram */
+        class D extends a.C { class V extends X }
+      }
+  """
+
+  // no need for special settings
+  def scaladocSettings = "-diagrams -skip-packages a"
+
+  def testModel(rootPackage: Package) = {
+    // get the quick access implicit defs in scope (_package(s), _class(es), _trait(s), object(s) _method(s), _value(s))
+    import access._
+
+    // just need to check the member exists, access methods will throw an error if there's a problem
+    assert(!rootPackage.templates.exists(_.name == "a"), "package a should not exist in the root package")
+    assert(rootPackage.templates.exists(_.name == "b"),  "package b should exist in the root package")
+    val b = rootPackage._package("b")
+    val B = b._class("B")
+    val D = b._class("D")
+    testDiagram(B, B.contentDiagram, 2, 1)
+    testDiagram(D, D.contentDiagram, 2, 1)
+  }
+}
\ No newline at end of file