diff options
27 files changed, 10 insertions, 102 deletions
diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-unit-test.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-unit-test.gradle.kts index 542cf1eb..4911499d 100644 --- a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-unit-test.gradle.kts +++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-unit-test.gradle.kts @@ -22,7 +22,7 @@ val symbolsTestConfiguration: Configuration by configurations.creating { val symbolsTest = tasks.register<Test>("symbolsTest") { useJUnitPlatform { - excludeTags("onlyDescriptors", "onlyDescriptorsMPP", "javaCode", "usingJDK") + excludeTags("onlyDescriptors", "onlyDescriptorsMPP") } classpath += symbolsTestConfiguration } diff --git a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt index 5a01c43e..7293b53c 100644 --- a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt +++ b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt @@ -17,7 +17,6 @@ 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 @@ -323,7 +322,6 @@ class ContentForAnnotationsTest : BaseAbstractTest() { } } - @JavaCode @Test fun `annotated bounds in Java`() { testInline( diff --git a/plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt b/plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt index d85eab71..5a2ff93e 100644 --- a/plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt +++ b/plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt @@ -17,9 +17,7 @@ import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertTrue -import utils.JavaCode -@JavaCode class JavaDeprecatedTest : BaseAbstractTest() { private val testConfiguration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt b/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt index 03bc0469..d0c6ac9d 100644 --- a/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt +++ b/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt @@ -247,7 +247,7 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @JavaCode + @Test fun `deprecated with multiple links inside`() { testInline( @@ -352,7 +352,7 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @JavaCode + @Test fun `deprecated with an multiple inline links`() { testInline( @@ -417,7 +417,6 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @JavaCode @Test fun `multiline throws with comment`() { testInline( @@ -599,7 +598,6 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @JavaCode @Test fun `multiline throws where exception is not in the same line as description`() { testInline( @@ -683,7 +681,7 @@ class ContentForParamsTest : BaseAbstractTest() { } - @JavaCode + @Test fun `documentation splitted in 2 using enters`() { testInline( @@ -729,7 +727,6 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @JavaCode @Test fun `multiline return tag with param`() { testInline( @@ -795,7 +792,6 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @UsingJDK @Test fun `return tag in kotlin`() { testInline( @@ -805,7 +801,7 @@ class ContentForParamsTest : BaseAbstractTest() { | /** | * a normal comment | * - | * @return empty string when [Hash Map](java.util.HashMap.containsKey) doesn't contain value. + | * @return empty string when [Hash Map][java.util.HashMap.containsKey] doesn't contain value. | * | */ |fun sample(): String { @@ -843,7 +839,7 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @JavaCode + @Test fun `list with links and description`() { testInline( @@ -1490,7 +1486,6 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @JavaCode @Test fun javaDocCommentWithDocumentedParameters() { testInline( diff --git a/plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt b/plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt index 763d6961..b648f802 100644 --- a/plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt @@ -15,10 +15,8 @@ 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 -@JavaCode class JavaVisibilityFilterTest : BaseAbstractTest() { @Test diff --git a/plugins/base/src/test/kotlin/markdown/LinkTest.kt b/plugins/base/src/test/kotlin/markdown/LinkTest.kt index baf24040..f783892f 100644 --- a/plugins/base/src/test/kotlin/markdown/LinkTest.kt +++ b/plugins/base/src/test/kotlin/markdown/LinkTest.kt @@ -15,10 +15,9 @@ import org.jetbrains.dokka.pages.MemberPageNode import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull -import utils.UsingJDK class LinkTest : BaseAbstractTest() { - @UsingJDK + @Test fun linkToClassLoader() { val configuration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt index 82b81f2b..763809e8 100644 --- a/plugins/base/src/test/kotlin/model/ClassesTest.kt +++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt @@ -525,7 +525,6 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class } } - @UsingJDK @Test fun doublyTypealiasedException() { inlineModelTest( diff --git a/plugins/base/src/test/kotlin/model/ExtensionsTest.kt b/plugins/base/src/test/kotlin/model/ExtensionsTest.kt index 18d19b5d..a428dd1d 100644 --- a/plugins/base/src/test/kotlin/model/ExtensionsTest.kt +++ b/plugins/base/src/test/kotlin/model/ExtensionsTest.kt @@ -12,7 +12,6 @@ import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.model.properties.WithExtraProperties import utils.AbstractModelTest import kotlin.test.Test -import utils.UsingJDK class ExtensionsTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "classes") { private fun <T : WithExtraProperties<R>, R : Documentable> T.checkExtension(name: String = "extension") = @@ -71,7 +70,6 @@ class ExtensionsTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "cl } } - @UsingJDK @Test fun `should be extension for external classes`() { inlineModelTest( diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt index e4a26f1b..ff706c5e 100644 --- a/plugins/base/src/test/kotlin/model/JavaTest.kt +++ b/plugins/base/src/test/kotlin/model/JavaTest.kt @@ -15,12 +15,10 @@ 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") { val configuration = dokkaConfiguration { sourceSets { diff --git a/plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt b/plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt index 5c17b624..9b646f24 100644 --- a/plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt +++ b/plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt @@ -12,12 +12,10 @@ import org.jetbrains.dokka.model.doc.* import org.jetbrains.dokka.model.withDescendants import org.jetbrains.dokka.utilities.firstIsInstanceOrNull import translators.documentationOf -import utils.JavaCode import utils.docs import kotlin.test.Test import kotlin.test.assertEquals -@JavaCode class MultiLanguageInheritanceTest : BaseAbstractTest() { val configuration = dokkaConfiguration { suppressObviousFunctions = false diff --git a/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt b/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt index 2c398d2f..9800006b 100644 --- a/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt +++ b/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt @@ -10,11 +10,9 @@ import org.jetbrains.dokka.model.* import org.jetbrains.dokka.utilities.cast import utils.AbstractModelTest import kotlin.test.Test -import utils.JavaCode import kotlin.test.assertEquals import kotlin.test.assertTrue -@JavaCode class JavaAnnotationsForParametersTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") { @Test diff --git a/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt b/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt index 2b3637bb..daab7dc9 100644 --- a/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt +++ b/plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt @@ -8,9 +8,7 @@ import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.model.* import translators.findClasslike import kotlin.test.* -import utils.JavaCode -@JavaCode class JavaAnnotationsTest : BaseAbstractTest() { val configuration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/parsers/JavadocParserTest.kt b/plugins/base/src/test/kotlin/parsers/JavadocParserTest.kt index 3408771a..b56edc97 100644 --- a/plugins/base/src/test/kotlin/parsers/JavadocParserTest.kt +++ b/plugins/base/src/test/kotlin/parsers/JavadocParserTest.kt @@ -17,9 +17,7 @@ import utils.text import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull -import utils.JavaCode -@JavaCode class JavadocParserTest : BaseAbstractTest() { private val configuration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/renderers/html/NavigationIconTest.kt b/plugins/base/src/test/kotlin/renderers/html/NavigationIconTest.kt index 2beab25b..d57f84df 100644 --- a/plugins/base/src/test/kotlin/renderers/html/NavigationIconTest.kt +++ b/plugins/base/src/test/kotlin/renderers/html/NavigationIconTest.kt @@ -6,7 +6,6 @@ package renderers.html import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import utils.TestOutputWriterPlugin -import utils.UsingJDK import utils.navigationHtml import utils.selectNavigationGrid import kotlin.test.Test @@ -187,7 +186,6 @@ class NavigationIconTest : BaseAbstractTest() { ) } - @UsingJDK @Test fun `should add icon styles to kotlin exception class navigation item`() { assertNavigationIcon( diff --git a/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt b/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt index 22807e87..13d1947f 100644 --- a/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt +++ b/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt @@ -11,7 +11,6 @@ import utils.A import utils.Span import utils.TestOutputWriterPlugin import utils.match -import utils.JavaCode import kotlin.test.Ignore import kotlin.test.Test @@ -259,7 +258,6 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() { } } - @JavaCode @Test fun `java with java function`() { val source = """ @@ -286,7 +284,6 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() { } } - @JavaCode @Test fun `java with kotlin function`() { val source = """ diff --git a/plugins/base/src/test/kotlin/signatures/InheritedAccessorsSignatureTest.kt b/plugins/base/src/test/kotlin/signatures/InheritedAccessorsSignatureTest.kt index b0edbbad..b5e2a9c3 100644 --- a/plugins/base/src/test/kotlin/signatures/InheritedAccessorsSignatureTest.kt +++ b/plugins/base/src/test/kotlin/signatures/InheritedAccessorsSignatureTest.kt @@ -10,12 +10,10 @@ import utils.A import utils.Span import utils.TestOutputWriterPlugin import utils.match -import utils.JavaCode import utils.OnlyDescriptors import kotlin.test.Test import kotlin.test.assertEquals -@JavaCode class InheritedAccessorsSignatureTest : BaseAbstractTest() { private val configuration = dokkaConfiguration { @@ -238,7 +236,6 @@ class InheritedAccessorsSignatureTest : BaseAbstractTest() { } } - @JavaCode @Test fun `should keep kotlin property with no accessors when java inherits kotlin a var`() { val writerPlugin = TestOutputWriterPlugin() @@ -276,7 +273,6 @@ class InheritedAccessorsSignatureTest : BaseAbstractTest() { } } - @JavaCode @Test fun `kotlin property with compute get and set`() { val writerPlugin = TestOutputWriterPlugin() diff --git a/plugins/base/src/test/kotlin/superFields/DescriptorSuperPropertiesTest.kt b/plugins/base/src/test/kotlin/superFields/DescriptorSuperPropertiesTest.kt index d068ad87..8f984485 100644 --- a/plugins/base/src/test/kotlin/superFields/DescriptorSuperPropertiesTest.kt +++ b/plugins/base/src/test/kotlin/superFields/DescriptorSuperPropertiesTest.kt @@ -10,13 +10,12 @@ import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.model.InheritedMember import org.jetbrains.dokka.model.IsVar import org.jetbrains.dokka.model.KotlinVisibility +import utils.OnlyDescriptors import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull -import utils.JavaCode -@JavaCode class DescriptorSuperPropertiesTest : BaseAbstractTest() { private val commonTestConfiguration = dokkaConfiguration { @@ -145,6 +144,7 @@ class DescriptorSuperPropertiesTest : BaseAbstractTest() { } @Test + @OnlyDescriptors("Incorrect test, see https://github.com/Kotlin/dokka/issues/3128") fun `should have special getter and setter names for boolean property inherited from java`() { testInline( """ @@ -179,7 +179,7 @@ class DescriptorSuperPropertiesTest : BaseAbstractTest() { } } - // incorrect test https://github.com/Kotlin/dokka/issues/3128 + @OnlyDescriptors("Incorrect test, see https://github.com/Kotlin/dokka/issues/3128") @Test fun `kotlin inheriting java should not append anything since field is public api`() { val configuration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/superFields/PsiSuperFieldsTest.kt b/plugins/base/src/test/kotlin/superFields/PsiSuperFieldsTest.kt index 0ea385d7..38f263a6 100644 --- a/plugins/base/src/test/kotlin/superFields/PsiSuperFieldsTest.kt +++ b/plugins/base/src/test/kotlin/superFields/PsiSuperFieldsTest.kt @@ -14,9 +14,7 @@ import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull -import utils.JavaCode -@JavaCode class PsiSuperFieldsTest : BaseAbstractTest() { private val commonTestConfiguration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/transformers/ObviousAndInheritedFunctionsDocumentableFilterTest.kt b/plugins/base/src/test/kotlin/transformers/ObviousAndInheritedFunctionsDocumentableFilterTest.kt index 84beaf6c..d035948f 100644 --- a/plugins/base/src/test/kotlin/transformers/ObviousAndInheritedFunctionsDocumentableFilterTest.kt +++ b/plugins/base/src/test/kotlin/transformers/ObviousAndInheritedFunctionsDocumentableFilterTest.kt @@ -9,7 +9,6 @@ import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource import testApi.testRunner.dokkaConfiguration -import utils.JavaCode import kotlin.test.assertEquals class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() { @@ -201,7 +200,6 @@ class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() { @ParameterizedTest @MethodSource(value = ["nonSuppressingObviousConfiguration", "nonSuppressingInheritedConfiguration"]) - @JavaCode fun `should not suppress toString, equals and hashcode if custom config is provided in Java`(nonSuppressingConfiguration: DokkaConfigurationImpl) { testInline( """ diff --git a/plugins/base/src/test/kotlin/transformers/isExceptionTest.kt b/plugins/base/src/test/kotlin/transformers/isExceptionTest.kt index aa923f7b..a387c60d 100644 --- a/plugins/base/src/test/kotlin/transformers/isExceptionTest.kt +++ b/plugins/base/src/test/kotlin/transformers/isExceptionTest.kt @@ -9,11 +9,8 @@ import org.jetbrains.dokka.model.DClass import org.jetbrains.dokka.model.DTypeAlias import utils.AbstractModelTest import kotlin.test.Test -import utils.JavaCode -import utils.UsingJDK class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "classes") { - @UsingJDK @Test fun `isException should work for kotlin exception`(){ inlineModelTest( @@ -27,7 +24,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k } } - @UsingJDK @Test fun `isException should work for java exceptions`(){ inlineModelTest( @@ -41,7 +37,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k } } - @UsingJDK @Test fun `isException should work for RuntimeException`(){ inlineModelTest( @@ -55,7 +50,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k } } - @UsingJDK @Test fun `isException should work if exception is typealiased`(){ inlineModelTest( @@ -69,7 +63,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k } } - @UsingJDK @Test fun `isException should work if exception is extending a typaliased class`(){ inlineModelTest( @@ -111,7 +104,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k } } -@JavaCode class IsExceptionJavaTest: AbstractModelTest("/src/main/kotlin/java/Test.java", "java") { @Test fun `isException should work for java exceptions`(){ diff --git a/plugins/base/src/test/kotlin/translators/Bug1341.kt b/plugins/base/src/test/kotlin/translators/Bug1341.kt index b996723f..6a7bfc97 100644 --- a/plugins/base/src/test/kotlin/translators/Bug1341.kt +++ b/plugins/base/src/test/kotlin/translators/Bug1341.kt @@ -8,10 +8,8 @@ import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.links.DRI import kotlin.test.Test import kotlin.test.assertEquals -import utils.JavaCode class Bug1341 : BaseAbstractTest() { - @JavaCode @Test fun `reproduce bug #1341`() { val configuration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt b/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt index af0b8d34..7e9bff1e 100644 --- a/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt +++ b/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt @@ -12,9 +12,7 @@ import org.jetbrains.dokka.links.PointingToDeclaration import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.doc.* import kotlin.test.* -import utils.JavaCode -@JavaCode class DefaultPsiToDocumentableTranslatorTest : BaseAbstractTest() { val configuration = dokkaConfiguration { sourceSets { diff --git a/plugins/base/src/test/kotlin/translators/ExternalDocumentablesTest.kt b/plugins/base/src/test/kotlin/translators/ExternalDocumentablesTest.kt index 5dd62545..1879c538 100644 --- a/plugins/base/src/test/kotlin/translators/ExternalDocumentablesTest.kt +++ b/plugins/base/src/test/kotlin/translators/ExternalDocumentablesTest.kt @@ -14,10 +14,8 @@ import org.jetbrains.dokka.plugability.querySingle import org.jetbrains.dokka.utilities.cast import kotlin.test.Test import kotlin.test.assertEquals -import utils.UsingJDK class ExternalDocumentablesTest : BaseAbstractTest() { - @UsingJDK @Test fun `external documentable from java stdlib`() { val configuration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/translators/JavadocInheritDocsTest.kt b/plugins/base/src/test/kotlin/translators/JavadocInheritDocsTest.kt index 70ad9e3d..6413866f 100644 --- a/plugins/base/src/test/kotlin/translators/JavadocInheritDocsTest.kt +++ b/plugins/base/src/test/kotlin/translators/JavadocInheritDocsTest.kt @@ -12,9 +12,7 @@ import org.jetbrains.dokka.model.doc.Text import kotlin.test.Ignore import kotlin.test.Test import kotlin.test.assertEquals -import utils.JavaCode -@JavaCode class JavadocInheritDocsTest : BaseAbstractTest() { val configuration = dokkaConfiguration { sourceSets { @@ -217,7 +215,6 @@ class JavadocInheritDocsTest : BaseAbstractTest() { } - @JavaCode @Test fun `work with multiple supertypes`() { testInline( diff --git a/plugins/base/src/test/kotlin/translators/JavadocInheritedDocTagsTest.kt b/plugins/base/src/test/kotlin/translators/JavadocInheritedDocTagsTest.kt index 24ad0989..a20db4ca 100644 --- a/plugins/base/src/test/kotlin/translators/JavadocInheritedDocTagsTest.kt +++ b/plugins/base/src/test/kotlin/translators/JavadocInheritedDocTagsTest.kt @@ -13,9 +13,7 @@ import kotlin.test.Test import kotlin.test.assertEquals import org.jetbrains.dokka.model.doc.Deprecated as DokkaDeprecatedTag import org.jetbrains.dokka.model.doc.Throws as DokkaThrowsTag -import utils.JavaCode -@JavaCode class JavadocInheritedDocTagsTest : BaseAbstractTest() { @Suppress("DEPRECATION") // for includeNonPublic private val configuration = dokkaConfiguration { diff --git a/plugins/base/src/test/kotlin/translators/JavadocParserTest.kt b/plugins/base/src/test/kotlin/translators/JavadocParserTest.kt index 5f7f04c0..3f83f462 100644 --- a/plugins/base/src/test/kotlin/translators/JavadocParserTest.kt +++ b/plugins/base/src/test/kotlin/translators/JavadocParserTest.kt @@ -14,9 +14,7 @@ import org.jetbrains.dokka.model.firstMemberOfType import utils.text import kotlin.test.Test import kotlin.test.assertEquals -import utils.JavaCode -@JavaCode class JavadocParserTest : BaseAbstractTest() { private fun performJavadocTest(testOperation: (DModule) -> Unit) { diff --git a/plugins/base/src/test/kotlin/utils/TagsAnnotations.kt b/plugins/base/src/test/kotlin/utils/TagsAnnotations.kt index 103b92d4..a81b1dae 100644 --- a/plugins/base/src/test/kotlin/utils/TagsAnnotations.kt +++ b/plugins/base/src/test/kotlin/utils/TagsAnnotations.kt @@ -40,36 +40,3 @@ annotation class OnlyDescriptors(val reason: String = "") ) @Tag("onlyDescriptorsMPP") annotation class OnlyDescriptorsMPP(val reason: String = "") - - -/** - * For test containing .java code - * These tests are disabled in K2 due to Standlone prototype. https://github.com/Kotlin/dokka/issues/3114 - */ -@Target( - AnnotationTarget.CLASS, - AnnotationTarget.FUNCTION, - AnnotationTarget.PROPERTY_GETTER, - AnnotationTarget.PROPERTY_SETTER -) -@Retention( - AnnotationRetention.RUNTIME -) -@Tag("javaCode") -annotation class JavaCode - -/** - * For Kotlin test using JDK - * These tests are disabled in K2 due to Standlone prototype. https://github.com/Kotlin/dokka/issues/3114 - */ -@Target( - AnnotationTarget.CLASS, - AnnotationTarget.FUNCTION, - AnnotationTarget.PROPERTY_GETTER, - AnnotationTarget.PROPERTY_SETTER -) -@Retention( - AnnotationRetention.RUNTIME -) -@Tag("usingJDK") -annotation class UsingJDK |