Fix tests

Kotlin · Jan 17, 2022 · 4005d99 · 4005d99
1 parent 253024a
commit 4005d99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/core/src/main/kotlin/links/DRI.kt b/core/src/main/kotlin/links/DRI.kt
@@ -53,7 +53,13 @@ fun DRI.withTargetToDeclaration() = copy(target = PointingToDeclaration)
 
 val DRI.parent: DRI
     get() = when {
-        extra != null -> copy(extra = null)
+        extra != null -> when {
+            DRIExtraContainer(extra)[EnumEntryDRIExtra] != null -> copy(
+                classNames = classNames?.substringBeforeLast(".", "")?.takeIf { it.isNotBlank() },
+                extra = null
+            )
+            else -> copy(extra = null)
+        }
         target != PointingToDeclaration -> copy(target = PointingToDeclaration)
         callable != null -> copy(callable = null)
         classNames != null -> copy(classNames = classNames.substringBeforeLast(".", "").takeIf { it.isNotBlank() })

diff --git a/plugins/base/src/test/kotlin/enums/EnumsTest.kt b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
@@ -125,7 +125,7 @@ class EnumsTest : BaseAbstractTest() {
             pagesGenerationStage = { module ->
                 val entryPage = module.dfs { it.name == "E1" } as ClasslikePageNode
                 val signaturePart = (entryPage.content.dfs {
-                    it is ContentGroup && it.dci.toString() == "[enums/Test.E1///PointingToDeclaration/][Symbol]"
+                    it is ContentGroup && it.dci.toString() == "[enums/Test.E1///PointingToDeclaration/{\"org.jetbrains.dokka.links.EnumEntryDRIExtra\":{\"key\":\"org.jetbrains.dokka.links.EnumEntryDRIExtra\"}}][Symbol]"
                 } as ContentGroup)
                 assertEquals("(\"e1\", 1, true)", signaturePart.constructorSignature())
             }
@@ -202,7 +202,7 @@ class EnumsTest : BaseAbstractTest() {
         ) {
             pagesTransformationStage = { m ->
                 val entryNode = m.children.first { it.name == "enums" }.children.first { it.name == "Test" }.children.firstIsInstance<ClasslikePageNode>()
-                val signature = (entryNode.content as ContentGroup).dfs { it is ContentGroup && it.dci.toString() == "[enums/Test.E1///PointingToDeclaration/][Cover]" } as ContentGroup
+                val signature = (entryNode.content as ContentGroup).dfs { it is ContentGroup && it.dci.toString() == "[enums/Test.E1///PointingToDeclaration/{\"org.jetbrains.dokka.links.EnumEntryDRIExtra\":{\"key\":\"org.jetbrains.dokka.links.EnumEntryDRIExtra\"}}][Cover]" } as ContentGroup
 
                 signature.assertNode {
                     header(1) { +"E1" }