Register Kotlin stdlib classpath in every unit test (#3183)

vmishenev · web-flow · commit 62d1143ed3f2 · 2023-10-05T23:30:14.000+03:00
Due to the recent changes in how Analysis API handles builtins, the update to the fresh version of Analysis API requires registering Kotlin stdlib in every testsuite.
diff --git a/plugins/base/src/test/kotlin/content/HighlightingTest.kt b/plugins/base/src/test/kotlin/content/HighlightingTest.kt
@@ -15,7 +15,7 @@ class HighlightingTest : BaseAbstractTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/")
-                classpath = listOf(commonStdlibPath!!)
+                classpath = listOf(commonStdlibPath!!, jvmStdlibPath!!)
                 externalDocumentationLinks = listOf(stdlibExternalDocumentationLink)
             }
         }
diff --git a/plugins/base/src/test/kotlin/content/annotations/KotlinDeprecatedTest.kt b/plugins/base/src/test/kotlin/content/annotations/KotlinDeprecatedTest.kt
@@ -27,6 +27,7 @@ class KotlinDeprecatedTest : BaseAbstractTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/")
+                classpath = listOfNotNull(jvmStdlibPath)
                 analysisPlatform = "jvm"
             }
         }
diff --git a/plugins/base/src/test/kotlin/content/annotations/SinceKotlinTest.kt b/plugins/base/src/test/kotlin/content/annotations/SinceKotlinTest.kt
@@ -27,6 +27,7 @@ class SinceKotlinTest : AbstractRenderingTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/")
+                classpath = listOfNotNull(jvmStdlibPath)
                 analysisPlatform = "jvm"
             }
         }
@@ -185,6 +186,7 @@ class SinceKotlinTest : AbstractRenderingTest() {
             sourceSets {
                 sourceSet {
                     sourceRoots = listOf("src/")
+                    classpath = listOfNotNull(jvmStdlibPath)
                     analysisPlatform = "jvm"
                 }
                 sourceSet {
@@ -193,10 +195,12 @@ class SinceKotlinTest : AbstractRenderingTest() {
                 }
                 sourceSet {
                     sourceRoots = listOf("src/")
+                    classpath = listOfNotNull(commonStdlibPath)
                     analysisPlatform = "common"
                 }
                 sourceSet {
                     sourceRoots = listOf("src/")
+                    classpath = listOfNotNull(jsStdlibPath)
                     analysisPlatform = "js"
                 }
                 sourceSet {
diff --git a/plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt b/plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt
@@ -10,10 +10,7 @@ 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 utils.ParamAttributes
-import utils.bareSignature
-import utils.findTestType
-import utils.OnlyDescriptors
+import utils.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -22,6 +19,7 @@ class ContentForExceptions : BaseAbstractTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/")
+                classpath = listOfNotNull(jvmStdlibPath)
                 analysisPlatform = "jvm"
             }
         }
@@ -35,13 +33,15 @@ class ContentForExceptions : BaseAbstractTest() {
                 displayName = "common"
                 analysisPlatform = "common"
                 sourceRoots = listOf("src/commonMain/kotlin/pageMerger/Test.kt")
+                classpath = listOfNotNull(commonStdlibPath)
             }
             sourceSet {
                 name = "jvm"
                 displayName = "jvm"
                 analysisPlatform = "jvm"
                 dependentSourceSets = setOf(common.value.sourceSetID)
                 sourceRoots = listOf("src/jvmMain/kotlin/pageMerger/Test.kt")
+                classpath = listOfNotNull(jvmStdlibPath)
             }
             sourceSet {
                 name = "linuxX64"
@@ -339,6 +339,7 @@ class ContentForExceptions : BaseAbstractTest() {
         }
     }
 
+    @OnlyDescriptorsMPP("Return type for native `function` should be null rather than kotlin/Unit")
     @Test
     fun `throws in merged functions`() {
         testInline(
diff --git a/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt b/plugins/base/src/test/kotlin/content/params/ContentForParamsTest.kt
@@ -23,6 +23,7 @@ class ContentForParamsTest : BaseAbstractTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/")
+                classpath = listOfNotNull(jvmStdlibPath)
                 analysisPlatform = "jvm"
             }
         }
@@ -531,7 +532,7 @@ class ContentForParamsTest : BaseAbstractTest() {
                                             link {
                                                 check {
                                                     assertEquals(
-                                                        "java.lang/RuntimeException///PointingToDeclaration/",
+                                                        "kotlin/RuntimeException///PointingToDeclaration/",
                                                         (this as ContentDRILink).address.toString()
                                                     )
                                                 }
diff --git a/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt b/plugins/base/src/test/kotlin/content/seealso/ContentForSeeAlsoTest.kt
@@ -17,6 +17,7 @@ class ContentForSeeAlsoTest : BaseAbstractTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/")
+                classpath = listOfNotNull(jvmStdlibPath)
                 analysisPlatform = "jvm"
             }
         }
@@ -217,6 +218,7 @@ class ContentForSeeAlsoTest : BaseAbstractTest() {
         }
     }
 
+    @OnlyDescriptors("issue #3179")
     @Test
     fun `undocumented seealso with reference to property for class`() {
         testInline(
@@ -310,6 +312,7 @@ class ContentForSeeAlsoTest : BaseAbstractTest() {
         }
     }
 
+    @OnlyDescriptors("issue #3179")
     @Test
     fun `documented seealso with reference to property for class`() {
         testInline(
diff --git a/plugins/base/src/test/kotlin/content/typealiases/TypealiasTest.kt b/plugins/base/src/test/kotlin/content/typealiases/TypealiasTest.kt
@@ -18,7 +18,7 @@ class TypealiasTest : BaseAbstractTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/")
-                classpath = listOf(commonStdlibPath!!)
+                classpath = listOf(commonStdlibPath!!, jvmStdlibPath!!)
                 externalDocumentationLinks = listOf(stdlibExternalDocumentationLink)
             }
         }
diff --git a/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt b/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt
@@ -292,6 +292,7 @@ class KotlinEnumsTest : BaseAbstractTest() {
             sourceSets {
                 sourceSet {
                     sourceRoots = listOf("src/")
+                    classpath = listOfNotNull(jvmStdlibPath)
                 }
             }
         }
diff --git a/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt b/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt
@@ -18,6 +18,7 @@ class DeprecationFilterTest : BaseAbstractTest() {
             sourceSets {
                 sourceSet {
                     sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
+                    classpath = listOfNotNull(jvmStdlibPath)
                     skipDeprecated = false
                     perPackageOptions = mutableListOf(
                         PackageOptionsImpl(
diff --git a/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt b/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt
@@ -691,6 +691,7 @@ class VisibilityFilterTest : BaseAbstractTest() {
                 sourceSet {
                     includeNonPublic = true
                     sourceRoots = listOf("src/main/kotlin/basic/Test.kt")
+                    classpath = listOfNotNull(jvmStdlibPath)
                 }
             }
         }
diff --git a/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt b/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt
@@ -20,7 +20,7 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/")
-                classpath = listOf(commonStdlibPath!!)
+                classpath = listOf(commonStdlibPath!!, jvmStdlibPath!!)
                 externalDocumentationLinks = listOf(
                     stdlibExternalDocumentationLink,
                     DokkaConfiguration.ExternalDocumentationLink.Companion.jdk(8)

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class HighlightingTest : BaseAbstractTest() {`
`15`	`15`	`sourceSets {`
`16`	`16`	`sourceSet {`
`17`	`17`	`sourceRoots = listOf("src/")`
`18`		`- classpath = listOf(commonStdlibPath!!)`
	`18`	`+ classpath = listOf(commonStdlibPath!!, jvmStdlibPath!!)`
`19`	`19`	`externalDocumentationLinks = listOf(stdlibExternalDocumentationLink)`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ class KotlinDeprecatedTest : BaseAbstractTest() {`
`27`	`27`	`sourceSets {`
`28`	`28`	`sourceSet {`
`29`	`29`	`sourceRoots = listOf("src/")`
	`30`	`+ classpath = listOfNotNull(jvmStdlibPath)`
`30`	`31`	`analysisPlatform = "jvm"`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ class SinceKotlinTest : AbstractRenderingTest() {`
`27`	`27`	`sourceSets {`
`28`	`28`	`sourceSet {`
`29`	`29`	`sourceRoots = listOf("src/")`
	`30`	`+ classpath = listOfNotNull(jvmStdlibPath)`
`30`	`31`	`analysisPlatform = "jvm"`
`31`	`32`	`}`
`32`	`33`	`}`
`@@ -185,6 +186,7 @@ class SinceKotlinTest : AbstractRenderingTest() {`
`185`	`186`	`sourceSets {`
`186`	`187`	`sourceSet {`
`187`	`188`	`sourceRoots = listOf("src/")`
	`189`	`+ classpath = listOfNotNull(jvmStdlibPath)`
`188`	`190`	`analysisPlatform = "jvm"`
`189`	`191`	`}`
`190`	`192`	`sourceSet {`
`@@ -193,10 +195,12 @@ class SinceKotlinTest : AbstractRenderingTest() {`
`193`	`195`	`}`
`194`	`196`	`sourceSet {`
`195`	`197`	`sourceRoots = listOf("src/")`
	`198`	`+ classpath = listOfNotNull(commonStdlibPath)`
`196`	`199`	`analysisPlatform = "common"`
`197`	`200`	`}`
`198`	`201`	`sourceSet {`
`199`	`202`	`sourceRoots = listOf("src/")`
	`203`	`+ classpath = listOfNotNull(jsStdlibPath)`
`200`	`204`	`analysisPlatform = "js"`
`201`	`205`	`}`
`202`	`206`	`sourceSet {`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ class ContentForParamsTest : BaseAbstractTest() {`
`23`	`23`	`sourceSets {`
`24`	`24`	`sourceSet {`
`25`	`25`	`sourceRoots = listOf("src/")`
	`26`	`+ classpath = listOfNotNull(jvmStdlibPath)`
`26`	`27`	`analysisPlatform = "jvm"`
`27`	`28`	`}`
`28`	`29`	`}`
`@@ -531,7 +532,7 @@ class ContentForParamsTest : BaseAbstractTest() {`
`531`	`532`	`link {`
`532`	`533`	`check {`
`533`	`534`	`assertEquals(`
`534`		`- "java.lang/RuntimeException///PointingToDeclaration/",`
	`535`	`+ "kotlin/RuntimeException///PointingToDeclaration/",`
`535`	`536`	`(this as ContentDRILink).address.toString()`
`536`	`537`	`)`
`537`	`538`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ class ContentForSeeAlsoTest : BaseAbstractTest() {`
`17`	`17`	`sourceSets {`
`18`	`18`	`sourceSet {`
`19`	`19`	`sourceRoots = listOf("src/")`
	`20`	`+ classpath = listOfNotNull(jvmStdlibPath)`
`20`	`21`	`analysisPlatform = "jvm"`
`21`	`22`	`}`
`22`	`23`	`}`
`@@ -217,6 +218,7 @@ class ContentForSeeAlsoTest : BaseAbstractTest() {`
`217`	`218`	`}`
`218`	`219`	`}`
`219`	`220`
	`221`	`+ @OnlyDescriptors("issue #3179")`
`220`	`222`	`@Test`
`221`	`223`	fun `undocumented seealso with reference to property for class`() {
`222`	`224`	`testInline(`
`@@ -310,6 +312,7 @@ class ContentForSeeAlsoTest : BaseAbstractTest() {`
`310`	`312`	`}`
`311`	`313`	`}`
`312`	`314`
	`315`	`+ @OnlyDescriptors("issue #3179")`
`313`	`316`	`@Test`
`314`	`317`	fun `documented seealso with reference to property for class`() {
`315`	`318`	`testInline(`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class TypealiasTest : BaseAbstractTest() {`
`18`	`18`	`sourceSets {`
`19`	`19`	`sourceSet {`
`20`	`20`	`sourceRoots = listOf("src/")`
`21`		`- classpath = listOf(commonStdlibPath!!)`
	`21`	`+ classpath = listOf(commonStdlibPath!!, jvmStdlibPath!!)`
`22`	`22`	`externalDocumentationLinks = listOf(stdlibExternalDocumentationLink)`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ class KotlinEnumsTest : BaseAbstractTest() {`
`292`	`292`	`sourceSets {`
`293`	`293`	`sourceSet {`
`294`	`294`	`sourceRoots = listOf("src/")`
	`295`	`+ classpath = listOfNotNull(jvmStdlibPath)`
`295`	`296`	`}`
`296`	`297`	`}`
`297`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -691,6 +691,7 @@ class VisibilityFilterTest : BaseAbstractTest() {`
`691`	`691`	`sourceSet {`
`692`	`692`	`includeNonPublic = true`
`693`	`693`	`sourceRoots = listOf("src/main/kotlin/basic/Test.kt")`
	`694`	`+ classpath = listOfNotNull(jvmStdlibPath)`
`694`	`695`	`}`
`695`	`696`	`}`
`696`	`697`	`}`