diff options
| author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-08-19 12:57:38 +0200 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-08-20 15:36:07 +0200 |
| commit | 45bec5b68c2da35860877c6298bff04a4cb3d1d6 (patch) | |
| tree | d99b27e6c6100ef93c2989caac66b55ef3ba3e21 /plugins/base/src/test/kotlin | |
| parent | e4fc2c274fd982b2742eac46581b504b56b2b48f (diff) | |
| download | dokka-45bec5b68c2da35860877c6298bff04a4cb3d1d6.tar.gz dokka-45bec5b68c2da35860877c6298bff04a4cb3d1d6.tar.bz2 dokka-45bec5b68c2da35860877c6298bff04a4cb3d1d6.zip | |
Fix LinkProvider to link properly all nested generic parameters
Diffstat (limited to 'plugins/base/src/test/kotlin')
| -rw-r--r-- | plugins/base/src/test/kotlin/basic/DRITest.kt | 2 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt | 3 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/markdown/LinkTest.kt | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/plugins/base/src/test/kotlin/basic/DRITest.kt b/plugins/base/src/test/kotlin/basic/DRITest.kt index ba40a200..7083609a 100644 --- a/plugins/base/src/test/kotlin/basic/DRITest.kt +++ b/plugins/base/src/test/kotlin/basic/DRITest.kt @@ -271,7 +271,7 @@ class DRITest : AbstractCoreTest() { val foo = sampleInner.children.first { it.name == "foo" } as MemberPageNode val documentable = foo.documentable as DFunction - assertEquals(sampleClass.dri.first().toString(), (documentable.type as TypeParameter).dri.toString()) + assertEquals((sampleClass.documentable as WithGenerics).generics.first().dri.toString(), (documentable.type as TypeParameter).dri.toString()) assertEquals(0, documentable.generics.size) } } diff --git a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt index 42d10549..4a7e059c 100644 --- a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt +++ b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt @@ -5,6 +5,7 @@ import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.base.transformers.pages.samples.DefaultSamplesTransformer import org.jetbrains.dokka.base.transformers.pages.sourcelinks.SourceLinksTransformer import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder +import org.jetbrains.dokka.model.WithGenerics import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.plugability.plugin @@ -220,7 +221,7 @@ class LinkableContentTest : AbstractCoreTest() { child?.text == "S" }?.safeAs<ContentDRILink>() - Assertions.assertEquals(sample.dri.first(), returnTypeNode?.address) + Assertions.assertEquals((sample.documentable as WithGenerics).generics.first().dri, returnTypeNode?.address) } } } diff --git a/plugins/base/src/test/kotlin/markdown/LinkTest.kt b/plugins/base/src/test/kotlin/markdown/LinkTest.kt index 32cf01a8..deef1d2d 100644 --- a/plugins/base/src/test/kotlin/markdown/LinkTest.kt +++ b/plugins/base/src/test/kotlin/markdown/LinkTest.kt @@ -1,5 +1,6 @@ package markdown +import org.jetbrains.dokka.model.WithGenerics import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.pages.ClasslikePageNode import org.jetbrains.dokka.pages.ContentDRILink @@ -70,9 +71,10 @@ class LinkTest : AbstractCoreTest() { val root = rootPageNode.children.single().children.single() as ClasslikePageNode val innerClass = root.children.first { it is ClasslikePageNode } val foo = innerClass.children.first { it.name == "foo" } as MemberPageNode + val destinationDri = (root.documentable as WithGenerics).generics.first().dri.toString() - assertEquals(root.dri.first().toString(), "[JVM root]/Outer///PointingToDeclaration/") - assertNotNull(foo.content.dfs { it is ContentDRILink && it.address.toString() == root.dri.first().toString() } ) + assertEquals(destinationDri, "[JVM root]/Outer///PointingToGenericParameters(0)/") + assertNotNull(foo.content.dfs { it is ContentDRILink && it.address.toString() == destinationDri } ) } } } |