aboutsummaryrefslogtreecommitdiff
path: root/plugins/base/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/base/src/test')
-rw-r--r--plugins/base/src/test/kotlin/basic/DRITest.kt40
-rw-r--r--plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt6
-rw-r--r--plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt18
-rw-r--r--plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt8
-rw-r--r--plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt4
-rw-r--r--plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt4
-rw-r--r--plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/enums/EnumsTest.kt20
-rw-r--r--plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt22
-rw-r--r--plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt11
-rw-r--r--plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt22
-rw-r--r--plugins/base/src/test/kotlin/issues/IssuesTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt38
-rw-r--r--plugins/base/src/test/kotlin/locationProvider/DefaultLocationProviderTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/markdown/KDocTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/markdown/LinkTest.kt10
-rw-r--r--plugins/base/src/test/kotlin/model/InheritorsTest.kt8
-rw-r--r--plugins/base/src/test/kotlin/model/PropertyTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt10
-rw-r--r--plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt10
-rw-r--r--plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt8
-rw-r--r--plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt8
-rw-r--r--plugins/base/src/test/kotlin/renderers/html/defaultSourceSet.kt9
-rw-r--r--plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt6
-rw-r--r--plugins/base/src/test/kotlin/transformerBuilders/PageTransformerBuilderTest.kt12
-rw-r--r--plugins/base/src/test/kotlin/transformers/ReportUndocumentedTransformerTest.kt136
-rw-r--r--plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt14
-rw-r--r--plugins/base/src/test/kotlin/utils/ModelUtils.kt4
31 files changed, 237 insertions, 239 deletions
diff --git a/plugins/base/src/test/kotlin/basic/DRITest.kt b/plugins/base/src/test/kotlin/basic/DRITest.kt
index 1f4c7d93..559a2dbf 100644
--- a/plugins/base/src/test/kotlin/basic/DRITest.kt
+++ b/plugins/base/src/test/kotlin/basic/DRITest.kt
@@ -5,19 +5,19 @@ import org.jetbrains.dokka.links.Callable
import org.jetbrains.dokka.links.Nullable
import org.jetbrains.dokka.links.TypeConstructor
import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.pages.*
-import org.jetbrains.dokka.pages.dfs
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.jetbrains.dokka.pages.ClasslikePageNode
+import org.jetbrains.dokka.pages.ContentPage
+import org.jetbrains.dokka.pages.MemberPageNode
import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
-
+import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
class DRITest : AbstractCoreTest() {
@Test
fun issue634() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -52,8 +52,8 @@ class DRITest : AbstractCoreTest() {
@Test
fun issue634WithImmediateNullableSelf() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -82,8 +82,8 @@ class DRITest : AbstractCoreTest() {
@Test
fun issue634WithGenericNullableReceiver() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -112,8 +112,8 @@ class DRITest : AbstractCoreTest() {
@Test
fun issue642WithStarAndAny() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
analysisPlatform = "js"
sourceRoots = listOf("src/")
}
@@ -171,8 +171,8 @@ class DRITest : AbstractCoreTest() {
@Test
fun driForGenericClass(){
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -201,8 +201,8 @@ class DRITest : AbstractCoreTest() {
@Test
fun driForGenericFunction(){
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
classpath = listOfNotNull(jvmStdlibPath)
}
@@ -243,8 +243,8 @@ class DRITest : AbstractCoreTest() {
@Test
fun driForFunctionNestedInsideInnerClass() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
classpath = listOfNotNull(jvmStdlibPath)
}
@@ -280,8 +280,8 @@ class DRITest : AbstractCoreTest() {
@Test
fun driForGenericExtensionFunction(){
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
diff --git a/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt b/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt
index 5cc17bf3..bceb79ae 100644
--- a/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt
+++ b/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt
@@ -11,8 +11,8 @@ class DokkaBasicTests : AbstractCoreTest() {
@Test
fun basic1() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
}
}
@@ -39,4 +39,4 @@ class DokkaBasicTests : AbstractCoreTest() {
private fun ModulePageNode.getClasslikeToMemberMap() =
this.parentMap.filterValues { it is ClasslikePageNode }.entries.groupBy({ it.value }) { it.key }
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt b/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt
index d548b75b..9d2c5825 100644
--- a/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt
+++ b/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt
@@ -14,8 +14,8 @@ class FailOnWarningTest : AbstractCoreTest() {
fun `throws exception if one or more warnings were emitted`() {
val configuration = dokkaConfiguration {
failOnWarning = true
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin")
}
}
@@ -39,8 +39,8 @@ class FailOnWarningTest : AbstractCoreTest() {
fun `throws exception if one or more error were emitted`() {
val configuration = dokkaConfiguration {
failOnWarning = true
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin")
}
}
@@ -66,8 +66,8 @@ class FailOnWarningTest : AbstractCoreTest() {
val configuration = dokkaConfiguration {
failOnWarning = true
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin")
}
}
@@ -88,8 +88,8 @@ class FailOnWarningTest : AbstractCoreTest() {
fun `does not throw if disabled`() {
val configuration = dokkaConfiguration {
failOnWarning = false
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin")
}
}
@@ -115,4 +115,4 @@ private class ZeroErrorOrWarningCountDokkaLogger(
) : DokkaLogger by logger {
override var warningsCount: Int = 0
override var errorsCount: Int = 0
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
index 7add4119..bf78b847 100644
--- a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
+++ b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
@@ -14,8 +14,8 @@ class ContentForAnnotationsTest : AbstractCoreTest() {
private val testConfiguration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
analysisPlatform = "jvm"
}
@@ -218,4 +218,4 @@ class ContentForAnnotationsTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt b/plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt
index 99ec25c5..69de1bcd 100644
--- a/plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt
+++ b/plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt
@@ -3,19 +3,17 @@ package content.annotations
import matchers.content.*
import org.jetbrains.dokka.pages.ContentPage
-import org.jetbrains.dokka.pages.PackagePageNode
import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
import org.junit.jupiter.api.Test
import utils.ParamAttributes
import utils.bareSignature
-import utils.propertySignature
class DepredatedAndSinceKotlinTest : AbstractCoreTest() {
private val testConfiguration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
analysisPlatform = "jvm"
}
@@ -102,4 +100,4 @@ class DepredatedAndSinceKotlinTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt b/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt
index f6e80891..a9689bc5 100644
--- a/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt
+++ b/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt
@@ -17,8 +17,8 @@ import utils.*
class ContentForParamsTest : AbstractCoreTest() {
private val testConfiguration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
analysisPlatform = "jvm"
}
diff --git a/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt b/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt
index 696c3032..24970660 100644
--- a/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt
+++ b/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt
@@ -11,8 +11,8 @@ import utils.unnamedTag
class ContentForSeeAlsoTest : AbstractCoreTest() {
private val testConfiguration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
analysisPlatform = "jvm"
}
@@ -456,4 +456,4 @@ class ContentForSeeAlsoTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt b/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt
index 6cb8b0f4..cabe822d 100644
--- a/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt
+++ b/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt
@@ -14,8 +14,8 @@ import utils.typealiasSignature
class ContentForSignaturesTest : AbstractCoreTest() {
private val testConfiguration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
analysisPlatform = "jvm"
includeNonPublic = true
diff --git a/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt b/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
index d203025b..c2fbd26f 100644
--- a/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
+++ b/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
@@ -8,8 +8,8 @@ import utils.functionSignature
class ConstructorsSignaturesTest : AbstractCoreTest() {
private val testConfiguration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
analysisPlatform = "jvm"
}
@@ -190,4 +190,4 @@ class ConstructorsSignaturesTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/enums/EnumsTest.kt b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
index be910b5c..6a973f8e 100644
--- a/plugins/base/src/test/kotlin/enums/EnumsTest.kt
+++ b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
@@ -14,8 +14,8 @@ class EnumsTest : AbstractCoreTest() {
@Test
fun basicEnum() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -45,8 +45,8 @@ class EnumsTest : AbstractCoreTest() {
@Test
fun enumWithCompanion() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -90,8 +90,8 @@ class EnumsTest : AbstractCoreTest() {
@Test
fun enumWithConstructor() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -136,8 +136,8 @@ class EnumsTest : AbstractCoreTest() {
@Test
fun enumWithMethods() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -179,8 +179,8 @@ class EnumsTest : AbstractCoreTest() {
@Test
fun enumWithAnnotationsOnEntries(){
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
diff --git a/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt b/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt
index 3b69a54e..4dfdc410 100644
--- a/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt
+++ b/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt
@@ -15,8 +15,8 @@ abstract class AbstractExpectTest(
protected fun generateOutput(path: Path, outFormat: String): Path? {
val config = dokkaConfiguration {
format = outFormat
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf(path.toAbsolutePath().asString())
}
}
@@ -101,4 +101,4 @@ abstract class AbstractExpectTest(
ret?.let { Files.list(it).forEach { f -> f.copyRecursively(out.resolve(f.fileName)) } }
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt b/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt
index c15e53e8..c8b9f2d4 100644
--- a/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt
+++ b/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt
@@ -9,8 +9,8 @@ class DeprecationFilterTest : AbstractCoreTest() {
@Test
fun `function with false global skipDeprecated`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
skipDeprecated = false
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
}
@@ -39,8 +39,8 @@ class DeprecationFilterTest : AbstractCoreTest() {
@Test
fun `deprecated function with false global skipDeprecated`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
skipDeprecated = false
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
}
@@ -69,8 +69,8 @@ class DeprecationFilterTest : AbstractCoreTest() {
@Test
fun `deprecated function with true global skipDeprecated`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
skipDeprecated = true
}
@@ -99,8 +99,8 @@ class DeprecationFilterTest : AbstractCoreTest() {
@Test
fun `deprecated function with false global true package skipDeprecated`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
skipDeprecated = false
perPackageOptions = mutableListOf(
@@ -136,8 +136,8 @@ class DeprecationFilterTest : AbstractCoreTest() {
@Test
fun `deprecated function with true global false package skipDeprecated`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
skipDeprecated = true
perPackageOptions = mutableListOf(
@@ -170,4 +170,4 @@ class DeprecationFilterTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt b/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt
index 7d96541b..e5b9e9c2 100644
--- a/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt
+++ b/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt
@@ -1,6 +1,5 @@
package filter
-import org.jetbrains.dokka.PackageOptionsImpl
import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
@@ -9,8 +8,8 @@ class EmptyPackagesFilterTest : AbstractCoreTest() {
@Test
fun `empty package with false skipEmptyPackages`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
skipEmptyPackages = false
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
}
@@ -37,8 +36,8 @@ class EmptyPackagesFilterTest : AbstractCoreTest() {
@Test
fun `empty package with true skipEmptyPackages`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
skipEmptyPackages = true
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
}
@@ -61,4 +60,4 @@ class EmptyPackagesFilterTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt b/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt
index 5e8e33dc..192de449 100644
--- a/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt
+++ b/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt
@@ -9,8 +9,8 @@ class VisibilityFilterTest : AbstractCoreTest() {
@Test
fun `public function with false global includeNonPublic`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
includeNonPublic = false
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
}
@@ -39,8 +39,8 @@ class VisibilityFilterTest : AbstractCoreTest() {
@Test
fun `private function with false global includeNonPublic`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
includeNonPublic = false
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
}
@@ -69,8 +69,8 @@ class VisibilityFilterTest : AbstractCoreTest() {
@Test
fun `private function with true global includeNonPublic`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
includeNonPublic = true
}
@@ -99,8 +99,8 @@ class VisibilityFilterTest : AbstractCoreTest() {
@Test
fun `private function with false global true package includeNonPublic`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
includeNonPublic = false
perPackageOptions = mutableListOf(
@@ -136,8 +136,8 @@ class VisibilityFilterTest : AbstractCoreTest() {
@Test
fun `private function with true global false package includeNonPublic`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
includeNonPublic = true
perPackageOptions = mutableListOf(
@@ -170,4 +170,4 @@ class VisibilityFilterTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/issues/IssuesTest.kt b/plugins/base/src/test/kotlin/issues/IssuesTest.kt
index f67229b7..7b065349 100644
--- a/plugins/base/src/test/kotlin/issues/IssuesTest.kt
+++ b/plugins/base/src/test/kotlin/issues/IssuesTest.kt
@@ -34,8 +34,8 @@ class IssuesTest : AbstractModelTest("/src/main/kotlin/issues/Test.kt", "issues"
|}
""",
configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
classpath = listOfNotNull(jvmStdlibPath)
}
@@ -70,4 +70,4 @@ class IssuesTest : AbstractModelTest("/src/main/kotlin/issues/Test.kt", "issues"
// }
// }
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
index 191df066..2775fcf4 100644
--- a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
+++ b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
@@ -23,23 +23,23 @@ class LinkableContentTest : AbstractCoreTest() {
val includesDir = getTestDataDir("linkable/includes").toAbsolutePath()
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
moduleName = "example"
analysisPlatform = "js"
sourceRoots = listOf("jsMain", "commonMain", "jvmAndJsSecondCommonMain").map {
Paths.get("$testDataDir/$it/kotlin").toString()
}
- sourceSetID = "js"
+ name = "js"
includes = listOf(Paths.get("$includesDir/include2.md").toString())
}
- pass {
+ sourceSet {
moduleName = "example"
analysisPlatform = "jvm"
sourceRoots = listOf("jvmMain", "commonMain", "jvmAndJsSecondCommonMain").map {
Paths.get("$testDataDir/$it/kotlin").toString()
}
- sourceSetID = "jvm"
+ name = "jvm"
includes = listOf(Paths.get("$includesDir/include1.md").toString())
}
}
@@ -62,8 +62,8 @@ class LinkableContentTest : AbstractCoreTest() {
val testDataDir = getTestDataDir("linkable/sources").toAbsolutePath()
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
moduleName = "example"
analysisPlatform = "js"
sourceRoots = listOf("$testDataDir/jsMain/kotlin")
@@ -74,9 +74,9 @@ class LinkableContentTest : AbstractCoreTest() {
lineSuffix = "#L"
)
)
- sourceSetID = "js"
+ name = "js"
}
- pass {
+ sourceSet {
moduleName = "example"
analysisPlatform = "jvm"
sourceRoots = listOf("$testDataDir/jvmMain/kotlin")
@@ -87,7 +87,7 @@ class LinkableContentTest : AbstractCoreTest() {
lineSuffix = "#L"
)
)
- sourceSetID = "jvm"
+ name = "jvm"
}
}
}
@@ -127,19 +127,19 @@ class LinkableContentTest : AbstractCoreTest() {
val testDataDir = getTestDataDir("linkable/samples").toAbsolutePath()
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
moduleName = "example"
analysisPlatform = "js"
sourceRoots = listOf("$testDataDir/jsMain/kotlin")
- sourceSetID = "js"
+ name = "js"
samples = listOf("$testDataDir/jsMain/resources/Samples.kt")
}
- pass {
+ sourceSet {
moduleName = "example"
analysisPlatform = "jvm"
sourceRoots = listOf("$testDataDir/jvmMain/kotlin")
- sourceSetID = "jvm"
+ name = "jvm"
samples = listOf("$testDataDir/jvmMain/resources/Samples.kt")
}
}
@@ -196,11 +196,11 @@ class LinkableContentTest : AbstractCoreTest() {
|
""".trimIndent(),
dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
analysisPlatform = "jvm"
- sourceSetID = "js"
+ name = "js"
}
}
}
@@ -222,4 +222,4 @@ class LinkableContentTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/locationProvider/DefaultLocationProviderTest.kt b/plugins/base/src/test/kotlin/locationProvider/DefaultLocationProviderTest.kt
index 1bc3ea29..a219fb04 100644
--- a/plugins/base/src/test/kotlin/locationProvider/DefaultLocationProviderTest.kt
+++ b/plugins/base/src/test/kotlin/locationProvider/DefaultLocationProviderTest.kt
@@ -10,8 +10,8 @@ class DefaultLocationProviderTest: AbstractCoreTest() {
@Test
fun `#644 same directory for module and package`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
}
}
@@ -38,4 +38,4 @@ class DefaultLocationProviderTest: AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/markdown/KDocTest.kt b/plugins/base/src/test/kotlin/markdown/KDocTest.kt
index 218f7244..f5b29322 100644
--- a/plugins/base/src/test/kotlin/markdown/KDocTest.kt
+++ b/plugins/base/src/test/kotlin/markdown/KDocTest.kt
@@ -9,8 +9,8 @@ import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
abstract class KDocTest : AbstractCoreTest() {
private val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/example/Test.kt")
}
}
@@ -44,4 +44,4 @@ abstract class KDocTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/markdown/LinkTest.kt b/plugins/base/src/test/kotlin/markdown/LinkTest.kt
index ddcef5db..8e4e588e 100644
--- a/plugins/base/src/test/kotlin/markdown/LinkTest.kt
+++ b/plugins/base/src/test/kotlin/markdown/LinkTest.kt
@@ -13,8 +13,8 @@ class LinkTest : AbstractCoreTest() {
@Test
fun linkToClassLoader() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/parser")
}
}
@@ -46,8 +46,8 @@ class LinkTest : AbstractCoreTest() {
@Test
fun returnTypeShouldHaveLinkToOuterClassFromInner() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin")
}
}
@@ -75,4 +75,4 @@ class LinkTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/model/InheritorsTest.kt b/plugins/base/src/test/kotlin/model/InheritorsTest.kt
index f5517abb..503cf50c 100644
--- a/plugins/base/src/test/kotlin/model/InheritorsTest.kt
+++ b/plugins/base/src/test/kotlin/model/InheritorsTest.kt
@@ -44,12 +44,12 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt",
@Test
fun multiplatform() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("common/src/", "jvm/src/")
analysisPlatform = "jvm"
}
- pass {
+ sourceSet {
sourceRoots = listOf("common/src/", "js/src/")
analysisPlatform = "js"
}
@@ -92,4 +92,4 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt",
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/model/PropertyTest.kt b/plugins/base/src/test/kotlin/model/PropertyTest.kt
index e384b920..af952b43 100644
--- a/plugins/base/src/test/kotlin/model/PropertyTest.kt
+++ b/plugins/base/src/test/kotlin/model/PropertyTest.kt
@@ -169,8 +169,8 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
|@Strictfp var property = "test"
""",
configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
classpath = listOfNotNull(jvmStdlibPath)
}
@@ -262,4 +262,4 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
// }
//
//}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt b/plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt
index 5facd194..b3ac7b07 100644
--- a/plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt
+++ b/plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt
@@ -11,8 +11,8 @@ class BasicMultiplatformTest : AbstractCoreTest() {
val testDataDir = getTestDataDir("multiplatform/basicMultiplatformTest").toAbsolutePath()
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("$testDataDir/jvmMain/")
}
}
@@ -28,8 +28,8 @@ class BasicMultiplatformTest : AbstractCoreTest() {
@Test
fun inlineTestExample() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/multiplatform/Test.kt")
}
}
@@ -51,4 +51,4 @@ class BasicMultiplatformTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt b/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
index 6ef38aa9..935b9377 100644
--- a/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
+++ b/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
@@ -39,8 +39,8 @@ class PageNodeMergerTest : AbstractCoreTest() {
fun sameNameStrategyTest() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/pageMerger/Test.kt")
}
}
@@ -82,8 +82,8 @@ class PageNodeMergerTest : AbstractCoreTest() {
val strList: MutableList<String> = mutableListOf()
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/pageMerger/Test.kt")
}
}
@@ -123,4 +123,4 @@ class PageNodeMergerTest : AbstractCoreTest() {
fun PageNode.childrenRec(): List<PageNode> = listOf(this) + children.flatMap { it.childrenRec() }
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt b/plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt
index 6ceb805b..d4778a8e 100644
--- a/plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt
+++ b/plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt
@@ -12,14 +12,14 @@ class DivergentTest : RenderingOnlyTestBase() {
private val js = defaultSourceSet.copy(
"root",
"JS",
- "js",
+ defaultSourceSet.sourceSetID.copy(sourceSetName = "js"),
analysisPlatform = Platform.js,
sourceRoots = listOf(SourceRootImpl("pl1"))
)
private val jvm = defaultSourceSet.copy(
"root",
"JVM",
- "jvm",
+ defaultSourceSet.sourceSetID.copy(sourceSetName = "jvm"),
analysisPlatform = Platform.jvm,
sourceRoots = listOf(SourceRootImpl("pl1"))
@@ -27,7 +27,7 @@ class DivergentTest : RenderingOnlyTestBase() {
private val native = defaultSourceSet.copy(
"root",
"NATIVE",
- "native",
+ defaultSourceSet.sourceSetID.copy(sourceSetName = "native"),
analysisPlatform = Platform.native,
sourceRoots = listOf(SourceRootImpl("pl1"))
)
@@ -344,4 +344,4 @@ class DivergentTest : RenderingOnlyTestBase() {
Div(Div("b-", Span()), Div(Div(Div(("b")))), "ab+")
)
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt b/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt
index c868cfd5..ea1ea9ae 100644
--- a/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt
+++ b/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt
@@ -15,21 +15,21 @@ class SourceSetDependentHintTest : RenderingOnlyTestBase() {
private val pl1 = defaultSourceSet.copy(
"root",
"pl1",
- "pl1",
+ defaultSourceSet.sourceSetID.copy(sourceSetName = "pl1"),
analysisPlatform = Platform.js,
sourceRoots = listOf(SourceRootImpl("pl1"))
)
private val pl2 = defaultSourceSet.copy(
"root",
"pl2",
- "pl2",
+ defaultSourceSet.sourceSetID.copy(sourceSetName = "pl2"),
analysisPlatform = Platform.jvm,
sourceRoots = listOf(SourceRootImpl("pl1"))
)
private val pl3 = defaultSourceSet.copy(
"root",
"pl3",
- "pl3",
+ defaultSourceSet.sourceSetID.copy(sourceSetName = "pl3"),
analysisPlatform = Platform.native,
sourceRoots = listOf(SourceRootImpl("pl1"))
)
@@ -135,4 +135,4 @@ class SourceSetDependentHintTest : RenderingOnlyTestBase() {
HtmlRenderer(context).render(page)
renderedContent.match(Div(Div(Div("a")), Div(Div("b"))))
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/renderers/html/defaultSourceSet.kt b/plugins/base/src/test/kotlin/renderers/html/defaultSourceSet.kt
index 771cabaa..a9be1cfd 100644
--- a/plugins/base/src/test/kotlin/renderers/html/defaultSourceSet.kt
+++ b/plugins/base/src/test/kotlin/renderers/html/defaultSourceSet.kt
@@ -1,15 +1,16 @@
package renderers.html
+import org.jetbrains.dokka.DokkaSourceSetID
import org.jetbrains.dokka.DokkaSourceSetImpl
import org.jetbrains.dokka.Platform
internal val defaultSourceSet = DokkaSourceSetImpl(
- moduleName = "DEFAULT",
+ moduleDisplayName = "DEFAULT",
displayName = "DEFAULT",
- sourceSetID = "DEFAULT",
+ sourceSetID = DokkaSourceSetID("DEFAULT", "DEFAULT"),
classpath = emptyList(),
sourceRoots = emptyList(),
- dependentSourceSets = emptyList(),
+ dependentSourceSets = emptySet(),
samples = emptyList(),
includes = emptyList(),
includeNonPublic = false,
@@ -27,4 +28,4 @@ internal val defaultSourceSet = DokkaSourceSetImpl(
noJdkLink = false,
suppressedFiles = emptyList(),
analysisPlatform = Platform.DEFAULT
-) \ No newline at end of file
+)
diff --git a/plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt b/plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt
index be87813b..4f8a834b 100644
--- a/plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt
+++ b/plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt
@@ -26,8 +26,8 @@ class ResourceLinksTest : AbstractCoreTest() {
@Test
fun resourceLinksTest() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/test/Test.kt")
}
}
@@ -68,4 +68,4 @@ class ResourceLinksTest : AbstractCoreTest() {
}
}
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/transformerBuilders/PageTransformerBuilderTest.kt b/plugins/base/src/test/kotlin/transformerBuilders/PageTransformerBuilderTest.kt
index e66490c1..d8e057da 100644
--- a/plugins/base/src/test/kotlin/transformerBuilders/PageTransformerBuilderTest.kt
+++ b/plugins/base/src/test/kotlin/transformerBuilders/PageTransformerBuilderTest.kt
@@ -21,8 +21,8 @@ class PageTransformerBuilderTest : AbstractCoreTest() {
@Test
fun scannerTest() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/transformerBuilder/Test.kt")
}
}
@@ -58,8 +58,8 @@ class PageTransformerBuilderTest : AbstractCoreTest() {
@Test
fun mapperTest() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/transformerBuilder/Test.kt")
}
}
@@ -98,8 +98,8 @@ class PageTransformerBuilderTest : AbstractCoreTest() {
@Test
fun structureTransformerTest() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/kotlin/transformerBuilder/Test.kt")
}
}
diff --git a/plugins/base/src/test/kotlin/transformers/ReportUndocumentedTransformerTest.kt b/plugins/base/src/test/kotlin/transformers/ReportUndocumentedTransformerTest.kt
index 523813fc..72948372 100644
--- a/plugins/base/src/test/kotlin/transformers/ReportUndocumentedTransformerTest.kt
+++ b/plugins/base/src/test/kotlin/transformers/ReportUndocumentedTransformerTest.kt
@@ -12,8 +12,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `undocumented class gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -39,8 +39,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `undocumented non-public class does not get reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -65,8 +65,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `undocumented function gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -95,8 +95,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `undocumented property gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -125,8 +125,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `undocumented primary constructor does not get reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -153,8 +153,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `data class component functions do not get reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin")
}
@@ -183,8 +183,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `undocumented secondary constructor gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -213,8 +213,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `undocumented inherited function does not get reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -246,8 +246,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `undocumented inherited property does not get reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -279,8 +279,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `overridden function does not get reported when super is documented`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -315,8 +315,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `overridden property does not get reported when super is documented`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -349,10 +349,10 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
}
@Test
- fun `report disabled by pass configuration`() {
+ fun `report disabled by source set`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = false
sourceRoots = listOf("src/main/kotlin/Test.kt")
}
@@ -377,8 +377,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `report enabled by package configuration`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
perPackageOptions += packageOptions(
prefix = "sample",
reportUndocumented = true,
@@ -407,8 +407,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `report enabled by more specific package configuration`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
perPackageOptions += packageOptions(
prefix = "sample",
reportUndocumented = false,
@@ -445,8 +445,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `report disabled by more specific package configuration`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
perPackageOptions += packageOptions(
prefix = "sample",
reportUndocumented = true,
@@ -483,22 +483,22 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `multiplatform undocumented class gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ val commonMain = sourceSet {
reportUndocumented = true
analysisPlatform = Platform.common.toString()
- sourceSetID = "commonMain"
+ name = "commonMain"
displayName = "commonMain"
sourceRoots = listOf("src/commonMain/kotlin")
}
- pass {
+ sourceSet {
reportUndocumented = true
analysisPlatform = Platform.jvm.toString()
- sourceSetID = "jvmMain"
+ name = "jvmMain"
displayName = "jvmMain"
sourceRoots = listOf("src/jvmMain/kotlin")
- dependentSourceSets = listOf("commonMain")
+ dependentSourceSets = setOf(commonMain.sourceSetID)
}
}
}
@@ -526,22 +526,22 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `multiplatform undocumented class does not get reported if expect is documented`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ val commonMain = sourceSet {
reportUndocumented = true
analysisPlatform = Platform.common.toString()
- sourceSetID = "commonMain"
+ name = "commonMain"
displayName = "commonMain"
sourceRoots = listOf("src/commonMain/kotlin")
}
- pass {
+ sourceSet {
reportUndocumented = true
analysisPlatform = Platform.jvm.toString()
- sourceSetID = "jvmMain"
+ name = "jvmMain"
displayName = "jvmMain"
sourceRoots = listOf("src/jvmMain/kotlin")
- dependentSourceSets = listOf("commonMain")
+ dependentSourceSets = setOf(commonMain.sourceSetID)
}
}
}
@@ -568,31 +568,31 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `multiplatform undocumented function gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ val commonMain = sourceSet {
reportUndocumented = true
analysisPlatform = Platform.common.toString()
- sourceSetID = "commonMain"
+ name = "commonMain"
displayName = "commonMain"
sourceRoots = listOf("src/commonMain/kotlin")
}
- pass {
+ sourceSet {
reportUndocumented = true
analysisPlatform = Platform.jvm.toString()
- sourceSetID = "jvmMain"
+ name = "jvmMain"
displayName = "jvmMain"
sourceRoots = listOf("src/jvmMain/kotlin")
- dependentSourceSets = listOf("commonMain")
+ dependentSourceSets = setOf(commonMain.sourceSetID)
}
- pass {
+ sourceSet {
reportUndocumented = true
analysisPlatform = Platform.native.toString()
- sourceSetID = "macosMain"
+ name = "macosMain"
displayName = "macosMain"
sourceRoots = listOf("src/macosMain/kotlin")
- dependentSourceSets = listOf("commonMain")
+ dependentSourceSets = setOf(commonMain.sourceSetID)
}
}
}
@@ -625,8 +625,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `java undocumented class gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/java")
}
@@ -652,8 +652,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `java undocumented non-public class does not get reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/java")
}
@@ -677,8 +677,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `java undocumented constructor does not get reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/java")
}
@@ -706,8 +706,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `java undocumented method gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/java")
}
@@ -736,8 +736,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `java undocumented property gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/java")
}
@@ -766,8 +766,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `java undocumented inherited method gets reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/java")
}
@@ -805,8 +805,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `java documented inherited method does not get reported`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/java")
}
@@ -842,8 +842,8 @@ class ReportUndocumentedTransformerTest : AbstractCoreTest() {
@Test
fun `java overridden function does not get reported when super is documented`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
reportUndocumented = true
sourceRoots = listOf("src/main/java")
}
diff --git a/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt b/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt
index 5f8a7864..95fbb3c6 100644
--- a/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt
+++ b/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt
@@ -12,8 +12,8 @@ class DefaultPsiToDocumentableTranslatorTest : AbstractCoreTest() {
@Test
fun `method overriding two documented classes picks closest class documentation`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/java")
}
}
@@ -57,8 +57,8 @@ class DefaultPsiToDocumentableTranslatorTest : AbstractCoreTest() {
@Test
fun `method overriding class and interface picks class documentation`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/java")
}
}
@@ -102,8 +102,8 @@ class DefaultPsiToDocumentableTranslatorTest : AbstractCoreTest() {
@Test
fun `method overriding two classes picks closest documented class documentation`() {
val configuration = dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/main/java")
}
}
@@ -153,4 +153,4 @@ class DefaultPsiToDocumentableTranslatorTest : AbstractCoreTest() {
?.body.orEmpty()
}
-} \ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/utils/ModelUtils.kt b/plugins/base/src/test/kotlin/utils/ModelUtils.kt
index 9697a843..87a9c802 100644
--- a/plugins/base/src/test/kotlin/utils/ModelUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/ModelUtils.kt
@@ -16,8 +16,8 @@ abstract class AbstractModelTest(val path: String? = null, val pkg: String) : Mo
block: DModule.() -> Unit
) {
val testConfiguration = configuration ?: dokkaConfiguration {
- passes {
- pass {
+ sourceSets {
+ sourceSet {
sourceRoots = listOf("src/")
analysisPlatform = platform
}