Skip to content

Commit a8c9bca

Browse files
committed
[K2] Enable Java tests for symbols
1 parent 099f6c6 commit a8c9bca

26 files changed

+9
-101
lines changed

plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import utils.ParamAttributes
1717
import utils.assertNotNull
1818
import utils.bareSignature
1919
import utils.propertySignature
20-
import utils.JavaCode
2120
import kotlin.test.Test
2221
import kotlin.test.assertEquals
2322
import kotlin.test.assertTrue
@@ -323,7 +322,6 @@ class ContentForAnnotationsTest : BaseAbstractTest() {
323322
}
324323
}
325324

326-
@JavaCode
327325
@Test
328326
fun `annotated bounds in Java`() {
329327
testInline(

plugins/base/src/test/kotlin/content/annotations/JavaDeprecatedTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ import kotlin.test.Test
1717
import kotlin.test.assertEquals
1818
import kotlin.test.assertNotNull
1919
import kotlin.test.assertTrue
20-
import utils.JavaCode
2120

22-
@JavaCode
2321
class JavaDeprecatedTest : BaseAbstractTest() {
2422

2523
private val testConfiguration = dokkaConfiguration {

plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ class ContentForParamsTest : BaseAbstractTest() {
247247
}
248248
}
249249

250-
@JavaCode
250+
251251
@Test
252252
fun `deprecated with multiple links inside`() {
253253
testInline(
@@ -352,7 +352,7 @@ class ContentForParamsTest : BaseAbstractTest() {
352352
}
353353
}
354354

355-
@JavaCode
355+
356356
@Test
357357
fun `deprecated with an multiple inline links`() {
358358
testInline(
@@ -417,7 +417,6 @@ class ContentForParamsTest : BaseAbstractTest() {
417417
}
418418
}
419419

420-
@JavaCode
421420
@Test
422421
fun `multiline throws with comment`() {
423422
testInline(
@@ -599,7 +598,6 @@ class ContentForParamsTest : BaseAbstractTest() {
599598
}
600599
}
601600

602-
@JavaCode
603601
@Test
604602
fun `multiline throws where exception is not in the same line as description`() {
605603
testInline(
@@ -683,7 +681,7 @@ class ContentForParamsTest : BaseAbstractTest() {
683681
}
684682

685683

686-
@JavaCode
684+
687685
@Test
688686
fun `documentation splitted in 2 using enters`() {
689687
testInline(
@@ -729,7 +727,6 @@ class ContentForParamsTest : BaseAbstractTest() {
729727
}
730728
}
731729

732-
@JavaCode
733730
@Test
734731
fun `multiline return tag with param`() {
735732
testInline(
@@ -795,7 +792,6 @@ class ContentForParamsTest : BaseAbstractTest() {
795792
}
796793
}
797794

798-
@UsingJDK
799795
@Test
800796
fun `return tag in kotlin`() {
801797
testInline(
@@ -805,7 +801,7 @@ class ContentForParamsTest : BaseAbstractTest() {
805801
| /**
806802
| * a normal comment
807803
| *
808-
| * @return empty string when [Hash Map](java.util.HashMap.containsKey) doesn't contain value.
804+
| * @return empty string when [Hash Map][java.util.HashMap.containsKey] doesn't contain value.
809805
| *
810806
| */
811807
|fun sample(): String {
@@ -843,7 +839,7 @@ class ContentForParamsTest : BaseAbstractTest() {
843839
}
844840
}
845841

846-
@JavaCode
842+
847843
@Test
848844
fun `list with links and description`() {
849845
testInline(
@@ -1490,7 +1486,6 @@ class ContentForParamsTest : BaseAbstractTest() {
14901486
}
14911487
}
14921488

1493-
@JavaCode
14941489
@Test
14951490
fun javaDocCommentWithDocumentedParameters() {
14961491
testInline(

plugins/base/src/test/kotlin/filter/JavaVisibilityFilterTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ import org.junit.jupiter.params.ParameterizedTest
1515
import org.junit.jupiter.params.provider.MethodSource
1616
import testApi.testRunner.dokkaConfiguration
1717
import kotlin.test.Test
18-
import utils.JavaCode
1918
import kotlin.test.assertEquals
2019

21-
@JavaCode
2220
class JavaVisibilityFilterTest : BaseAbstractTest() {
2321

2422
@Test

plugins/base/src/test/kotlin/markdown/LinkTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ import org.jetbrains.dokka.pages.MemberPageNode
1515
import kotlin.test.Test
1616
import kotlin.test.assertEquals
1717
import kotlin.test.assertNotNull
18-
import utils.UsingJDK
1918

2019
class LinkTest : BaseAbstractTest() {
21-
@UsingJDK
20+
2221
@Test
2322
fun linkToClassLoader() {
2423
val configuration = dokkaConfiguration {

plugins/base/src/test/kotlin/model/ClassesTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
525525
}
526526
}
527527

528-
@UsingJDK
529528
@Test
530529
fun doublyTypealiasedException() {
531530
inlineModelTest(

plugins/base/src/test/kotlin/model/ExtensionsTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.jetbrains.dokka.model.Documentable
1212
import org.jetbrains.dokka.model.properties.WithExtraProperties
1313
import utils.AbstractModelTest
1414
import kotlin.test.Test
15-
import utils.UsingJDK
1615

1716
class ExtensionsTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "classes") {
1817
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
7170
}
7271
}
7372

74-
@UsingJDK
7573
@Test
7674
fun `should be extension for external classes`() {
7775
inlineModelTest(

plugins/base/src/test/kotlin/model/JavaTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ import utils.AbstractModelTest
1515
import utils.assertContains
1616
import utils.assertNotNull
1717
import utils.name
18-
import utils.JavaCode
1918
import kotlin.test.Test
2019
import kotlin.test.assertEquals
2120
import kotlin.test.assertTrue
2221

23-
@JavaCode
2422
class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
2523
val configuration = dokkaConfiguration {
2624
sourceSets {

plugins/base/src/test/kotlin/model/MultiLanguageInheritanceTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ import org.jetbrains.dokka.model.doc.*
1212
import org.jetbrains.dokka.model.withDescendants
1313
import org.jetbrains.dokka.utilities.firstIsInstanceOrNull
1414
import translators.documentationOf
15-
import utils.JavaCode
1615
import utils.docs
1716
import kotlin.test.Test
1817
import kotlin.test.assertEquals
1918

20-
@JavaCode
2119
class MultiLanguageInheritanceTest : BaseAbstractTest() {
2220
val configuration = dokkaConfiguration {
2321
suppressObviousFunctions = false

plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsForParametersTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ import org.jetbrains.dokka.model.*
1010
import org.jetbrains.dokka.utilities.cast
1111
import utils.AbstractModelTest
1212
import kotlin.test.Test
13-
import utils.JavaCode
1413
import kotlin.test.assertEquals
1514
import kotlin.test.assertTrue
1615

17-
@JavaCode
1816
class JavaAnnotationsForParametersTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
1917

2018
@Test

plugins/base/src/test/kotlin/model/annotations/JavaAnnotationsTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
88
import org.jetbrains.dokka.model.*
99
import translators.findClasslike
1010
import kotlin.test.*
11-
import utils.JavaCode
1211

13-
@JavaCode
1412
class JavaAnnotationsTest : BaseAbstractTest() {
1513

1614
val configuration = dokkaConfiguration {

plugins/base/src/test/kotlin/parsers/JavadocParserTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ import utils.text
1717
import kotlin.test.Test
1818
import kotlin.test.assertEquals
1919
import kotlin.test.assertNotNull
20-
import utils.JavaCode
2120

22-
@JavaCode
2321
class JavadocParserTest : BaseAbstractTest() {
2422

2523
private val configuration = dokkaConfiguration {

plugins/base/src/test/kotlin/renderers/html/NavigationIconTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package renderers.html
66

77
import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
88
import utils.TestOutputWriterPlugin
9-
import utils.UsingJDK
109
import utils.navigationHtml
1110
import utils.selectNavigationGrid
1211
import kotlin.test.Test
@@ -187,7 +186,6 @@ class NavigationIconTest : BaseAbstractTest() {
187186
)
188187
}
189188

190-
@UsingJDK
191189
@Test
192190
fun `should add icon styles to kotlin exception class navigation item`() {
193191
assertNavigationIcon(

plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import utils.A
1111
import utils.Span
1212
import utils.TestOutputWriterPlugin
1313
import utils.match
14-
import utils.JavaCode
1514
import kotlin.test.Ignore
1615
import kotlin.test.Test
1716

@@ -259,7 +258,6 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() {
259258
}
260259
}
261260

262-
@JavaCode
263261
@Test
264262
fun `java with java function`() {
265263
val source = """
@@ -286,7 +284,6 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() {
286284
}
287285
}
288286

289-
@JavaCode
290287
@Test
291288
fun `java with kotlin function`() {
292289
val source = """

plugins/base/src/test/kotlin/signatures/InheritedAccessorsSignatureTest.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ import utils.A
1010
import utils.Span
1111
import utils.TestOutputWriterPlugin
1212
import utils.match
13-
import utils.JavaCode
1413
import utils.OnlyDescriptors
1514
import kotlin.test.Test
1615
import kotlin.test.assertEquals
1716

18-
@JavaCode
1917
class InheritedAccessorsSignatureTest : BaseAbstractTest() {
2018

2119
private val configuration = dokkaConfiguration {
@@ -238,7 +236,6 @@ class InheritedAccessorsSignatureTest : BaseAbstractTest() {
238236
}
239237
}
240238

241-
@JavaCode
242239
@Test
243240
fun `should keep kotlin property with no accessors when java inherits kotlin a var`() {
244241
val writerPlugin = TestOutputWriterPlugin()
@@ -276,7 +273,6 @@ class InheritedAccessorsSignatureTest : BaseAbstractTest() {
276273
}
277274
}
278275

279-
@JavaCode
280276
@Test
281277
fun `kotlin property with compute get and set`() {
282278
val writerPlugin = TestOutputWriterPlugin()

plugins/base/src/test/kotlin/superFields/DescriptorSuperPropertiesTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ import org.jetbrains.dokka.links.DRI
1010
import org.jetbrains.dokka.model.InheritedMember
1111
import org.jetbrains.dokka.model.IsVar
1212
import org.jetbrains.dokka.model.KotlinVisibility
13+
import utils.OnlyDescriptors
1314
import kotlin.test.Test
1415
import kotlin.test.assertEquals
1516
import kotlin.test.assertNotNull
1617
import kotlin.test.assertNull
17-
import utils.JavaCode
1818

19-
@JavaCode
2019
class DescriptorSuperPropertiesTest : BaseAbstractTest() {
2120

2221
private val commonTestConfiguration = dokkaConfiguration {
@@ -145,6 +144,7 @@ class DescriptorSuperPropertiesTest : BaseAbstractTest() {
145144
}
146145

147146
@Test
147+
@OnlyDescriptors("Incorrect test, see https://github.com/Kotlin/dokka/issues/3128")
148148
fun `should have special getter and setter names for boolean property inherited from java`() {
149149
testInline(
150150
"""
@@ -179,7 +179,7 @@ class DescriptorSuperPropertiesTest : BaseAbstractTest() {
179179
}
180180
}
181181

182-
// incorrect test https://github.com/Kotlin/dokka/issues/3128
182+
@OnlyDescriptors("Incorrect test, see https://github.com/Kotlin/dokka/issues/3128")
183183
@Test
184184
fun `kotlin inheriting java should not append anything since field is public api`() {
185185
val configuration = dokkaConfiguration {

plugins/base/src/test/kotlin/superFields/PsiSuperFieldsTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import kotlin.test.Test
1414
import kotlin.test.assertEquals
1515
import kotlin.test.assertNotNull
1616
import kotlin.test.assertNull
17-
import utils.JavaCode
1817

19-
@JavaCode
2018
class PsiSuperFieldsTest : BaseAbstractTest() {
2119

2220
private val commonTestConfiguration = dokkaConfiguration {

plugins/base/src/test/kotlin/transformers/ObviousAndInheritedFunctionsDocumentableFilterTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
99
import org.junit.jupiter.params.ParameterizedTest
1010
import org.junit.jupiter.params.provider.MethodSource
1111
import testApi.testRunner.dokkaConfiguration
12-
import utils.JavaCode
1312
import kotlin.test.assertEquals
1413

1514
class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() {
@@ -201,7 +200,6 @@ class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() {
201200

202201
@ParameterizedTest
203202
@MethodSource(value = ["nonSuppressingObviousConfiguration", "nonSuppressingInheritedConfiguration"])
204-
@JavaCode
205203
fun `should not suppress toString, equals and hashcode if custom config is provided in Java`(nonSuppressingConfiguration: DokkaConfigurationImpl) {
206204
testInline(
207205
"""

plugins/base/src/test/kotlin/transformers/isExceptionTest.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ import org.jetbrains.dokka.model.DClass
99
import org.jetbrains.dokka.model.DTypeAlias
1010
import utils.AbstractModelTest
1111
import kotlin.test.Test
12-
import utils.JavaCode
13-
import utils.UsingJDK
1412

1513
class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "classes") {
16-
@UsingJDK
1714
@Test
1815
fun `isException should work for kotlin exception`(){
1916
inlineModelTest(
@@ -27,7 +24,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k
2724
}
2825
}
2926

30-
@UsingJDK
3127
@Test
3228
fun `isException should work for java exceptions`(){
3329
inlineModelTest(
@@ -41,7 +37,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k
4137
}
4238
}
4339

44-
@UsingJDK
4540
@Test
4641
fun `isException should work for RuntimeException`(){
4742
inlineModelTest(
@@ -55,7 +50,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k
5550
}
5651
}
5752

58-
@UsingJDK
5953
@Test
6054
fun `isException should work if exception is typealiased`(){
6155
inlineModelTest(
@@ -69,7 +63,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k
6963
}
7064
}
7165

72-
@UsingJDK
7366
@Test
7467
fun `isException should work if exception is extending a typaliased class`(){
7568
inlineModelTest(
@@ -111,7 +104,6 @@ class IsExceptionKotlinTest : AbstractModelTest("/src/main/kotlin/classes/Test.k
111104
}
112105
}
113106

114-
@JavaCode
115107
class IsExceptionJavaTest: AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
116108
@Test
117109
fun `isException should work for java exceptions`(){

0 commit comments

Comments
 (0)