diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt index a3cd2defaa7..49eb58e83b5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt @@ -30,6 +30,8 @@ import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.configureKotlinFacet import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.jetbrains.kotlin.utils.KotlinPaths +import org.jetbrains.kotlin.utils.PathUtil import org.junit.runner.RunWith import java.io.File @@ -166,7 +168,7 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( } fun testAddKotlinReflect() { - configureRuntime("mockRuntime11") + configureRuntime("actualRuntime") myFixture.configureByText( "foo.kt", """class Foo(val prop: Any) { fun func() {} @@ -185,8 +187,12 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( private fun configureRuntime(path: String) { val name = if (path == "mockRuntime106") "kotlin-runtime.jar" else "kotlin-stdlib.jar" + val sourcePath = when (path) { + "actualRuntime" -> PathUtil.kotlinPathsForIdeaPlugin.jar(KotlinPaths.Jar.StdLib) + else -> File("idea/testData/configuration/$path/$name") + } val tempFile = File(FileUtil.createTempDirectory("kotlin-update-configuration", null), name) - FileUtil.copy(File("idea/testData/configuration/$path/$name"), tempFile) + FileUtil.copy(sourcePath, tempFile) val tempVFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tempFile) ?: error("Can't find file: $tempFile") updateModel(myFixture.module) { model -> diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt.191 b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt.191 index d9089edb6b4..867b9d48527 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt.191 +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt.191 @@ -30,6 +30,8 @@ import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.configureKotlinFacet import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.jetbrains.kotlin.utils.KotlinPaths +import org.jetbrains.kotlin.utils.PathUtil import org.junit.runner.RunWith import java.io.File @@ -169,7 +171,7 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( } fun testAddKotlinReflect() { - configureRuntime("mockRuntime11") + configureRuntime("actualRuntime") myFixture.configureByText( "foo.kt", """class Foo(val prop: Any) { fun func() {} @@ -188,8 +190,12 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( private fun configureRuntime(path: String) { val name = if (path == "mockRuntime106") "kotlin-runtime.jar" else "kotlin-stdlib.jar" + val sourcePath = when (path) { + "actualRuntime" -> PathUtil.kotlinPathsForIdeaPlugin.jar(KotlinPaths.Jar.StdLib) + else -> File("idea/testData/configuration/$path/$name") + } val tempFile = File(FileUtil.createTempDirectory("kotlin-update-configuration", null), name) - FileUtil.copy(File("idea/testData/configuration/$path/$name"), tempFile) + FileUtil.copy(sourcePath, tempFile) val tempVFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tempFile) ?: error("Can't find file: $tempFile") updateModel(myFixture.module) { model ->