diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/StandaloneSessionBuilderTest.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/StandaloneSessionBuilderTest.kt index e5cf0995aac..4a762b6d8c9 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/StandaloneSessionBuilderTest.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/StandaloneSessionBuilderTest.kt @@ -209,16 +209,6 @@ class StandaloneSessionBuilderTest { } - private fun KtCallExpression.assertIsCallOf(callableId: CallableId) { - analyze(this) { - val ktCallInfo = resolveCall() - Assertions.assertInstanceOf(KtSuccessCallInfo::class.java, ktCallInfo); ktCallInfo as KtSuccessCallInfo - val symbol = ktCallInfo.successfulFunctionCallOrNull()?.symbol - Assertions.assertInstanceOf(KtFunctionSymbol::class.java, symbol); symbol as KtFunctionSymbol - Assertions.assertEquals(callableId, symbol.callableIdIfNonLocal) - } - } - private fun KtTypeReference.assertIsReferenceTo(classId: ClassId) { analyze(this) { val actualClassId = getKtType().expandedClassSymbol?.classIdIfNonLocal diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/sessionBuilderTestUtils.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/sessionBuilderTestUtils.kt index f3b59f59896..1b252c3b1e1 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/sessionBuilderTestUtils.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/session/builder/sessionBuilderTestUtils.kt @@ -5,6 +5,13 @@ package org.jetbrains.kotlin.analysis.api.standalone.fir.test.cases.session.builder +import org.jetbrains.kotlin.analysis.api.analyze +import org.jetbrains.kotlin.analysis.api.calls.KtSuccessCallInfo +import org.jetbrains.kotlin.analysis.api.calls.successfulFunctionCallOrNull +import org.jetbrains.kotlin.analysis.api.calls.symbol +import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol +import org.jetbrains.kotlin.name.CallableId +import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.util.KtTestUtil import java.nio.file.Files @@ -13,11 +20,22 @@ import java.nio.file.Paths import kotlin.io.path.absolutePathString import kotlin.io.path.extension import kotlin.streams.asSequence +import org.junit.jupiter.api.Assertions internal fun testDataPath(path: String): Path { return Paths.get("analysis/analysis-api-standalone/testData/sessionBuilder").resolve(path) } +fun KtCallExpression.assertIsCallOf(callableId: CallableId) { + analyze(this) { + val ktCallInfo = resolveCall() + Assertions.assertInstanceOf(KtSuccessCallInfo::class.java, ktCallInfo); ktCallInfo as KtSuccessCallInfo + val symbol = ktCallInfo.successfulFunctionCallOrNull()?.symbol + Assertions.assertInstanceOf(KtFunctionSymbol::class.java, symbol); symbol as KtFunctionSymbol + Assertions.assertEquals(callableId, symbol.callableIdIfNonLocal) + } +} + internal fun compileCommonKlib(kLibSourcesRoot: Path): Path { val ktFiles = Files.walk(kLibSourcesRoot).asSequence().filter { it.extension == "kt" }.toList()