From 62d1143ed3f2f76c4f52eaaa1e079fc8b8c7f264 Mon Sep 17 00:00:00 2001
From: Vadim Mishenev <vad-mishenev@yandex.ru>
Date: Thu, 5 Oct 2023 23:30:14 +0300
Subject: Register Kotlin stdlib classpath in every unit test (#3183)

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.
---
 .../src/test/kotlin/content/exceptions/ContentForExceptions.kt   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt')

diff --git a/plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt b/plugins/base/src/test/kotlin/content/exceptions/ContentForExceptions.kt
index cd37d1c4..9a9fd8b4 100644
--- 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,6 +33,7 @@ class ContentForExceptions : BaseAbstractTest() {
                 displayName = "common"
                 analysisPlatform = "common"
                 sourceRoots = listOf("src/commonMain/kotlin/pageMerger/Test.kt")
+                classpath = listOfNotNull(commonStdlibPath)
             }
             sourceSet {
                 name = "jvm"
@@ -42,6 +41,7 @@ class ContentForExceptions : BaseAbstractTest() {
                 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(
-- 
cgit