Disable kotlin flag and add OnlyDescriptors for test

Kotlin · Nov 17, 2023 · 9f31d14 · 9f31d14
1 parent f6504c3
commit 9f31d14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/...bols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/KotlinAnalysis.kt b/...bols/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/plugin/KotlinAnalysis.kt
@@ -54,9 +54,7 @@ internal fun getLanguageVersionSettings(
         apiVersion = apiVersion, analysisFlags = hashMapOf(
             // special flag for Dokka
             // force to resolve light classes (lazily by default)
-            AnalysisFlags.eagerResolveOfLightClasses to true,
-            // TODO: looks like we need to hide it under a flag?
-            AnalysisFlags.allowKotlinPackage to true
+            AnalysisFlags.eagerResolveOfLightClasses to true
         )
     )
 }

diff --git a/...n-base/src/test/kotlin/transformers/ObviousAndInheritedFunctionsDocumentableFilterTest.kt b/...n-base/src/test/kotlin/transformers/ObviousAndInheritedFunctionsDocumentableFilterTest.kt
@@ -9,6 +9,7 @@ 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.OnlyDescriptors
 import kotlin.test.assertEquals
 
 class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() {
@@ -202,7 +203,9 @@ class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() {
 
     @ParameterizedTest
     @MethodSource(value = ["nonSuppressingObviousConfiguration", "nonSuppressingInheritedConfiguration"])
-    fun `not should suppress toString, equals and hashcode for interface if custom config is provided`(nonSuppressingConfiguration: DokkaConfigurationImpl) {
+    fun `not should suppress toString, equals and hashcode for interface if custom config is provided`(
+        nonSuppressingConfiguration: DokkaConfigurationImpl
+    ) {
         testInline(
             """
             /src/suppressed/Suppressed.kt
@@ -220,7 +223,9 @@ class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() {
 
     @ParameterizedTest
     @MethodSource(value = ["nonSuppressingObviousConfiguration", "nonSuppressingInheritedConfiguration"])
-    fun `should not suppress toString, equals and hashcode if custom config is provided in Java`(nonSuppressingConfiguration: DokkaConfigurationImpl) {
+    fun `should not suppress toString, equals and hashcode if custom config is provided in Java`(
+        nonSuppressingConfiguration: DokkaConfigurationImpl
+    ) {
         testInline(
             """
             /src/suppressed/Suppressed.java
@@ -247,6 +252,7 @@ class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() {
         }
     }
 
+    @OnlyDescriptors("#3354")
     @ParameterizedTest
     @MethodSource(value = ["suppressingObviousConfiguration"])
     fun `should not suppress toString, equals and hashcode of kotlin Any`(suppressingConfiguration: DokkaConfigurationImpl) {
@@ -264,11 +270,12 @@ class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() {
         ) {
             preMergeDocumentablesTransformationStage = { modules ->
                 val functions = modules.flatMap { it.packages }.flatMap { it.classlikes }.flatMap { it.functions }
-                assertEquals(3, functions.size)
+                assertEquals(setOf("equals", "hashCode", "toString"), functions.map { it.name }.toSet())
             }
         }
     }
 
+    @OnlyDescriptors("#3196")
     @ParameterizedTest
     @MethodSource(value = ["suppressingObviousConfiguration"])
     fun `should not suppress toString, equals and hashcode of kotlin Enum`(suppressingConfiguration: DokkaConfigurationImpl) {
@@ -287,10 +294,7 @@ class ObviousAndInheritedFunctionsDocumentableFilterTest : BaseAbstractTest() {
         ) {
             preMergeDocumentablesTransformationStage = { modules ->
                 val functions = modules.flatMap { it.packages }.flatMap { it.classlikes }.flatMap { it.functions }
-                // TODO: fails on K2 (functions.size=5)
-                //  for some reason functions contains getDeclaringClass from Enum.java
-                //  no such function exists when using K1
-                assertEquals(4, functions.size)
+                assertEquals(setOf("compareTo", "equals", "hashCode", "toString"), functions.map { it.name }.toSet())
             }
         }
     }