From aca4731ccad3d57aa8b4f6fab250ed3a72e394c4 Mon Sep 17 00:00:00 2001
From: Alex Saveau <asaveau@google.com>
Date: Tue, 14 Jul 2020 20:39:22 +0000
Subject: Follow Javadoc file path convention

The current file path looks like `/androidx.fragment.app/package-summary.html` which is non-standard. This CL changes the path to look like `/androidx/fragment/app/package-summary.html`.
---
 .../kotlin/javadoc/location/JavadocLocationTest.kt | 32 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'plugins/javadoc/src/test/kotlin')

diff --git a/plugins/javadoc/src/test/kotlin/javadoc/location/JavadocLocationTest.kt b/plugins/javadoc/src/test/kotlin/javadoc/location/JavadocLocationTest.kt
index 235f68c0..b7a578a5 100644
--- a/plugins/javadoc/src/test/kotlin/javadoc/location/JavadocLocationTest.kt
+++ b/plugins/javadoc/src/test/kotlin/javadoc/location/JavadocLocationTest.kt
@@ -37,8 +37,8 @@ class JavadocTest : AbstractCoreTest() {
         }
         testInline(
             """
-            |/jvmSrc/javadoc/Test.kt
-            |package javadoc
+            |/jvmSrc/javadoc/test/Test.kt
+            |package javadoc.test
             |import java.io.Serializable
             |class Test<A>() : Serializable, Cloneable {
             |   fun test() {}
@@ -120,9 +120,27 @@ class JavadocTest : AbstractCoreTest() {
         }
     }
 
-    private fun htmlTranslator(rootPageNode: RootPageNode, dokkaContext: DokkaContext) = JavadocContentToHtmlTranslator(
-        dokkaContext.plugin<JavadocPlugin>().querySingle { locationProviderFactory }
-            .getLocationProvider(rootPageNode),
-        dokkaContext
-    )
+    @Test
+    fun `resolved package path`() {
+
+        locationTestInline { rootPageNode, dokkaContext ->
+            val locationProvider = dokkaContext.plugin<JavadocPlugin>().querySingle { locationProviderFactory }
+                .getLocationProvider(rootPageNode)
+            val packageNode = rootPageNode.firstChildOfType<JavadocPackagePageNode>()
+            val packagePath = locationProvider.resolve(packageNode)
+
+            assertEquals("javadoc/test/package-summary", packagePath)
+        }
+    }
+
+    private fun htmlTranslator(rootPageNode: RootPageNode, dokkaContext: DokkaContext): JavadocContentToHtmlTranslator {
+        val locationProvider = dokkaContext.plugin<JavadocPlugin>().querySingle { locationProviderFactory }
+            .getLocationProvider(rootPageNode)
+        return htmlTranslator(dokkaContext, locationProvider)
+    }
+
+    private fun htmlTranslator(
+        dokkaContext: DokkaContext,
+        locationProvider: JavadocLocationProvider
+    ) = JavadocContentToHtmlTranslator(locationProvider, dokkaContext)
 }
-- 
cgit