Skip to content

Add tests for intersected and overridden fake functions/properties #4307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+143 −0
Open

Add tests for intersected and overridden fake functions/properties #4307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
507b99a
Add test to reproduce #3857
vmishenev Oct 14, 2024
79b579a
Enable the test for #3857
AbdullinAM Oct 21, 2025
00ee8c4
Add test for intersected and overridden property
AbdullinAM Oct 21, 2025
5652bf3
Add content tests for intersected and overridden function/property
AbdullinAM Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 95 additions & 0 deletions dokka-subprojects/plugin-base/src/test/kotlin/content/inheritors/ContentForInheritorsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@ import org.jetbrains.dokka.DokkaConfiguration
import org.jetbrains.dokka.PluginConfigurationImpl
import org.jetbrains.dokka.base.DokkaBase
import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
import org.jetbrains.dokka.links.DRI
import org.jetbrains.dokka.model.dfs
import org.jetbrains.dokka.pages.MemberPageNode
import utils.OnlyDescriptors
import utils.classSignature
import utils.findTestType
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
import kotlin.test.assertNull

class ContentForInheritorsTest : BaseAbstractTest() {
private val testConfiguration = dokkaConfiguration {
Expand Down Expand Up @@ -501,4 +506,94 @@ class ContentForInheritorsTest : BaseAbstractTest() {
}
}
}

@Test
fun `fake intersected and overridden fake function does not generate redundant page`() {
testInline(
"""
|/src/main/kotlin/test/source.kt
|package test
|
|class NamedDomainObjectContainerScope<T : Any>
| : NamedDomainObjectContainerDelegate<T>(), PolymorphicDomainObjectContainer<T>
|
|abstract class NamedDomainObjectContainerDelegate<T : Any> : NamedDomainObjectContainer<T> {
| override fun getNamer(): T? = null
|}
|
|interface PolymorphicDomainObjectContainer<T>: NamedDomainObjectContainer<T>
|
|interface NamedDomainObjectContainer<T> {
| fun getNamer(): T? = null
|}
""".trimMargin(),
testConfiguration
) {
pagesTransformationStage = { module ->
val targetDRI = DRI(
"test",
"NamedDomainObjectContainerDelegate",
org.jetbrains.dokka.links.Callable("getNamer", null, emptyList())
)
val fakeDRI = DRI(
"test",
"NamedDomainObjectContainerScope",
org.jetbrains.dokka.links.Callable("getNamer", null, emptyList())
)
assertNull(
module.dfs { it.name == "getNamer" && (it as? MemberPageNode)?.dri?.singleOrNull() == fakeDRI },
"There should be no page for NamedDomainObjectContainerScope::getNamer"
)
assertNotNull(
module.dfs { it.name == "getNamer" && (it as? MemberPageNode)?.dri?.singleOrNull() == targetDRI },
"There should be a page for NamedDomainObjectContainerScope::getNamer"
)
}
}
}

@Test
fun `fake intersected and overridden fake property does not generate redundant page`() {
testInline(
"""
|/src/main/kotlin/test/source.kt
|package test
|
|class NamedDomainObjectContainerScope<T : Any>
| : NamedDomainObjectContainerDelegate<T>(), PolymorphicDomainObjectContainer<T>
|
|abstract class NamedDomainObjectContainerDelegate<T : Any> : NamedDomainObjectContainer<T> {
| override var namer: T? = null
|}
|
|interface PolymorphicDomainObjectContainer<T>: NamedDomainObjectContainer<T>
|
|interface NamedDomainObjectContainer<T> {
| var namer: T? = null
|}
""".trimMargin(),
testConfiguration
) {
pagesTransformationStage = { module ->
val targetDRI = DRI(
"test",
"NamedDomainObjectContainerDelegate",
org.jetbrains.dokka.links.Callable("namer", null, emptyList())
)
val fakeDRI = DRI(
"test",
"NamedDomainObjectContainerScope",
org.jetbrains.dokka.links.Callable("namer", null, emptyList())
)
assertNull(
module.dfs { it.name == "namer" && (it as? MemberPageNode)?.dri?.singleOrNull() == fakeDRI },
"There should be no page for NamedDomainObjectContainerScope::namer"
)
assertNotNull(
module.dfs { it.name == "namer" && (it as? MemberPageNode)?.dri?.singleOrNull() == targetDRI },
"There should be a page for NamedDomainObjectContainerScope::namer"
)
}
}
}
}
48 changes: 48 additions & 0 deletions dokka-subprojects/plugin-base/src/test/kotlin/model/InheritorsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,4 +756,52 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt",
}
}
}

@Test
fun `fake intersected and overridden fake fun should have correct DRI`() {
inlineModelTest(
"""
|class NamedDomainObjectContainerScope<T : Any>
| : NamedDomainObjectContainerDelegate<T>(), PolymorphicDomainObjectContainer<T>
|
|abstract class NamedDomainObjectContainerDelegate<T : Any> : NamedDomainObjectContainer<T> {
| override fun getNamer(): T? = null
|}
|
|interface PolymorphicDomainObjectContainer<T>: NamedDomainObjectContainer<T>
|
|interface NamedDomainObjectContainer<T> {
| fun getNamer(): T? = null
|}
"""
) {
with((this / "inheritors" / "NamedDomainObjectContainerScope" / "getNamer").cast<DFunction>()) {
dri equals DRI("inheritors", "NamedDomainObjectContainerDelegate", org.jetbrains.dokka.links.Callable("getNamer", null, emptyList()) )
}
}
}

@Test
fun `fake intersected and overridden fake property should have correct DRI`() {
inlineModelTest(
"""
|class NamedDomainObjectContainerScope<T : Any>
| : NamedDomainObjectContainerDelegate<T>(), PolymorphicDomainObjectContainer<T>
|
|abstract class NamedDomainObjectContainerDelegate<T : Any> : NamedDomainObjectContainer<T> {
| override var namer: T? = null
|}
|
|interface PolymorphicDomainObjectContainer<T>: NamedDomainObjectContainer<T>
|
|interface NamedDomainObjectContainer<T> {
| var namer: T? = null
|}
"""
) {
with((this / "inheritors" / "NamedDomainObjectContainerScope" / "namer").cast<DProperty>()) {
dri equals DRI("inheritors", "NamedDomainObjectContainerDelegate", org.jetbrains.dokka.links.Callable("namer", null, emptyList()) )
}
}
}
}
Loading