Fix navigation links and add tests

Author: romanowski

scala3doc/src/dotty/renderers/HtmlRenderer.scala

@@ -139,7 +139,7 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
       val isSelected = nav.link.dri == pageLink.dri
       def linkHtml(exapnded: Boolean = false) =
         val attrs = if (isSelected) Seq(cls := "selected expanded") else Nil
-        a(href := pathToPage(nav.link.dri, pageLink.dri), attrs)(nav.link.name)
+        a(href := pathToPage(pageLink.dri, nav.link.dri), attrs)(nav.link.name)
 
       nav.children match
         case Nil => isSelected -> div(linkHtml())

scala3doc/test/dotty/dokka/site/NavitationTest.scala

@@ -0,0 +1,50 @@
+package dotty.dokka
+package site
+
+import org.junit.Test
+
+class NavitationTest extends BaseHtmlTest:
+
+  case class NavMenuTestEntry( name: String, link: String, nested: Seq[NavMenuTestEntry])
+
+  def testNavMenu(page: String, topLevel: NavMenuTestEntry)(using ProjectContext): Unit =
+    withHtmlFile(page){ content  =>
+      def flatten(l: NavMenuTestEntry): Seq[NavMenuTestEntry] = l +: l.nested.flatMap(flatten)
+
+      def test(query: String, el: Seq[NavMenuTestEntry]) =
+        content.assertTextsIn(query, el.map(_.name):_*)
+        content.assertAttr(query,"href", el.map(_.link):_*)
+
+      test("#sideMenu2 a", flatten(topLevel))
+      test("#sideMenu2>div>div>a", topLevel.nested)
+      test("#sideMenu2>div>div>div>a", topLevel.nested.flatMap(_.nested))
+      test("#sideMenu2>div>div>div>div>a", topLevel.nested.flatMap(_.nested.flatMap(_.nested)))
+    }
+
+
+  @Test
+  def testBasicNavigation() = withGeneratedSite(testDocPath.resolve("basic")){
+    val topLevelNav = NavMenuTestEntry(projectName, "index.html", Seq(
+      NavMenuTestEntry("Adoc", "Adoc.html", Seq()),
+      NavMenuTestEntry("A directory", "dir/index.html", Seq(
+        NavMenuTestEntry("Nested in a directory", "dir/nested.html", Nil)
+      )),
+      NavMenuTestEntry("Basic test", "../index.html", Seq()),
+      NavMenuTestEntry("API", "../api/index.html", Seq(
+        NavMenuTestEntry("tests.site", "../api/tests/site.html", Seq(
+          NavMenuTestEntry("BrokenLink", "../api/tests/site/BrokenLink.html", Nil),
+          NavMenuTestEntry("BrokenLinkWiki", "../api/tests/site/BrokenLinkWiki.html", Nil),
+          NavMenuTestEntry("OtherPackageLink", "../api/tests/site/OtherPackageLink.html", Nil),
+          NavMenuTestEntry("OtherPackageLinkWiki", "../api/tests/site/OtherPackageLinkWiki.html", Nil),
+          NavMenuTestEntry("SamePackageLink", "../api/tests/site/SamePackageLink.html", Nil),
+          NavMenuTestEntry("SamePackageLinkWiki", "../api/tests/site/SamePackageLinkWiki.html", Nil),
+          NavMenuTestEntry("SomeClass", "../api/tests/site/SomeClass.html", Nil)
+        )),
+        NavMenuTestEntry("tests.site.some.other", "../api/tests/site/some/other.html", Seq(
+          NavMenuTestEntry("SomeOtherPackage", "../api/tests/site/some/other/SomeOtherPackage.html", Nil),
+        ))
+      )),
+    ))
+
+    testNavMenu("docs/Adoc.html", topLevelNav)
+  }

scala3doc/test/dotty/dokka/site/SiteGeneratationTest.scala

@@ -71,7 +71,7 @@ class SiteGeneratationTest extends BaseHtmlTest:
 
     withHtmlFile("docs/Adoc.html"){ content  =>
         content.assertAttr("p a","href", "../api/tests/site/SomeClass.html")
-      }
+    }
   }
 
   @Test