diff options
Diffstat (limited to 'plugins/base/src/test/kotlin')
3 files changed, 61 insertions, 52 deletions
diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt index 4fc4d785..86222d95 100644 --- a/plugins/base/src/test/kotlin/model/PackagesTest.kt +++ b/plugins/base/src/test/kotlin/model/PackagesTest.kt @@ -14,8 +14,8 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac """.trimIndent(), prependPackage = false, configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin") displayName = "JVM" } diff --git a/plugins/base/src/test/kotlin/signatures/DivergentSignatureTest.kt b/plugins/base/src/test/kotlin/signatures/DivergentSignatureTest.kt index 67a43725..7635ab05 100644 --- a/plugins/base/src/test/kotlin/signatures/DivergentSignatureTest.kt +++ b/plugins/base/src/test/kotlin/signatures/DivergentSignatureTest.kt @@ -5,8 +5,8 @@ import org.jsoup.Jsoup import org.jsoup.nodes.Element import org.jsoup.select.Elements import org.junit.jupiter.api.Test -import utils.* import java.nio.file.Paths +import utils.TestOutputWriterPlugin class DivergentSignatureTest : AbstractCoreTest() { @@ -16,30 +16,33 @@ class DivergentSignatureTest : AbstractCoreTest() { val testDataDir = getTestDataDir("multiplatform/basicMultiplatformTest").toAbsolutePath() val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { moduleName = "example" + displayName = "js" + name = "js" analysisPlatform = "js" sourceRoots = listOf("jsMain", "commonMain", "jvmAndJsSecondCommonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "js" } - pass { + sourceSet { moduleName = "example" + displayName = "jvm" + name = "jvm" analysisPlatform = "jvm" sourceRoots = listOf("jvmMain", "commonMain", "jvmAndJsSecondCommonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "jvm" } - pass { + sourceSet { moduleName = "example" + displayName = "common" + name = "common" analysisPlatform = "common" sourceRoots = listOf("commonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "common" } } } @@ -54,7 +57,7 @@ class DivergentSignatureTest : AbstractCoreTest() { val content = writerPlugin.renderedContent("example/example/-clock/get-time.html") assert(content.count() == 1) - assert(content.select("[data-filterable-current=js jvm common]").single().brief == "") + assert(content.select("[data-filterable-current=example/js example/jvm example/common]").single().brief == "") } } } @@ -65,30 +68,33 @@ class DivergentSignatureTest : AbstractCoreTest() { val testDataDir = getTestDataDir("multiplatform/basicMultiplatformTest").toAbsolutePath() val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { moduleName = "example" + displayName = "js" + name = "js" analysisPlatform = "js" sourceRoots = listOf("jsMain", "commonMain", "jvmAndJsSecondCommonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "js" } - pass { + sourceSet { moduleName = "example" + displayName = "jvm" + name = "jvm" analysisPlatform = "jvm" sourceRoots = listOf("jvmMain", "commonMain", "jvmAndJsSecondCommonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "jvm" } - pass { + sourceSet { moduleName = "example" + displayName = "common" + name = "common" analysisPlatform = "common" sourceRoots = listOf("commonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "common" } } } @@ -102,8 +108,8 @@ class DivergentSignatureTest : AbstractCoreTest() { renderingStage = { _, _ -> val content = writerPlugin.renderedContent("example/example/-clock/get-times-in-millis.html") assert(content.count() == 2) - assert(content.select("[data-filterable-current=jvm common]").single().brief == "Time in minis") - assert(content.select("[data-filterable-current=js]").single().brief == "JS implementation of getTimeInMillis example/js" ) + assert(content.select("[data-filterable-current=example/jvm example/common]").single().brief == "Time in minis") + assert(content.select("[data-filterable-current=example/js]").single().brief == "JS implementation of getTimeInMillis js" ) } } } @@ -114,30 +120,33 @@ class DivergentSignatureTest : AbstractCoreTest() { val testDataDir = getTestDataDir("multiplatform/basicMultiplatformTest").toAbsolutePath() val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { moduleName = "example" + displayName = "js" + name = "js" analysisPlatform = "js" sourceRoots = listOf("jsMain", "commonMain", "jvmAndJsSecondCommonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "js" } - pass { + sourceSet { moduleName = "example" + displayName = "jvm" + name = "jvm" analysisPlatform = "jvm" sourceRoots = listOf("jvmMain", "commonMain", "jvmAndJsSecondCommonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "jvm" } - pass { + sourceSet { moduleName = "example" + displayName = "common" + name = "common" analysisPlatform = "common" sourceRoots = listOf("commonMain").map { Paths.get("$testDataDir/$it/kotlin").toString() } - sourceSetID = "common" } } } @@ -151,9 +160,9 @@ class DivergentSignatureTest : AbstractCoreTest() { renderingStage = { _, _ -> val content = writerPlugin.renderedContent("example/example/-clock/get-year.html") assert(content.count() == 3) - assert(content.select("[data-filterable-current=jvm]").single().brief == "JVM custom kdoc example/jvm") - assert(content.select("[data-filterable-current=js]").single().brief == "JS custom kdoc example/js") - assert(content.select("[data-filterable-current=common]").single().brief == "example/common") + assert(content.select("[data-filterable-current=example/jvm]").single().brief == "JVM custom kdoc jvm") + assert(content.select("[data-filterable-current=example/js]").single().brief == "JS custom kdoc js") + assert(content.select("[data-filterable-current=example/common]").single().brief == "common") } } } diff --git a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt index fbdebfa2..9f2ae435 100644 --- a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt +++ b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt @@ -19,8 +19,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -46,8 +46,8 @@ class SignatureTest : AbstractCoreTest() { fun `open fun`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -73,8 +73,8 @@ class SignatureTest : AbstractCoreTest() { fun `open suspend fun`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -100,8 +100,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun with params`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -129,8 +129,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun with function param`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -157,8 +157,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun with generic param`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -185,8 +185,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun with generic bounded param`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -213,8 +213,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun with keywords, params and generic bound`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -242,8 +242,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun with annotation`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -283,8 +283,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun with two annotations`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } @@ -331,8 +331,8 @@ class SignatureTest : AbstractCoreTest() { fun `fun with annotation with array`() { val configuration = dokkaConfiguration { - passes { - pass { + sourceSets { + sourceSet { sourceRoots = listOf("src/main/kotlin/test/Test.kt") } } |