diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2020-03-16 14:33:38 +0100 |
|---|---|---|
| committer | Kamil Doległo <kamilok1965@users.noreply.github.com> | 2020-03-16 14:35:12 +0100 |
| commit | 996feefe717ac623daabaadda71b5b9d2bbe1cf1 (patch) | |
| tree | fca8d99c2cf4f9dcc64159b4e1ebe5644f2bd81b /plugins/base/src/test/kotlin/utils | |
| parent | cd38992a28a8b16cd91661f05829610d1373e47c (diff) | |
| download | dokka-996feefe717ac623daabaadda71b5b9d2bbe1cf1.tar.gz dokka-996feefe717ac623daabaadda71b5b9d2bbe1cf1.tar.bz2 dokka-996feefe717ac623daabaadda71b5b9d2bbe1cf1.zip | |
Rename Documentables to avoid name conflicts
Diffstat (limited to 'plugins/base/src/test/kotlin/utils')
| -rw-r--r-- | plugins/base/src/test/kotlin/utils/ModelUtils.kt | 6 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/utils/TestUtils.kt | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/plugins/base/src/test/kotlin/utils/ModelUtils.kt b/plugins/base/src/test/kotlin/utils/ModelUtils.kt index 75c8e008..1e6f64c6 100644 --- a/plugins/base/src/test/kotlin/utils/ModelUtils.kt +++ b/plugins/base/src/test/kotlin/utils/ModelUtils.kt @@ -1,8 +1,6 @@ package utils -import org.jetbrains.dokka.model.Module -import org.jetbrains.dokka.model.doc.DocumentationNode -import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest +import org.jetbrains.dokka.model.DModule abstract class AbstractModelTest(val path: String? = null, val pkg: String) : ModelDSL(), AssertDSL { @@ -11,7 +9,7 @@ abstract class AbstractModelTest(val path: String? = null, val pkg: String) : Mo platform: String = "jvm", targetList: List<String> = listOf("jvm"), prependPackage: Boolean = true, - block: Module.() -> Unit + block: DModule.() -> Unit ) { val configuration = dokkaConfiguration { passes { diff --git a/plugins/base/src/test/kotlin/utils/TestUtils.kt b/plugins/base/src/test/kotlin/utils/TestUtils.kt index 6913ba5b..bf86c1b1 100644 --- a/plugins/base/src/test/kotlin/utils/TestUtils.kt +++ b/plugins/base/src/test/kotlin/utils/TestUtils.kt @@ -1,13 +1,9 @@ package utils -import org.jetbrains.dokka.model.Class +import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.Documentable -import org.jetbrains.dokka.model.Function -import org.jetbrains.dokka.model.Property import org.jetbrains.dokka.model.doc.* import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest -import kotlin.reflect.KClass -import kotlin.reflect.full.safeCast @DslMarker annotation class TestDSL @@ -64,5 +60,5 @@ fun <T> T?.assertNotNull(name: String = ""): T = this ?: throw AssertionError("$ fun <T : Documentable> T?.docs() = this?.documentation.orEmpty().values.flatMap { it.children } -val Class.supers +val DClass.supers get() = supertypes.flatMap{it.component2()}
\ No newline at end of file |