[K2] Enable Java tests for symbols (#3203)

Kotlin · Oct 24, 2023 · c745f96 · c745f96
1 parent 820e3b7
commit c745f96
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...s/base/src/test/kotlin/transformers/ObviousAndInheritedFunctionsDocumentableFilterTest.kt b/...s/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(
             """
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        @UsingJDK
         @Test
         fun doublyTypealiasedException() {
             inlineModelTest(
@@ Expand Down @@