From db1fc7f35823fadd6767f7a200541ed3cd5d54d6 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Tue, 17 Jul 2018 11:57:46 +0300 Subject: [PATCH] Use 'stableName' instead of 'name' in tests on module name --- .../kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt | 2 +- .../idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 | 2 +- .../idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 | 2 +- .../org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt index 3396b7b2be6..3dfa4b6416f 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt @@ -2235,7 +2235,7 @@ compileTestKotlin { val resolutionFacade = KotlinCacheService.getInstance(myProject).getResolutionFacadeByModuleInfo(moduleInfo!!, platform)!! val moduleDescriptor = resolutionFacade.moduleDescriptor - Assert.assertEquals("<$expectedName>", moduleDescriptor.name.asString()) + Assert.assertEquals("<$expectedName>", moduleDescriptor.stableName?.asString()) } private fun assertAllModulesConfigured() { diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 index 2c1f5f3c2e9..d00e3998357 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 @@ -1984,7 +1984,7 @@ compileTestKotlin { val resolutionFacade = KotlinCacheService.getInstance(myProject).getResolutionFacadeByModuleInfo(moduleInfo!!, platform)!! val moduleDescriptor = resolutionFacade.moduleDescriptor - Assert.assertEquals("<$expectedName>", moduleDescriptor.name.asString()) + Assert.assertEquals("<$expectedName>", moduleDescriptor.stableName?.asString()) } private fun assertAllModulesConfigured() { diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 index 2c1f5f3c2e9..d00e3998357 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 @@ -1984,7 +1984,7 @@ compileTestKotlin { val resolutionFacade = KotlinCacheService.getInstance(myProject).getResolutionFacadeByModuleInfo(moduleInfo!!, platform)!! val moduleDescriptor = resolutionFacade.moduleDescriptor - Assert.assertEquals("<$expectedName>", moduleDescriptor.name.asString()) + Assert.assertEquals("<$expectedName>", moduleDescriptor.stableName?.asString()) } private fun assertAllModulesConfigured() { diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt index ee8daac7c19..95272fac39e 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt @@ -2898,7 +2898,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() { val resolutionFacade = KotlinCacheService.getInstance(myProject).getResolutionFacadeByModuleInfo(moduleInfo!!, platform)!! val moduleDescriptor = resolutionFacade.moduleDescriptor - Assert.assertEquals("<$expectedName>", moduleDescriptor.name.asString()) + Assert.assertEquals("<$expectedName>", moduleDescriptor.stableName?.asString()) } private fun assertImporterStatePresent() {