From c63ea36637ce956029fb15b1482c0683ecb8a587 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Wed, 30 Aug 2023 15:58:46 +0200 Subject: Migrate to JUnit 5 and unify used test API (#3138) --- plugins/base/base-test-utils/build.gradle.kts | 8 ++-- plugins/base/build.gradle.kts | 11 ++--- .../AbortGracefullyOnMissingDocumentablesTest.kt | 2 +- plugins/base/src/test/kotlin/basic/DRITest.kt | 5 +- .../base/src/test/kotlin/basic/DokkaBasicTests.kt | 2 +- .../src/test/kotlin/basic/FailOnWarningTest.kt | 8 ++-- plugins/base/src/test/kotlin/basic/LoggerTest.kt | 4 +- .../kotlin/content/ContentInDescriptionTest.kt | 4 +- .../src/test/kotlin/content/HighlightingTest.kt | 2 +- .../annotations/ContentForAnnotationsTest.kt | 8 +++- .../content/annotations/JavaDeprecatedTest.kt | 7 +-- .../content/annotations/KotlinDeprecatedTest.kt | 5 +- .../kotlin/content/annotations/SinceKotlinTest.kt | 23 ++++------ .../content/exceptions/ContentForExceptions.kt | 7 ++- .../content/functions/ContentForBriefTest.kt | 6 +-- .../content/functions/ContentForConstructors.kt | 7 +-- .../content/inheritors/ContentForInheritorsTest.kt | 2 +- .../kotlin/content/params/ContentForParamsTest.kt | 8 ++-- .../ContentForClassWithParamsAndPropertiesTest.kt | 2 +- .../content/receiver/ContentForReceiverTest.kt | 4 +- .../content/samples/ContentForSamplesTest.kt | 9 ++-- .../content/seealso/ContentForSeeAlsoTest.kt | 4 +- .../signatures/ConstructorsSignaturesTest.kt | 2 +- .../content/signatures/ContentForSignaturesTest.kt | 2 +- .../kotlin/content/typealiases/TypealiasTest.kt | 7 +-- .../base/src/test/kotlin/enums/JavaEnumsTest.kt | 2 +- .../base/src/test/kotlin/enums/KotlinEnumsTest.kt | 6 ++- .../src/test/kotlin/expect/AbstractExpectTest.kt | 9 ++-- .../base/src/test/kotlin/expect/ExpectGenerator.kt | 8 ++-- plugins/base/src/test/kotlin/expect/ExpectTest.kt | 6 +-- .../test/kotlin/expectActuals/ExpectActualsTest.kt | 28 +++++++----- .../test/kotlin/filter/DeprecationFilterTest.kt | 18 ++++---- .../test/kotlin/filter/EmptyPackagesFilterTest.kt | 6 +-- .../src/test/kotlin/filter/JavaFileFilterTest.kt | 6 +-- .../test/kotlin/filter/JavaVisibilityFilterTest.kt | 5 +- .../filter/KotlinArrayDocumentableReplacerTest.kt | 31 +++++++------ .../src/test/kotlin/filter/VisibilityFilterTest.kt | 20 ++++---- plugins/base/src/test/kotlin/issues/IssuesTest.kt | 2 +- .../kotlin/linkableContent/LinkableContentTest.kt | 53 +++++++++++----------- .../test/kotlin/linking/EnumValuesLinkingTest.kt | 8 ++-- .../AndroidExternalLocationProviderTest.kt | 4 +- .../DefaultExternalLocationProviderTest.kt | 4 +- .../Dokka010ExternalLocationProviderTest.kt | 4 +- .../locationProvider/DokkaLocationProviderTest.kt | 4 +- .../JavadocExternalLocationProviderTest.kt | 4 +- .../locationProvider/MultiModuleLinkingTest.kt | 4 +- plugins/base/src/test/kotlin/markdown/KDocTest.kt | 2 +- plugins/base/src/test/kotlin/markdown/LinkTest.kt | 6 +-- .../base/src/test/kotlin/markdown/ParserTest.kt | 11 +++-- plugins/base/src/test/kotlin/model/ClassesTest.kt | 4 +- plugins/base/src/test/kotlin/model/CommentTest.kt | 2 +- .../base/src/test/kotlin/model/ExtensionsTest.kt | 4 +- .../base/src/test/kotlin/model/FunctionsTest.kt | 8 +++- .../base/src/test/kotlin/model/InheritorsTest.kt | 4 +- plugins/base/src/test/kotlin/model/JavaTest.kt | 15 +++--- .../kotlin/model/MultiLanguageInheritanceTest.kt | 2 +- plugins/base/src/test/kotlin/model/ObjectTest.kt | 2 +- plugins/base/src/test/kotlin/model/PackagesTest.kt | 2 +- plugins/base/src/test/kotlin/model/PropertyTest.kt | 2 +- .../JavaAnnotationsForParametersTest.kt | 5 +- .../model/annotations/JavaAnnotationsTest.kt | 6 +-- .../KotlinAnnotationsForParametersTest.kt | 4 +- .../kotlin/multiplatform/BasicMultiplatformTest.kt | 4 +- .../src/test/kotlin/packageList/PackageListTest.kt | 4 +- .../test/kotlin/pageMerger/PageNodeMergerTest.kt | 42 +++++++++-------- .../src/test/kotlin/parsers/JavadocParserTest.kt | 6 +-- .../src/test/kotlin/renderers/html/BasicTest.kt | 2 +- .../test/kotlin/renderers/html/BreadcrumbsTest.kt | 2 +- .../test/kotlin/renderers/html/CoverPageTest.kt | 4 +- .../test/kotlin/renderers/html/CustomFooterTest.kt | 4 +- .../test/kotlin/renderers/html/DivergentTest.kt | 2 +- .../kotlin/renderers/html/FooterMessageTest.kt | 4 +- .../kotlin/renderers/html/FormattingUtilsTest.kt | 4 +- .../kotlin/renderers/html/GroupWrappingTest.kt | 2 +- .../test/kotlin/renderers/html/ListStylesTest.kt | 2 +- .../kotlin/renderers/html/NavigationIconTest.kt | 2 +- .../test/kotlin/renderers/html/NavigationTest.kt | 5 +- .../renderers/html/SearchbarDataInstallerTest.kt | 8 ++-- .../renderers/html/SourceSetDependentHintTest.kt | 2 +- .../kotlin/renderers/html/SourceSetFilterTest.kt | 4 +- .../kotlin/renderers/html/TabbedContentTest.kt | 4 +- .../test/kotlin/renderers/html/TextStylesTest.kt | 2 +- .../test/kotlin/resourceLinks/ResourceLinksTest.kt | 14 +++--- .../kotlin/signatures/DivergentSignatureTest.kt | 25 +++++----- .../FunctionalTypeConstructorsSignatureTest.kt | 12 +++-- .../signatures/InheritedAccessorsSignatureTest.kt | 9 +++- .../test/kotlin/signatures/RawHtmlRenderingTest.kt | 8 ++-- .../src/test/kotlin/signatures/SignatureTest.kt | 8 ++-- .../kotlin/signatures/VarianceSignatureTest.kt | 2 +- .../superFields/DescriptorSuperPropertiesTest.kt | 4 +- .../test/kotlin/superFields/PsiSuperFieldsTest.kt | 9 ++-- .../PageTransformerBuilderTest.kt | 13 ++---- .../transformers/CommentsToContentConverterTest.kt | 14 +++--- ...textModuleAndPackageDocumentationReaderTest1.kt | 16 +++---- ...textModuleAndPackageDocumentationReaderTest3.kt | 8 ++-- .../test/kotlin/transformers/DivisionSwitchTest.kt | 2 +- ...itedEntriesDocumentableFilterTransfromerTest.kt | 7 +-- ...ntentModuleAndPackageDocumentationReaderTest.kt | 8 ++-- .../MergeImplicitExpectActualDeclarationsTest.kt | 4 +- ...ackageDocumentationTransformerFunctionalTest.kt | 2 +- ...leAndPackageDocumentationTransformerUnitTest.kt | 6 +-- .../ReportUndocumentedTransformerTest.kt | 8 ++-- .../transformers/SourceLinkTransformerTest.kt | 2 +- .../kotlin/transformers/SuppressTagFilterTest.kt | 4 +- ...nfigurationDocumentableFilterTransformerTest.kt | 7 ++- .../test/kotlin/transformers/isExceptionTest.kt | 5 +- .../kotlin/translators/AccessorMethodNamingTest.kt | 6 +-- .../base/src/test/kotlin/translators/Bug1341.kt | 4 +- ...efaultDescriptorToDocumentableTranslatorTest.kt | 42 ++++++++--------- .../DefaultPsiToDocumentableTranslatorTest.kt | 34 ++++++-------- .../translators/ExternalDocumentablesTest.kt | 8 ++-- .../kotlin/translators/JavadocInheritDocsTest.kt | 8 ++-- .../translators/JavadocInheritedDocTagsTest.kt | 6 +-- .../test/kotlin/translators/JavadocParserTest.kt | 6 +-- plugins/base/src/test/kotlin/utils/TestUtils.kt | 9 ++-- 115 files changed, 454 insertions(+), 435 deletions(-) (limited to 'plugins/base') diff --git a/plugins/base/base-test-utils/build.gradle.kts b/plugins/base/base-test-utils/build.gradle.kts index 20c3b727..a53e7b67 100644 --- a/plugins/base/base-test-utils/build.gradle.kts +++ b/plugins/base/base-test-utils/build.gradle.kts @@ -16,15 +16,13 @@ dependencies { runtimeOnly(project(path = ":subprojects:analysis-kotlin-descriptors", configuration = "shadow")) implementation(kotlin("reflect")) + implementation(libs.jsoup) + implementation(kotlin("test")) implementation(projects.core.testApi) - implementation(libs.jsoup) - implementation(kotlin("test-junit")) - + testImplementation(kotlin("test")) testImplementation(projects.core.testApi) - testImplementation(platform(libs.junit.bom)) - testImplementation(libs.junit.jupiter) } registerDokkaArtifactPublication("dokkaBaseTestUtils") { diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts index 2f9f5863..b6374d75 100644 --- a/plugins/base/build.gradle.kts +++ b/plugins/base/build.gradle.kts @@ -27,6 +27,9 @@ dependencies { } // Test only + testImplementation(kotlin("test")) + testImplementation(libs.junit.jupiterParams) + symbolsTestConfiguration(project(path = ":subprojects:analysis-kotlin-symbols", configuration = "shadow")) descriptorsTestConfiguration(project(path = ":subprojects:analysis-kotlin-descriptors", configuration = "shadow")) testImplementation(projects.plugins.base.baseTestUtils) { @@ -34,20 +37,12 @@ dependencies { } testImplementation(projects.core.contentMatcherTestUtils) testImplementation(projects.core.testApi) - testImplementation(platform(libs.junit.bom)) - testImplementation(libs.junit.jupiter) dokkaHtmlFrontendFiles(projects.plugins.base.frontend) { because("fetch frontend files from subproject :plugins:base:frontend") } } - - - - - - // access the frontend files via the dependency on :plugins:base:frontend val dokkaHtmlFrontendFiles: Provider = configurations.dokkaHtmlFrontendFiles.map { frontendFiles -> diff --git a/plugins/base/src/test/kotlin/basic/AbortGracefullyOnMissingDocumentablesTest.kt b/plugins/base/src/test/kotlin/basic/AbortGracefullyOnMissingDocumentablesTest.kt index 70d26e3c..81139300 100644 --- a/plugins/base/src/test/kotlin/basic/AbortGracefullyOnMissingDocumentablesTest.kt +++ b/plugins/base/src/test/kotlin/basic/AbortGracefullyOnMissingDocumentablesTest.kt @@ -2,7 +2,7 @@ package basic import org.jetbrains.dokka.DokkaGenerator import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest -import org.junit.jupiter.api.Test +import kotlin.test.Test import kotlin.test.assertTrue class AbortGracefullyOnMissingDocumentablesTest: BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/basic/DRITest.kt b/plugins/base/src/test/kotlin/basic/DRITest.kt index c70c1b0b..794adc9f 100644 --- a/plugins/base/src/test/kotlin/basic/DRITest.kt +++ b/plugins/base/src/test/kotlin/basic/DRITest.kt @@ -9,9 +9,8 @@ import org.jetbrains.dokka.model.* import org.jetbrains.dokka.pages.ClasslikePageNode import org.jetbrains.dokka.pages.ContentPage import org.jetbrains.dokka.pages.MemberPageNode -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Tag -import org.junit.jupiter.api.Test +import kotlin.test.Test +import kotlin.test.assertEquals class DRITest : BaseAbstractTest() { @Test diff --git a/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt b/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt index d4e307be..dca0ffd5 100644 --- a/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt +++ b/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt @@ -3,7 +3,7 @@ package basic import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.pages.ClasslikePageNode import org.jetbrains.dokka.pages.ModulePageNode -import org.junit.jupiter.api.Test +import kotlin.test.Test import kotlin.test.assertEquals class DokkaBasicTests : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt b/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt index bd8a79ef..1ea2adfd 100644 --- a/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt +++ b/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt @@ -6,8 +6,8 @@ import org.jetbrains.dokka.testApi.logger.TestLogger import org.jetbrains.dokka.utilities.DokkaConsoleLogger import org.jetbrains.dokka.utilities.DokkaLogger import org.jetbrains.dokka.utilities.LoggingLevel -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.assertThrows +import kotlin.test.Test +import kotlin.test.assertFailsWith class FailOnWarningTest : BaseAbstractTest() { @@ -22,7 +22,7 @@ class FailOnWarningTest : BaseAbstractTest() { } } - assertThrows { + assertFailsWith { testInline( """ |/src/main/kotlin/Bar.kt @@ -48,7 +48,7 @@ class FailOnWarningTest : BaseAbstractTest() { } } - assertThrows { + assertFailsWith { testInline( """ |/src/main/kotlin/Bar.kt diff --git a/plugins/base/src/test/kotlin/basic/LoggerTest.kt b/plugins/base/src/test/kotlin/basic/LoggerTest.kt index 92ffb539..904645ad 100644 --- a/plugins/base/src/test/kotlin/basic/LoggerTest.kt +++ b/plugins/base/src/test/kotlin/basic/LoggerTest.kt @@ -3,7 +3,7 @@ package basic import org.jetbrains.dokka.utilities.DokkaConsoleLogger import org.jetbrains.dokka.utilities.LoggingLevel import org.jetbrains.dokka.utilities.MessageEmitter -import org.junit.jupiter.api.Test +import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertTrue @@ -41,4 +41,4 @@ class LoggerTest { assertFalse(emitter.messages.any { it.contains("Info!") }) assertTrue(emitter.messages.any { it.contains("Warning!") }) } -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/content/ContentInDescriptionTest.kt b/plugins/base/src/test/kotlin/content/ContentInDescriptionTest.kt index e5533a7e..eb04a258 100644 --- a/plugins/base/src/test/kotlin/content/ContentInDescriptionTest.kt +++ b/plugins/base/src/test/kotlin/content/ContentInDescriptionTest.kt @@ -2,7 +2,7 @@ package content import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.doc.* -import org.junit.jupiter.api.Test +import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue @@ -135,4 +135,4 @@ class ContentInDescriptionTest : BaseAbstractTest() { } } } -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/content/HighlightingTest.kt b/plugins/base/src/test/kotlin/content/HighlightingTest.kt index 0896e7b7..4de680db 100644 --- a/plugins/base/src/test/kotlin/content/HighlightingTest.kt +++ b/plugins/base/src/test/kotlin/content/HighlightingTest.kt @@ -3,7 +3,7 @@ package content import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.pages.* -import org.junit.jupiter.api.Test +import kotlin.test.Test import kotlin.test.assertTrue class HighlightingTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt index 82159e0d..582d2e19 100644 --- a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt +++ b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt @@ -9,8 +9,12 @@ import org.jetbrains.dokka.pages.ContentPage import org.jetbrains.dokka.pages.ContentText import org.jetbrains.dokka.pages.MemberPageNode import org.jetbrains.dokka.pages.PackagePageNode -import org.junit.jupiter.api.Test -import utils.* +import utils.ParamAttributes +import utils.assertNotNull +import utils.bareSignature +import utils.propertySignature +import utils.JavaCode +import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt b/plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt index c25c1a1b..95935d0e 100644 --- a/plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt +++ b/plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt @@ -8,11 +8,12 @@ import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.model.properties.WithExtraProperties import org.jetbrains.dokka.pages.ContentPage import org.jetbrains.dokka.pages.ContentStyle -import org.junit.jupiter.api.Test -import utils.JavaCode import utils.pWrapped +import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.test.assertNotNull import kotlin.test.assertTrue +import utils.JavaCode @JavaCode class JavaDeprecatedTest : BaseAbstractTest() { @@ -48,7 +49,7 @@ class JavaDeprecatedTest : BaseAbstractTest() { assertTrue(isDeprecated) val deprecatedAnnotation = (deprecatedClass as WithExtraProperties).deprecatedAnnotation - checkNotNull(deprecatedAnnotation) + assertNotNull(deprecatedAnnotation) assertTrue(deprecatedAnnotation.isDeprecated()) assertEquals("java.lang", deprecatedAnnotation.dri.packageName) diff --git a/plugins/base/src/test/kotlin/content/annotations/KotlinDeprecatedTest.kt b/plugins/base/src/test/kotlin/content/annotations/KotlinDeprecatedTest.kt index 417843e2..b1e6516c 100644 --- a/plugins/base/src/test/kotlin/content/annotations/KotlinDeprecatedTest.kt +++ b/plugins/base/src/test/kotlin/content/annotations/KotlinDeprecatedTest.kt @@ -8,11 +8,12 @@ import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.model.properties.WithExtraProperties import org.jetbrains.dokka.pages.ContentPage import org.jetbrains.dokka.pages.ContentStyle -import org.junit.jupiter.api.Test import utils.ParamAttributes import utils.bareSignature import utils.pWrapped +import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.test.assertNotNull import kotlin.test.assertTrue @@ -51,7 +52,7 @@ class KotlinDeprecatedTest : BaseAbstractTest() { assertTrue(isDeprecated) val deprecatedAnnotation = (deprecatedFunction as WithExtraProperties).deprecatedAnnotation - checkNotNull(deprecatedAnnotation) + assertNotNull(deprecatedAnnotation) assertTrue(deprecatedAnnotation.isDeprecated()) assertEquals("kotlin", deprecatedAnnotation.dri.packageName) diff --git a/plugins/base/src/test/kotlin/content/annotations/SinceKotlinTest.kt b/plugins/base/src/test/kotlin/content/annotations/SinceKotlinTest.kt index 0b36031c..87b5c2fb 100644 --- a/plugins/base/src/test/kotlin/content/annotations/SinceKotlinTest.kt +++ b/plugins/base/src/test/kotlin/content/annotations/SinceKotlinTest.kt @@ -9,15 +9,12 @@ import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.model.doc.CustomTagWrapper import org.jetbrains.dokka.model.doc.Text import org.jetbrains.dokka.pages.ContentPage -import org.junit.jupiter.api.AfterEach -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test import signatures.AbstractRenderingTest import utils.ParamAttributes import utils.TestOutputWriterPlugin import utils.assertNotNull import utils.bareSignature -import kotlin.test.assertEquals +import kotlin.test.* class SinceKotlinTest : AbstractRenderingTest() { @@ -31,23 +28,23 @@ class SinceKotlinTest : AbstractRenderingTest() { } } - @BeforeEach + @BeforeTest fun setSystemProperty() { System.setProperty(SinceKotlinTransformer.SHOULD_DISPLAY_SINCE_KOTLIN_SYS_PROP, "true") } - @AfterEach + @AfterTest fun clearSystemProperty() { System.clearProperty(SinceKotlinTransformer.SHOULD_DISPLAY_SINCE_KOTLIN_SYS_PROP) } @Test fun versionsComparing() { - assert(SinceKotlinVersion("1.0").compareTo(SinceKotlinVersion("1.0")) == 0) - assert(SinceKotlinVersion("1.0.0").compareTo(SinceKotlinVersion("1")) == 0) - assert(SinceKotlinVersion("1.0") >= SinceKotlinVersion("1.0")) - assert(SinceKotlinVersion("1.1") > SinceKotlinVersion("1")) - assert(SinceKotlinVersion("1.0") < SinceKotlinVersion("2.0")) - assert(SinceKotlinVersion("1.0") < SinceKotlinVersion("2.2")) + assertTrue(SinceKotlinVersion("1.0").compareTo(SinceKotlinVersion("1.0")) == 0) + assertTrue(SinceKotlinVersion("1.0.0").compareTo(SinceKotlinVersion("1")) == 0) + assertTrue(SinceKotlinVersion("1.0") >= SinceKotlinVersion("1.0")) + assertTrue(SinceKotlinVersion("1.1") > SinceKotlinVersion("1")) + assertTrue(SinceKotlinVersion("1.0") < SinceKotlinVersion("2.0")) + assertTrue(SinceKotlinVersion("1.0") < SinceKotlinVersion("2.2")) } @Test @@ -77,7 +74,7 @@ class SinceKotlinTest : AbstractRenderingTest() { ) { renderingStage = { _, _ -> val content = writerPlugin.renderedContent("root/test/index.html") - assert(content.getElementsContainingOwnText("Since Kotlin").count() == 4) + assertEquals(4, content.getElementsContainingOwnText("Since Kotlin").count()) } } } diff --git a/plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt b/plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt index 17bd209e..227c4e9e 100644 --- a/plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt +++ b/plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt @@ -6,8 +6,11 @@ import org.jetbrains.dokka.PluginConfigurationImpl import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.DisplaySourceSet -import org.junit.jupiter.api.Test -import utils.* +import utils.ParamAttributes +import utils.bareSignature +import utils.findTestType +import utils.OnlyDescriptors +import kotlin.test.Test import kotlin.test.assertEquals class ContentForExceptions : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/content/functions/ContentForBriefTest.kt b/plugins/base/src/test/kotlin/content/functions/ContentForBriefTest.kt index c09a0e4d..d1bfa767 100644 --- a/plugins/base/src/test/kotlin/content/functions/ContentForBriefTest.kt +++ b/plugins/base/src/test/kotlin/content/functions/ContentForBriefTest.kt @@ -7,8 +7,8 @@ import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.DPackage import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.pages.* -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import kotlin.test.Test +import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull @@ -381,4 +381,4 @@ class ContentForBriefTest : BaseAbstractTest() { val row = contentTable.children.first() return row.dfs { it is ContentGroup && it.dci.kind == ContentKind.Comment && it.children.all { it is ContentText } } as ContentGroup } -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/content/functions/ContentForConstructors.kt b/plugins/base/src/test/kotlin/content/functions/ContentForConstructors.kt index 8da3be54..47b000ac 100644 --- a/plugins/base/src/test/kotlin/content/functions/ContentForConstructors.kt +++ b/plugins/base/src/test/kotlin/content/functions/ContentForConstructors.kt @@ -4,8 +4,9 @@ import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.pages.* -import org.junit.jupiter.api.Test +import utils.assertContains import utils.assertNotNull +import kotlin.test.Test import kotlin.test.assertEquals class ContentForConstructors : BaseAbstractTest() { @@ -41,8 +42,8 @@ class ContentForConstructors : BaseAbstractTest() { val constructorName = primary.dfs { (it as? ContentText)?.text == "Example" }.assertNotNull("constructorName") - assert(ContentStyle.RowTitle in constructorName.style) + assertContains(constructorName.style, ContentStyle.RowTitle) } } } -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/content/inheritors/ContentForInheritorsTest.kt b/plugins/base/src/test/kotlin/content/inheritors/ContentForInheritorsTest.kt index 2994fb42..5ec1ca74 100644 --- a/plugins/base/src/test/kotlin/content/inheritors/ContentForInheritorsTest.kt +++ b/plugins/base/src/test/kotlin/content/inheritors/ContentForInheritorsTest.kt @@ -5,10 +5,10 @@ import org.jetbrains.dokka.DokkaConfiguration import org.jetbrains.dokka.PluginConfigurationImpl import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest -import org.junit.jupiter.api.Test import utils.OnlyDescriptors import utils.classSignature import utils.findTestType +import kotlin.test.Test import kotlin.test.assertEquals class ContentForInheritorsTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt b/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt index df5efd03..97114dbc 100644 --- a/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt +++ b/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt @@ -10,8 +10,8 @@ import org.jetbrains.dokka.model.doc.Param import org.jetbrains.dokka.model.doc.Text import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.utilities.firstIsInstanceOrNull -import org.junit.jupiter.api.Test import utils.* +import kotlin.test.Test import kotlin.test.assertEquals class ContentForParamsTest : BaseAbstractTest() { @@ -1515,10 +1515,10 @@ class ContentForParamsTest : BaseAbstractTest() { it.documentation[jvm] } - assert(forJvm.size == 2) + assertEquals(2, forJvm.size) val (first, second) = forJvm.map { it.paramsDescription() } - assert(first == "comment to first param") - assert(second == "comment to second param") + assertEquals("comment to first param", first) + assertEquals("comment to second param", second) } } } diff --git a/plugins/base/src/test/kotlin/content/properties/ContentForClassWithParamsAndPropertiesTest.kt b/plugins/base/src/test/kotlin/content/properties/ContentForClassWithParamsAndPropertiesTest.kt index 164fa62d..e4abb9af 100644 --- a/plugins/base/src/test/kotlin/content/properties/ContentForClassWithParamsAndPropertiesTest.kt +++ b/plugins/base/src/test/kotlin/content/properties/ContentForClassWithParamsAndPropertiesTest.kt @@ -6,7 +6,7 @@ import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.model.doc.* import org.jetbrains.dokka.pages.ClasslikePageNode import org.jetbrains.dokka.pages.RootPageNode -import org.junit.jupiter.api.Test +import kotlin.test.Test import kotlin.test.assertEquals class ContentForClassWithParamsAndPropertiesTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/content/receiver/ContentForReceiverTest.kt b/plugins/base/src/test/kotlin/content/receiver/ContentForReceiverTest.kt index d7399914..0187b9a7 100644 --- a/plugins/base/src/test/kotlin/content/receiver/ContentForReceiverTest.kt +++ b/plugins/base/src/test/kotlin/content/receiver/ContentForReceiverTest.kt @@ -7,8 +7,8 @@ import org.jetbrains.dokka.model.doc.Text import org.jetbrains.dokka.pages.ContentHeader import org.jetbrains.dokka.pages.ContentText import org.jetbrains.dokka.pages.MemberPageNode -import org.junit.jupiter.api.Test import utils.docs +import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull @@ -54,4 +54,4 @@ class ContentForReceiverTest: BaseAbstractTest() { } } } -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/content/samples/ContentForSamplesTest.kt b/plugins/base/src/test/kotlin/content/samples/ContentForSamplesTest.kt index 9b5ab7ad..08a9a098 100644 --- a/plugins/base/src/test/kotlin/content/samples/ContentForSamplesTest.kt +++ b/plugins/base/src/test/kotlin/content/samples/ContentForSamplesTest.kt @@ -4,11 +4,12 @@ import matchers.content.* import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.base.transformers.pages.KOTLIN_PLAYGROUND_SCRIPT import org.jetbrains.dokka.model.DisplaySourceSet -import org.junit.jupiter.api.Test import utils.TestOutputWriterPlugin +import utils.assertContains import utils.classSignature import utils.findTestType import java.nio.file.Paths +import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals @@ -79,7 +80,7 @@ class ContentForSamplesTest : BaseAbstractTest() { ) { pagesTransformationStage = { module -> val page = module.findTestType("test", "Foo") - assert(KOTLIN_PLAYGROUND_SCRIPT in page.embeddedResources) + assertContains(page.embeddedResources, KOTLIN_PLAYGROUND_SCRIPT) page.content.assertNode { group { header(1) { +"Foo" } @@ -143,7 +144,7 @@ class ContentForSamplesTest : BaseAbstractTest() { ) { pagesTransformationStage = { module -> val page = module.findTestType("pageMerger", "Parent") - assert(KOTLIN_PLAYGROUND_SCRIPT in page.embeddedResources) + assertContains(page.embeddedResources, KOTLIN_PLAYGROUND_SCRIPT) page.content.assertNode { group { header(1) { +"Parent" } @@ -199,4 +200,4 @@ class ContentForSamplesTest : BaseAbstractTest() { private fun Set.assertSourceSet(expectedName: String) { assertEquals(1, this.size) assertEquals(expectedName, this.first().name) -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt b/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt index 82a04b89..7e4ed0cf 100644 --- a/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt +++ b/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt @@ -4,8 +4,8 @@ import matchers.content.* import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.DisplaySourceSet import org.jetbrains.dokka.pages.ContentDRILink -import org.junit.jupiter.api.Test import utils.* +import kotlin.test.Test import kotlin.test.assertEquals class ContentForSeeAlsoTest : BaseAbstractTest() { @@ -857,4 +857,4 @@ class ContentForSeeAlsoTest : BaseAbstractTest() { private fun Set.assertSourceSet(expectedName: String) { assertEquals(1, this.size) assertEquals(expectedName, this.first().name) -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/content/signatures/ConstructorsSignaturesTest.kt b/plugins/base/src/test/kotlin/content/signatures/ConstructorsSignaturesTest.kt index e57e6a8c..a1d8e260 100644 --- a/plugins/base/src/test/kotlin/content/signatures/ConstructorsSignaturesTest.kt +++ b/plugins/base/src/test/kotlin/content/signatures/ConstructorsSignaturesTest.kt @@ -4,7 +4,7 @@ import matchers.content.* import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.pages.BasicTabbedContentType import org.jetbrains.dokka.pages.ContentPage -import org.junit.jupiter.api.Test +import kotlin.test.Test import utils.OnlyDescriptors class ConstructorsSignaturesTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt b/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt index a39ade25..3c81d69b 100644 --- a/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt +++ b/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt @@ -5,11 +5,11 @@ import org.jetbrains.dokka.DokkaConfiguration import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.pages.ContentPage import org.jetbrains.dokka.pages.PackagePageNode -import org.junit.jupiter.api.Test import utils.ParamAttributes import utils.bareSignature import utils.propertySignature import utils.typealiasSignature +import kotlin.test.Test class ContentForSignaturesTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/content/typealiases/TypealiasTest.kt b/plugins/base/src/test/kotlin/content/typealiases/TypealiasTest.kt index c2f58cb9..4b2b003a 100644 --- a/plugins/base/src/test/kotlin/content/typealiases/TypealiasTest.kt +++ b/plugins/base/src/test/kotlin/content/typealiases/TypealiasTest.kt @@ -3,9 +3,10 @@ package content.typealiases import matchers.content.* import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.dfs -import org.jetbrains.dokka.pages.* -import org.junit.jupiter.api.Test +import org.jetbrains.dokka.pages.ClasslikePageNode +import org.jetbrains.dokka.pages.PlatformHintedContent import utils.assertNotNull +import kotlin.test.Test class TypealiasTest : BaseAbstractTest() { @@ -75,4 +76,4 @@ class TypealiasTest : BaseAbstractTest() { } } } -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/enums/JavaEnumsTest.kt b/plugins/base/src/test/kotlin/enums/JavaEnumsTest.kt index 1602a7cf..f00591a2 100644 --- a/plugins/base/src/test/kotlin/enums/JavaEnumsTest.kt +++ b/plugins/base/src/test/kotlin/enums/JavaEnumsTest.kt @@ -2,10 +2,10 @@ package enums import org.jetbrains.dokka.SourceLinkDefinitionImpl import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest -import org.junit.jupiter.api.Test import signatures.renderedContent import utils.TestOutputWriterPlugin import java.net.URL +import kotlin.test.Test import kotlin.test.assertEquals class JavaEnumsTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt b/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt index a49a29de..3bf1b3f1 100644 --- a/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt +++ b/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt @@ -10,12 +10,14 @@ import org.jetbrains.dokka.pages.ClasslikePageNode import org.jetbrains.dokka.pages.ContentGroup import org.jsoup.Jsoup import org.jsoup.nodes.Element -import org.junit.jupiter.api.Assertions.* -import org.junit.jupiter.api.Test import signatures.renderedContent import utils.TestOutputWriter import utils.TestOutputWriterPlugin import java.net.URL +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertNotNull +import kotlin.test.assertTrue class KotlinEnumsTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt b/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt index 1d86f219..29905035 100644 --- a/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt +++ b/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt @@ -1,11 +1,12 @@ package expect import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest -import org.junit.jupiter.api.Assertions.assertTrue import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths import java.util.concurrent.TimeUnit +import kotlin.test.assertEquals +import kotlin.test.assertTrue abstract class AbstractExpectTest( val testDir: Path? = Paths.get("src/test", "resources", "expect"), @@ -40,9 +41,9 @@ abstract class AbstractExpectTest( ).also { logger.info("git diff command: ${it.command().joinToString(" ")}") } .also { it.redirectErrorStream() }.start() - assertTrue(gitCompare.waitFor(gitTimeout, TimeUnit.MILLISECONDS)) { "Git timed out after $gitTimeout" } + assertTrue(gitCompare.waitFor(gitTimeout, TimeUnit.MILLISECONDS), "Git timed out after $gitTimeout") gitCompare.inputStream.bufferedReader().lines().forEach { logger.info(it) } - assertTrue(gitCompare.exitValue() == 0) { "${path.fileName}: outputs don't match" } + assertEquals(0, gitCompare.exitValue(), "${path.fileName}: outputs don't match") } ?: throw AssertionError("obtained path is null") } @@ -54,7 +55,7 @@ abstract class AbstractExpectTest( ) { obtained?.let { _ -> val (res, out, err) = runDiff(expected, obtained, excludes, timeout) - assertTrue(res == 0, "Outputs differ:\nstdout - $out\n\nstderr - ${err ?: ""}") + assertEquals(0, res, "Outputs differ:\nstdout - $out\n\nstderr - ${err ?: ""}") } ?: throw AssertionError("obtained path is null") } diff --git a/plugins/base/src/test/kotlin/expect/ExpectGenerator.kt b/plugins/base/src/test/kotlin/expect/ExpectGenerator.kt index cb3313f9..4112cd28 100644 --- a/plugins/base/src/test/kotlin/expect/ExpectGenerator.kt +++ b/plugins/base/src/test/kotlin/expect/ExpectGenerator.kt @@ -1,13 +1,13 @@ package expect -import org.junit.jupiter.api.Disabled -import org.junit.jupiter.api.Test +import kotlin.test.Ignore +import kotlin.test.Test class ExpectGenerator : AbstractExpectTest() { - @Disabled + @Ignore @Test fun generateAll() = testDir?.dirsWithFormats(formats).orEmpty().forEach { (p, f) -> generateExpect(p, f) } -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/expect/ExpectTest.kt b/plugins/base/src/test/kotlin/expect/ExpectTest.kt index bed841a6..ec9c8c6d 100644 --- a/plugins/base/src/test/kotlin/expect/ExpectTest.kt +++ b/plugins/base/src/test/kotlin/expect/ExpectTest.kt @@ -1,8 +1,8 @@ package expect -import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DynamicTest.dynamicTest import org.junit.jupiter.api.TestFactory +import kotlin.test.Ignore class ExpectTest : AbstractExpectTest() { private val ignores: List = listOf( @@ -16,9 +16,9 @@ class ExpectTest : AbstractExpectTest() { "*.map" ) - @Disabled + @Ignore @TestFactory fun expectTest() = testDir?.dirsWithFormats(formats).orEmpty().map { (p, f) -> dynamicTest("${p.fileName}-$f") { testOutputWithExcludes(p, f, ignores) } } -} \ No newline at end of file +} diff --git a/plugins/base/src/test/kotlin/expectActuals/ExpectActualsTest.kt b/plugins/base/src/test/kotlin/expectActuals/ExpectActualsTest.kt index ff1b7989..6344aa5a 100644 --- a/plugins/base/src/test/kotlin/expectActuals/ExpectActualsTest.kt +++ b/plugins/base/src/test/kotlin/expectActuals/ExpectActualsTest.kt @@ -3,8 +3,9 @@ package expectActuals import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.withDescendants import org.jetbrains.dokka.pages.ClasslikePageNode -import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Test +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertTrue class ExpectActualsTest : BaseAbstractTest() { @@ -146,25 +147,28 @@ class ExpectActualsTest : BaseAbstractTest() { val commonN1 = allChildren.filter { it.name == "[mingwX64, linuxX64]A" } val commonN2 = allChildren.filter { it.name == "[iosX64, iosArm64]A" } val noClass = allChildren.filter { it.name == "A" } - assertTrue(commonJ.size == 1) { "There can be only one [jvm, js]A page" } + assertEquals(1, commonJ.size, "There can be only one [jvm, js]A page") assertTrue( commonJ.first().documentables.firstOrNull()?.sourceSets?.map { it.displayName } - ?.containsAll(listOf("commonJ", "js", "jvm")) ?: false - ) { "A(jvm, js)should have commonJ, js, jvm sources" } + ?.containsAll(listOf("commonJ", "js", "jvm")) ?: false, + "A(jvm, js)should have commonJ, js, jvm sources" + ) - assertTrue(commonN1.size == 1) { "There can be only one [mingwX64, linuxX64]A page" } + assertEquals(1, commonN1.size, "There can be only one [mingwX64, linuxX64]A page") assertTrue( commonN1.first().documentables.firstOrNull()?.sourceSets?.map { it.displayName } - ?.containsAll(listOf("commonN1", "linuxX64", "mingwX64")) ?: false - ) { "[mingwX64, linuxX64]A should have commonN1, linuxX64, mingwX64 sources" } + ?.containsAll(listOf("commonN1", "linuxX64", "mingwX64")) ?: false, + "[mingwX64, linuxX64]A should have commonN1, linuxX64, mingwX64 sources" + ) - assertTrue(commonN2.size == 1) { "There can be only one [iosX64, iosArm64]A page" } + assertEquals(1, commonN2.size, "There can be only one [iosX64, iosArm64]A page") assertTrue( commonN2.first().documentables.firstOrNull()?.sourceSets?.map { it.displayName } - ?.containsAll(listOf("commonN2", "iosArm64", "iosX64")) ?: false - ) { "[iosX64, iosArm64]A should have commonN2, iosArm64, iosX64 sources" } + ?.containsAll(listOf("commonN2", "iosArm64", "iosX64")) ?: false, + "[iosX64, iosArm64]A should have commonN2, iosArm64, iosX64 sources" + ) - assertTrue(noClass.isEmpty()) { "There can't be any A page" } + assertTrue(noClass.isEmpty(), "There can't be any A page") } } } diff --git a/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt b/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt index 44caecaa..c28f3fd0 100644 --- a/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt @@ -3,8 +3,8 @@ package filter import org.jetbrains.dokka.DokkaDefaults import org.jetbrains.dokka.PackageOptionsImpl import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test +import kotlin.test.Test +import kotlin.test.assertTrue class DeprecationFilterTest : BaseAbstractTest() { @@ -41,7 +41,7 @@ class DeprecationFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.isEmpty() ) } @@ -72,7 +72,7 @@ class DeprecationFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.size == 1 ) } @@ -103,7 +103,7 @@ class DeprecationFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.size == 1 ) } @@ -134,7 +134,7 @@ class DeprecationFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.isEmpty() ) } @@ -169,7 +169,7 @@ class DeprecationFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().classlikes.first().classlikes.isEmpty() ) } @@ -210,7 +210,7 @@ class DeprecationFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.isEmpty() ) } @@ -250,7 +250,7 @@ class DeprecationFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.size == 1 ) } diff --git a/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt b/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt index 58a8e5f1..b4ee6c00 100644 --- a/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt @@ -1,9 +1,9 @@ package filter import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test +import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.test.assertTrue class EmptyPackagesFilterTest : BaseAbstractTest() { @Test @@ -28,7 +28,7 @@ class EmptyPackagesFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.isNotEmpty() ) } diff --git a/plugins/base/src/test/kotlin/filter/JavaFileFilterTest.kt b/plugins/base/src/test/kotlin/filter/JavaFileFilterTest.kt index a1a242c5..5d507669 100644 --- a/plugins/base/src/test/kotlin/filter/JavaFileFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/JavaFileFilterTest.kt @@ -1,8 +1,8 @@ package filter import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test +import kotlin.test.Test +import kotlin.test.assertTrue class JavaFileFilterTest : BaseAbstractTest() { @Test @@ -27,7 +27,7 @@ class JavaFileFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.isNotEmpty() ) } diff --git a/plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt b/plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt index 6423655a..8130766d 100644 --- a/plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt @@ -7,10 +7,10 @@ import org.jetbrains.dokka.PackageOptionsImpl import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.DModule -import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource import testApi.testRunner.dokkaConfiguration +import kotlin.test.Test import utils.JavaCode import kotlin.test.assertEquals @@ -302,4 +302,5 @@ class JavaVisibilityFilterTest : BaseAbstractTest() { ConfigurationWithVisibility("public", configuration, expectedClasslikes = 1) } } -} \ No newline at end of file +} + diff --git a/plugins/base/src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt b/plugins/base/src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt index af77d61c..19dd6204 100644 --- a/plugins/base/src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt +++ b/plugins/base/src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt @@ -6,8 +6,9 @@ import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.FunctionalTypeConstructor import org.jetbrains.dokka.model.GenericTypeConstructor import org.jetbrains.dokka.model.Invariance -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertNotEquals import utils.OnlyDescriptors class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { @@ -42,9 +43,9 @@ class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { val typeArrayNames = listOf("IntArray", "BooleanArray", "FloatArray", "DoubleArray", "LongArray", "ShortArray", "CharArray", "ByteArray") - Assertions.assertEquals(typeArrayNames.size, params?.size) + assertEquals(typeArrayNames.size, params?.size) params?.forEachIndexed{ i, param -> - Assertions.assertEquals(GenericTypeConstructor(DRI("kotlin", typeArrayNames[i]), emptyList()), + assertEquals(GenericTypeConstructor(DRI("kotlin", typeArrayNames[i]), emptyList()), param.type) } } @@ -66,13 +67,13 @@ class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { ) { preMergeDocumentablesTransformationStage = { val params = it.firstOrNull()?.packages?.firstOrNull()?.functions?.firstOrNull()?.parameters - Assertions.assertEquals( + assertEquals( Invariance(GenericTypeConstructor(DRI("kotlin", "IntArray"), emptyList())), (params?.firstOrNull()?.type as? GenericTypeConstructor)?.projections?.firstOrNull()) - Assertions.assertEquals( + assertEquals( Invariance(GenericTypeConstructor(DRI("kotlin", "IntArray"), emptyList())), (params?.get(1)?.type as? FunctionalTypeConstructor)?.projections?.get(0)) - Assertions.assertEquals( + assertEquals( Invariance(GenericTypeConstructor(DRI("kotlin", "IntArray"), emptyList())), (params?.get(1)?.type as? FunctionalTypeConstructor)?.projections?.get(1)) } @@ -101,11 +102,11 @@ class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { val myTestClass = it.firstOrNull()?.packages?.firstOrNull()?.classlikes?.firstOrNull() val property = myTestClass?.properties?.firstOrNull() - Assertions.assertEquals(GenericTypeConstructor(DRI("kotlin", "BooleanArray"), emptyList()), + assertEquals(GenericTypeConstructor(DRI("kotlin", "BooleanArray"), emptyList()), property?.type) - Assertions.assertEquals(GenericTypeConstructor(DRI("kotlin", "BooleanArray"), emptyList()), + assertEquals(GenericTypeConstructor(DRI("kotlin", "BooleanArray"), emptyList()), property?.getter?.type) - Assertions.assertEquals(GenericTypeConstructor(DRI("kotlin", "BooleanArray"), emptyList()), + assertEquals(GenericTypeConstructor(DRI("kotlin", "BooleanArray"), emptyList()), property?.setter?.parameters?.firstOrNull()?.type) } } @@ -126,7 +127,7 @@ class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { preMergeDocumentablesTransformationStage = { val arrTypealias = it.firstOrNull()?.packages?.firstOrNull()?.typealiases?.firstOrNull() - Assertions.assertEquals(GenericTypeConstructor(DRI("kotlin", "IntArray"), emptyList()), + assertEquals(GenericTypeConstructor(DRI("kotlin", "IntArray"), emptyList()), arrTypealias?.underlyingType?.values?.firstOrNull()) } } @@ -151,9 +152,9 @@ class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { val testFun = it.firstOrNull()?.packages?.firstOrNull()?.functions?.firstOrNull() val myTestClass = it.firstOrNull()?.packages?.firstOrNull()?.classlikes?.firstOrNull() as? DClass - Assertions.assertEquals(GenericTypeConstructor(DRI("kotlin","IntArray"), emptyList()), + assertEquals(GenericTypeConstructor(DRI("kotlin","IntArray"), emptyList()), testFun?.generics?.firstOrNull()?.bounds?.firstOrNull()) - Assertions.assertEquals(GenericTypeConstructor(DRI("kotlin","IntArray"), emptyList()), + assertEquals(GenericTypeConstructor(DRI("kotlin","IntArray"), emptyList()), myTestClass?.generics?.firstOrNull()?.bounds?.firstOrNull()) } } @@ -192,12 +193,12 @@ class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { ) { preMergeDocumentablesTransformationStage = { val paramsJS = it[1].packages.firstOrNull()?.functions?.firstOrNull()?.parameters - Assertions.assertNotEquals( + assertNotEquals( GenericTypeConstructor(DRI("kotlin", "IntArray"), emptyList()), paramsJS?.firstOrNull()?.type) val paramsJVM = it.firstOrNull()?.packages?.firstOrNull()?.functions?.firstOrNull()?.parameters - Assertions.assertEquals( + assertEquals( GenericTypeConstructor(DRI("kotlin", "IntArray"), emptyList()), paramsJVM?.firstOrNull()?.type) } diff --git a/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt b/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt index e1bd94ba..93a05bfd 100644 --- a/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt @@ -7,11 +7,7 @@ import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.DEnum import org.jetbrains.dokka.model.DModule -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test -import kotlin.test.assertEquals -import kotlin.test.assertFalse -import kotlin.test.assertTrue +import kotlin.test.* class VisibilityFilterTest : BaseAbstractTest() { @@ -364,7 +360,7 @@ class VisibilityFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertNull( + assertNull( it.first().packages.first().properties.first().setter ) } @@ -429,7 +425,7 @@ class VisibilityFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.size == 1 ) } @@ -461,7 +457,7 @@ class VisibilityFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.isEmpty() ) } @@ -493,7 +489,7 @@ class VisibilityFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.size == 1 ) } @@ -525,7 +521,7 @@ class VisibilityFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertNull( + assertNull( it.first().packages.first().properties.first().setter ) } @@ -567,7 +563,7 @@ class VisibilityFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.size == 1 ) } @@ -609,7 +605,7 @@ class VisibilityFilterTest : BaseAbstractTest() { configuration ) { preMergeDocumentablesTransformationStage = { - Assertions.assertTrue( + assertTrue( it.first().packages.first().functions.isEmpty() ) } diff --git a/plugins/base/src/test/kotlin/issues/IssuesTest.kt b/plugins/base/src/test/kotlin/issues/IssuesTest.kt index 67aa3a1e..b57ab7ba 100644 --- a/plugins/base/src/test/kotlin/issues/IssuesTest.kt +++ b/plugins/base/src/test/kotlin/issues/IssuesTest.kt @@ -2,9 +2,9 @@ package issues import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.DFunction -import org.junit.jupiter.api.Test import utils.AbstractModelTest import utils.name +import kotlin.test.Test class IssuesTest : AbstractModelTest("/src/main/kotlin/issues/Test.kt", "issues") { diff --git a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt index ccf62641..6e11929d 100644 --- a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt +++ b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt @@ -8,15 +8,16 @@ import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.model.doc.Text import org.jetbrains.dokka.pages.* import org.jsoup.Jsoup -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test -import utils.OnlyDescriptors -import utils.OnlyDescriptorsMPP import utils.TestOutputWriterPlugin import utils.assertNotNull import java.net.URL import java.nio.file.Paths +import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.test.assertNotEquals +import kotlin.test.assertNotNull +import utils.OnlyDescriptors +import utils.OnlyDescriptorsMPP class LinkableContentTest : BaseAbstractTest() { @@ -64,10 +65,10 @@ class LinkableContentTest : BaseAbstractTest() { testFromData(configuration) { documentablesMergingStage = { - Assertions.assertEquals(2, it.documentation.size) - Assertions.assertEquals(2, it.packages.size) - Assertions.assertEquals(1, it.packages.first().documentation.size) - Assertions.assertEquals(1, it.packages.last().documentation.size) + assertEquals(2, it.documentation.size) + assertEquals(2, it.packages.size) + assertEquals(1, it.packages.first().documentation.size) + assertEquals(1, it.packages.last().documentation.size) } } @@ -130,14 +131,14 @@ class LinkableContentTest : BaseAbstractTest() { renderingStage = { rootPageNode, dokkaContext -> val newRoot = SourceLinksTransformer(dokkaContext).invoke(rootPageNode) val moduleChildren = newRoot.children - Assertions.assertEquals(1, moduleChildren.size) + assertEquals(1, moduleChildren.size) val packageChildren = moduleChildren.first().children - Assertions.assertEquals(2, packageChildren.size) + assertEquals(2, packageChildren.size) packageChildren.forEach { val name = it.name.substringBefore("Class") val signature = (it as? ClasslikePageNode)?.content?.dfs { it is ContentGroup && it.dci.kind == ContentKind.Symbol }.assertNotNull("signature") val crl = signature.children.last().children[1] as? ContentResolvedLink - Assertions.assertEquals( + assertEquals( "https://github.com/user/repo/tree/master/src/${name.toLowerCase()}Main/kotlin/${name}Class.kt#L3", crl?.address ) @@ -193,13 +194,13 @@ class LinkableContentTest : BaseAbstractTest() { // val newRoot = DefaultSamplesTransformer(dokkaContext).invoke(rootPageNode) val newRoot = rootPageNode val moduleChildren = newRoot.children - Assertions.assertEquals(1, moduleChildren.size) + assertEquals(1, moduleChildren.size) val packageChildren = moduleChildren.first().children - Assertions.assertEquals(2, packageChildren.size) + assertEquals(2, packageChildren.size) packageChildren.forEach { pageNode -> val name = pageNode.name.substringBefore("Class") val classChildren = pageNode.children - Assertions.assertEquals(2, classChildren.size) + assertEquals(2, classChildren.size) val function = classChildren.find { it.name == "printWithExclamation" } val text = (function as MemberPageNode).content.let { it as ContentGroup }.children.last() .let { it as ContentDivergentGroup }.children.single().after @@ -207,7 +208,7 @@ class LinkableContentTest : BaseAbstractTest() { .let { it as ContentGroup }.children.single() .let { it as ContentCodeBlock }.children.single() .let { it as ContentText }.text - Assertions.assertEquals( + assertEquals( """|import p2.${name}Class |fun main() { | //sampleStart @@ -262,7 +263,7 @@ class LinkableContentTest : BaseAbstractTest() { child?.text == "S" } as? ContentDRILink - Assertions.assertEquals( + assertEquals( (sample.documentables.firstOrNull() as WithGenerics).generics.first().dri, returnTypeNode?.address ) @@ -300,7 +301,7 @@ class LinkableContentTest : BaseAbstractTest() { testFromData(configuration) { documentablesMergingStage = { - Assertions.assertNotEquals(null, it.packages.first().documentation.values.single().dfs { + assertNotEquals(null, it.packages.first().documentation.values.single().dfs { (it as? Text)?.body?.contains("@SqlTable") ?: false }) } @@ -354,20 +355,18 @@ class LinkableContentTest : BaseAbstractTest() { testFromData(configuration) { documentablesMergingStage = { module -> - module.documentation.entries.single { + val value = module.documentation.entries.single { it.key.displayName == "jvm" - }.value.run { - Assertions.assertNotNull(dfs { - (it as? Text)?.body == "This is second JVM documentation for module example" - }) + }.value + assertNotNull(value.dfs { + (it as? Text)?.body == "This is second JVM documentation for module example" + }) - Assertions.assertNotNull(dfs { - (it as? Text)?.body == "This is JVM documentation for module example" - }) - } + assertNotNull(value.dfs { + (it as? Text)?.body == "This is JVM documentation for module example" + }) } } - } @Test diff --git a/plugins/base/src/test/kotlin/linking/EnumValuesLinkingTest.kt b/plugins/base/src/test/kotlin/linking/EnumValuesLinkingTest.kt index 9ba428d6..a8604e2c 100644 --- a/plugins/base/src/test/kotlin/linking/EnumValuesLinkingTest.kt +++ b/plugins/base/src/test/kotlin/linking/EnumValuesLinkingTest.kt @@ -8,12 +8,12 @@ import org.jetbrains.dokka.model.doc.DocumentationLink import org.jetbrains.dokka.pages.ContentDRILink import org.jetbrains.dokka.pages.ContentPage import org.jsoup.Jsoup -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertNotNull -import org.junit.jupiter.api.Test -import utils.OnlyDescriptors import utils.TestOutputWriterPlugin import java.nio.file.Paths +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertNotNull +import utils.OnlyDescriptors class EnumValuesLinkingTest : BaseAbstractTest() { diff --git a/plugins/base/src/test/kotlin/locationProvider/AndroidExternalLocationProviderTest.kt b/plugins/base/src/test/kotlin/locationProvider/AndroidExternalLocationProviderTest.kt index e9e087