Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmishenev
vmishenev committed Oct 18, 2023
1 parent e56109e commit ac5e13a
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 20 deletions.
90 changes: 72 additions & 18 deletions plugins/base/src/test/kotlin/content/annotations/SinceKotlinTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ import org.jetbrains.dokka.model.doc.CustomTagWrapper
import org.jetbrains.dokka.model.doc.Text
import org.jetbrains.dokka.pages.ContentPage
import signatures.AbstractRenderingTest
import utils.ParamAttributes
import utils.TestOutputWriterPlugin
import utils.assertNotNull
import utils.bareSignature
import utils.*
import kotlin.test.*


Expand Down Expand Up @@ -125,30 +122,54 @@ class SinceKotlinTest : AbstractRenderingTest() {
val configuration = dokkaConfiguration {
sourceSets {
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/jvm/")
analysisPlatform = "jvm"
}
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/native/")
analysisPlatform = "native"
}
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/common/")
analysisPlatform = "common"
}
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/js/")
analysisPlatform = "js"
}
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/wasm/")
analysisPlatform = "wasm"
}
}
}
testInline(
"""
|/src/main/kotlin/test/source.kt
|/src/jvm/kotlin/test/source.kt
|package test
|
|fun ring(abc: String): String {
| return "My precious " + abc
|}
|/src/native/kotlin/test/source.kt
|package test
|
|fun ring(abc: String): String {
| return "My precious " + abc
|}
|/src/common/kotlin/test/source.kt
|package test
|
|fun ring(abc: String): String {
| return "My precious " + abc
|}
|/src/js/kotlin/test/source.kt
|package test
|
|fun ring(abc: String): String {
| return "My precious " + abc
|}
|/src/wasm/kotlin/test/source.kt
|package test
|
|fun ring(abc: String): String {
Expand Down Expand Up @@ -181,37 +202,70 @@ class SinceKotlinTest : AbstractRenderingTest() {
}

@Test
@OnlyDescriptorsMPP("SinceKotlin is unresolved in platform source sets")
fun `mpp fun with SinceKotlin annotation`() {
val configuration = dokkaConfiguration {
sourceSets {
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/jvm/")
classpath = listOfNotNull(jvmStdlibPath)
analysisPlatform = "jvm"
}
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/native/")
analysisPlatform = "native"
}
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/common/")
classpath = listOfNotNull(commonStdlibPath)
analysisPlatform = "common"
}
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/js/")
classpath = listOfNotNull(jsStdlibPath)
analysisPlatform = "js"
}
sourceSet {
sourceRoots = listOf("src/")
sourceRoots = listOf("src/wasm/")
analysisPlatform = "wasm"
}
}
}
testInline(
"""
|/src/main/kotlin/test/source.kt
|/src/jvm/kotlin/test/source.kt
|package test
|
|/** dssdd */
|@SinceKotlin("1.3")
|fun ring(abc: String): String {
| return "My precious " + abc
|}
|/src/native/kotlin/test/source.kt
|package test
|
|/** dssdd */
|@SinceKotlin("1.3")
|fun ring(abc: String): String {
| return "My precious " + abc
|}
|/src/common/kotlin/test/source.kt
|package test
|
|/** dssdd */
|@SinceKotlin("1.3")
|fun ring(abc: String): String {
| return "My precious " + abc
|}
|/src/js/kotlin/test/source.kt
|package test
|
|/** dssdd */
|@SinceKotlin("1.3")
|fun ring(abc: String): String {
| return "My precious " + abc
|}
|/src/wasm/kotlin/test/source.kt
|package test
|
|/** dssdd */
Expand All @@ -226,7 +280,7 @@ class SinceKotlinTest : AbstractRenderingTest() {
.children.filter { it.name == "ring" && it is DFunction } as List<DFunction>
with(funcs) {
val sinceKotlin = mapOf(
Platform.common to SinceKotlinVersion("1.3"),
// Platform.common to SinceKotlinVersion("1.3"),
Platform.jvm to SinceKotlinVersion("1.3"),
Platform.js to SinceKotlinVersion("1.3"),
Platform.native to SinceKotlinVersion("1.3"),
Expand All @@ -238,7 +292,7 @@ class SinceKotlinTest : AbstractRenderingTest() {
find { it.sourceSets.first().analysisPlatform == i.key }?.documentation?.values?.first()
?.dfs { it is CustomTagWrapper && it.name == "Since Kotlin" }
.assertNotNull("SinceKotlin[${i.key}]")
assertEquals((tag.children.first() as Text).body, i.value.toString())
assertEquals(i.value.toString(), (tag.children.first() as Text).body , "Platform ${i.key}")
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,15 @@ class LinkableContentTest : BaseAbstractTest() {
sourceSets {
sourceSet {
analysisPlatform = "js"
sourceRoots = listOf("jsMain", "commonMain", "jvmAndJsSecondCommonMain").map {
sourceRoots = listOf("jsMain").map {
Paths.get("$testDataDir/$it/kotlin").toString()
}
name = "js"
includes = listOf(Paths.get("$includesDir/include2.md").toString())
}
sourceSet {
analysisPlatform = "jvm"
sourceRoots = listOf("jvmMain", "commonMain", "jvmAndJsSecondCommonMain").map {
sourceRoots = listOf("jvmMain").map {
Paths.get("$testDataDir/$it/kotlin").toString()
}
name = "jvm"
Expand Down

0 comments on commit ac5e13a

Please sign in to comment.