diff options
Diffstat (limited to 'plugins/base/src/test/kotlin/model')
13 files changed, 32 insertions, 28 deletions
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt index e358945e..cf11c62f 100644 --- a/plugins/base/src/test/kotlin/model/ClassesTest.kt +++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt @@ -5,8 +5,8 @@ import org.jetbrains.dokka.links.TypeConstructor import org.jetbrains.dokka.links.sureClassNames import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.KotlinModifier.* -import org.junit.jupiter.api.Assertions.assertNull -import org.junit.jupiter.api.Test +import kotlin.test.assertNull +import kotlin.test.Test import utils.* diff --git a/plugins/base/src/test/kotlin/model/CommentTest.kt b/plugins/base/src/test/kotlin/model/CommentTest.kt index cd149209..1131e8dd 100644 --- a/plugins/base/src/test/kotlin/model/CommentTest.kt +++ b/plugins/base/src/test/kotlin/model/CommentTest.kt @@ -3,11 +3,11 @@ package model import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.DProperty import org.jetbrains.dokka.model.doc.* -import org.junit.jupiter.api.Test import utils.AbstractModelTest import utils.assertNotNull import utils.comments import utils.docs +import kotlin.test.Test class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comment") { diff --git a/plugins/base/src/test/kotlin/model/ExtensionsTest.kt b/plugins/base/src/test/kotlin/model/ExtensionsTest.kt index b54f8deb..f0f86d7f 100644 --- a/plugins/base/src/test/kotlin/model/ExtensionsTest.kt +++ b/plugins/base/src/test/kotlin/model/ExtensionsTest.kt @@ -6,8 +6,8 @@ import org.jetbrains.dokka.model.DFunction import org.jetbrains.dokka.model.DInterface import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.model.properties.WithExtraProperties -import org.junit.jupiter.api.Test import utils.AbstractModelTest +import kotlin.test.Test import utils.UsingJDK class ExtensionsTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "classes") { @@ -87,7 +87,7 @@ class ExtensionsTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "cl } } } - + @Test fun `should be extension for typealias`() { inlineModelTest( diff --git a/plugins/base/src/test/kotlin/model/FunctionsTest.kt b/plugins/base/src/test/kotlin/model/FunctionsTest.kt index 3410f9ef..d1c34c29 100644 --- a/plugins/base/src/test/kotlin/model/FunctionsTest.kt +++ b/plugins/base/src/test/kotlin/model/FunctionsTest.kt @@ -2,8 +2,12 @@ package model import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.model.* -import org.junit.jupiter.api.Test -import utils.* +import utils.AbstractModelTest +import utils.assertNotNull +import utils.comments +import utils.OnlyDescriptors +import utils.name +import kotlin.test.Test class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "function") { diff --git a/plugins/base/src/test/kotlin/model/InheritorsTest.kt b/plugins/base/src/test/kotlin/model/InheritorsTest.kt index 641f6ef5..8ebb65c2 100644 --- a/plugins/base/src/test/kotlin/model/InheritorsTest.kt +++ b/plugins/base/src/test/kotlin/model/InheritorsTest.kt @@ -7,10 +7,10 @@ import org.jetbrains.dokka.model.DFunction import org.jetbrains.dokka.model.DInterface import org.jetbrains.dokka.model.doc.P import org.jetbrains.dokka.model.doc.Text -import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Test import utils.AbstractModelTest import utils.assertNotNull +import kotlin.test.Test +import kotlin.test.assertTrue class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt", "inheritors") { diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt index a0605a5e..f8e45ca2 100644 --- a/plugins/base/src/test/kotlin/model/JavaTest.kt +++ b/plugins/base/src/test/kotlin/model/JavaTest.kt @@ -7,11 +7,14 @@ import org.jetbrains.dokka.links.* import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.doc.Param import org.jetbrains.dokka.model.doc.Text -import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Test -import utils.* +import utils.AbstractModelTest import utils.assertContains +import utils.assertNotNull +import utils.name +import utils.JavaCode +import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.test.assertTrue @JavaCode class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") { @@ -464,17 +467,17 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") { when (function.name) { "superBound" -> { assertTrue(variance is Contravariance<*>) - val bound = (variance as Contravariance<*>).inner + val bound = variance.inner assertEquals((bound as GenericTypeConstructor).dri.classNames, "String") } "extendsBound" -> { assertTrue(variance is Covariance<*>) - val bound = (variance as Covariance<*>).inner + val bound = variance.inner assertEquals((bound as GenericTypeConstructor).dri.classNames, "String") } "unbounded" -> { assertTrue(variance is Covariance<*>) - val bound = (variance as Covariance<*>).inner + val bound = variance.inner assertTrue(bound is JavaObject) } } diff --git a/plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt b/plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt index 6f08c89d..7b807b3a 100644 --- a/plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt +++ b/plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt @@ -7,10 +7,10 @@ import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.model.doc.* import org.jetbrains.dokka.model.withDescendants import org.jetbrains.dokka.utilities.firstIsInstanceOrNull -import org.junit.jupiter.api.Test import translators.documentationOf import utils.JavaCode import utils.docs +import kotlin.test.Test import kotlin.test.assertEquals @JavaCode diff --git a/plugins/base/src/test/kotlin/model/ObjectTest.kt b/plugins/base/src/test/kotlin/model/ObjectTest.kt index 86045110..2f307adb 100644 --- a/plugins/base/src/test/kotlin/model/ObjectTest.kt +++ b/plugins/base/src/test/kotlin/model/ObjectTest.kt @@ -3,8 +3,8 @@ package model import org.jetbrains.dokka.model.AdditionalModifiers import org.jetbrains.dokka.model.DObject import org.jetbrains.dokka.model.ExtraModifiers -import org.junit.jupiter.api.Test import utils.AbstractModelTest +import kotlin.test.Test class ObjectTest : AbstractModelTest("/src/main/kotlin/objects/Test.kt", "objects") { diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt index b9e7051d..33675356 100644 --- a/plugins/base/src/test/kotlin/model/PackagesTest.kt +++ b/plugins/base/src/test/kotlin/model/PackagesTest.kt @@ -1,8 +1,8 @@ package model import org.jetbrains.dokka.model.DPackage -import org.junit.jupiter.api.Test import utils.AbstractModelTest +import kotlin.test.Test class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "packages") { diff --git a/plugins/base/src/test/kotlin/model/PropertyTest.kt b/plugins/base/src/test/kotlin/model/PropertyTest.kt index d38667bf..8b15bc68 100644 --- a/plugins/base/src/test/kotlin/model/PropertyTest.kt +++ b/plugins/base/src/test/kotlin/model/PropertyTest.kt @@ -1,10 +1,10 @@ package model import org.jetbrains.dokka.model.* -import org.junit.jupiter.api.Test import utils.AbstractModelTest import utils.assertNotNull import utils.name +import kotlin.test.Test class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "property") { diff --git a/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt b/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt index 35997681..aa375423 100644 --- a/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt +++ b/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt @@ -4,8 +4,8 @@ import org.jetbrains.dokka.base.signatures.KotlinSignatureUtils.annotations import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.model.* import org.jetbrains.dokka.utilities.cast -import org.junit.jupiter.api.Test import utils.AbstractModelTest +import kotlin.test.Test import utils.JavaCode import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -175,4 +175,5 @@ class JavaAnnotationsForParametersTest : AbstractModelTest("/src/main/kotlin/jav } } } -}
\ No newline at end of file +} + diff --git a/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt b/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt index 0abf504e..ad5241ae 100644 --- a/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt +++ b/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt @@ -2,13 +2,9 @@ package model.annotations import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.* -import org.junit.jupiter.api.Test import translators.findClasslike +import kotlin.test.* import utils.JavaCode -import kotlin.test.assertEquals -import kotlin.test.assertFalse -import kotlin.test.assertNotNull -import kotlin.test.assertTrue @JavaCode class JavaAnnotationsTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/model/annotations/KotlinAnnotationsForParametersTest.kt b/plugins/base/src/test/kotlin/model/annotations/KotlinAnnotationsForParametersTest.kt index c459cc34..7a7591fb 100644 --- a/plugins/base/src/test/kotlin/model/annotations/KotlinAnnotationsForParametersTest.kt +++ b/plugins/base/src/test/kotlin/model/annotations/KotlinAnnotationsForParametersTest.kt @@ -4,8 +4,8 @@ import org.jetbrains.dokka.base.signatures.KotlinSignatureUtils.annotations import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.model.* import org.jetbrains.dokka.utilities.cast -import org.junit.jupiter.api.Test import utils.AbstractModelTest +import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -98,4 +98,4 @@ class KotlinAnnotationsForParametersTest : AbstractModelTest("/src/main/kotlin/a } } } -}
\ No newline at end of file +} |