diff options
Diffstat (limited to 'plugins/base/src/test/kotlin/model')
4 files changed, 18 insertions, 20 deletions
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt index ee109ba1..a349e54a 100644 --- a/plugins/base/src/test/kotlin/model/ClassesTest.kt +++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt @@ -1,9 +1,7 @@ package model -import org.jetbrains.dokka.Platform import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.KotlinModifier.* -import org.jetbrains.dokka.pages.PlatformData import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.Test import utils.AbstractModelTest @@ -169,7 +167,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class ) { with((this / "classes" / "Klass").cast<DClass>()) { name equals "Klass" - modifier.allValues.forEach { it equals Sealed } + modifier.values.forEach { it equals Sealed } } } } @@ -211,15 +209,15 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class val D = (this / "classes" / "D").cast<DClass>() with(C) { - modifier.allValues.forEach { it equals Open } + modifier.values.forEach { it equals Open } with((this / "f").cast<DFunction>()) { - modifier.allValues.forEach { it equals Open } + modifier.values.forEach { it equals Open } } } with(D) { - modifier.allValues.forEach { it equals Final } + modifier.values.forEach { it equals Final } with((this / "f").cast<DFunction>()) { - modifier.allValues.forEach { it equals Open } + modifier.values.forEach { it equals Open } } D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri } @@ -246,16 +244,16 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class val E = (this / "classes" / "E").cast<DClass>() with(C) { - modifier.allValues.forEach { it equals Abstract } - ((this / "foo").cast<DFunction>()).modifier.allValues.forEach { it equals Abstract } + modifier.values.forEach { it equals Abstract } + ((this / "foo").cast<DFunction>()).modifier.values.forEach { it equals Abstract } } with(D) { - modifier.allValues.forEach { it equals Abstract } + modifier.values.forEach { it equals Abstract } } with(E) { - modifier.allValues.forEach { it equals Final } + modifier.values.forEach { it equals Final } } D.supers.firstOrNull() equals C.dri diff --git a/plugins/base/src/test/kotlin/model/InheritorsTest.kt b/plugins/base/src/test/kotlin/model/InheritorsTest.kt index ee445b5d..ce8a87ca 100644 --- a/plugins/base/src/test/kotlin/model/InheritorsTest.kt +++ b/plugins/base/src/test/kotlin/model/InheritorsTest.kt @@ -30,8 +30,8 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt", pluginsOverrides = listOf(InheritorsPlugin) ) { with((this / "inheritors" / "A").cast<DInterface>()) { - val map = extra[InheritorsInfo].assertNotNull("InheritorsInfo").value.map - with(map.keys.also { it counts 1 }.find { it.platformType == Platform.jvm }.assertNotNull("jvm key").let { map[it]!! } + val map = extra[InheritorsInfo].assertNotNull("InheritorsInfo").value + with(map.keys.also { it counts 1 }.find { it.platform == Platform.jvm }.assertNotNull("jvm key").let { map[it]!! } ) { this counts 1 first().classNames equals "B" @@ -77,13 +77,13 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt", ) { documentablesTransformationStage = { m -> with((m / "inheritors" / "A").cast<DInterface>()) { - val map = extra[InheritorsInfo].assertNotNull("InheritorsInfo").value.map + val map = extra[InheritorsInfo].assertNotNull("InheritorsInfo").value with(map.keys.also { it counts 2 }) { - with(find { it.platformType == Platform.jvm }.assertNotNull("jvm key").let { map[it]!! }) { + with(find { it.platform == Platform.jvm }.assertNotNull("jvm key").let { map[it]!! }) { this counts 1 first().classNames equals "B" } - with(find { it.platformType == Platform.js }.assertNotNull("js key").let { map[it]!! }) { + with(find { it.platform == Platform.js }.assertNotNull("js key").let { map[it]!! }) { this counts 2 val classes = listOf("B", "C") assertTrue(all { classes.contains(it.classNames) }, "One of subclasses missing in js" ) diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt index 20543c8f..a58b380c 100644 --- a/plugins/base/src/test/kotlin/model/JavaTest.kt +++ b/plugins/base/src/test/kotlin/model/JavaTest.kt @@ -112,7 +112,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") { with((this / "java" / "Foo").cast<DClass>()) { val sups = listOf("Exception", "Cloneable") assertTrue( - sups.all { s -> supertypes.map.values.flatten().any { it.classNames == s } }) + sups.all { s -> supertypes.values.flatten().any { it.classNames == s } }) "Foo must extend ${sups.joinToString(", ")}" } } @@ -410,7 +410,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") { val dri = (this / "Bar").assertNotNull("Foo dri").dri with((this / "Foo").cast<DClass>()) { with(extra[InheritorsInfo].assertNotNull("InheritorsInfo")) { - with(value.map.values.flatten().distinct()) { + with(value.values.flatten().distinct()) { this counts 1 first() equals dri } diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt index 11d456ce..676f034a 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 ) { - with((this / "[jvm root]").cast<DPackage>()) { - name equals "[jvm root]" + with((this / "[main root]").cast<DPackage>()) { + name equals "[main root]" children counts 0 } } |