From d56cb4e2ed6bf285fe69e7bf354a1bf302025afb Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 1 Nov 2024 16:09:52 +0100 Subject: [PATCH] [kotlin] rewrite `KotlinProjectStructureTest`.`test different jdks attached to project modules` to avoid using `ModuleInfo` KTIJ-31684 GitOrigin-RevId: 03e1c6021a0ceb5a9f6d2b77bfeee95ab2048d99 --- .../modules/KotlinProjectStructureTest.kt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/kotlin/base/fir/analysis-api-platform/test/org/jetbrains/kotlin/idea/base/fir/analysisApiPlatform/modules/KotlinProjectStructureTest.kt b/plugins/kotlin/base/fir/analysis-api-platform/test/org/jetbrains/kotlin/idea/base/fir/analysisApiPlatform/modules/KotlinProjectStructureTest.kt index 3d3fa39c4182..3329bbcc5dfd 100644 --- a/plugins/kotlin/base/fir/analysis-api-platform/test/org/jetbrains/kotlin/idea/base/fir/analysisApiPlatform/modules/KotlinProjectStructureTest.kt +++ b/plugins/kotlin/base/fir/analysis-api-platform/test/org/jetbrains/kotlin/idea/base/fir/analysisApiPlatform/modules/KotlinProjectStructureTest.kt @@ -379,18 +379,17 @@ class KotlinProjectStructureTest : AbstractMultiModuleTest() { //a class from "jdk" which belongs to 2 order entries val stringClass = JavaPsiFacade.getInstance(project).findClass("java.lang.String", GlobalSearchScope.allScope(project))!! - val infoProvider = ModuleInfoProvider.getInstance(project) - val contextualModuleBInfo = moduleB.productionSourceInfo!! - val info1 = infoProvider - .firstOrNull(stringClass, ModuleInfoProvider.Configuration(contextualModuleInfo = contextualModuleBInfo)) - assertNotNull("IdeaModuleInfo not found for module B", info1) + val contextualModuleB = moduleB.toKaSourceModuleForProduction()!! + val module1 = stringClass.getKaModuleOfTypeSafe(project, contextualModuleB) - val contextualModuleAInfo = moduleA.productionSourceInfo!! - val info2 = infoProvider - .firstOrNull(stringClass, ModuleInfoProvider.Configuration(contextualModuleInfo = contextualModuleAInfo)) - assertNotNull("IdeaModuleInfo not found for module A", info2) + assertNotNull("KaLibraryModule not found for module B", module1) - assertNotSame("Different jdks are attached to modules, but one jdk is found by search", info1!!.sdk(), info2!!.sdk()) + val contextualModuleA = moduleA.toKaSourceModuleForProduction()!! + val module2 = stringClass.getKaModuleOfTypeSafe(project, contextualModuleA) + + assertNotNull("KaLibraryModule not found for module A", module2) + + assertNotSame("Different jdks are attached to modules, but one jdk is found by search", module1!!.openapiSdk, module2!!.openapiSdk) } fun `test that buildSrc sources belong to KaSourceModule`() {