From 71d847841e91d412238d65c78a85b021965bc489 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 9 Jan 2020 23:41:37 +0300
Subject: [PATCH] Use real kotlin-stdlib jar in addKotlinReflect configuration
 test

The presence of "Add kotlin-reflect.jar..." action depends on whether the API
that requires full kotlin-reflect is actually resolved. Since builtins now
do not contain the entire JVM reflect API, but rather the common one,
we need a real kotlin-stdlib instead of dummy one to have 'KProperty1.getter'
symbol resolved.
---
 .../idea/quickfix/UpdateConfigurationQuickFixTest.kt   | 10 ++++++++--
 .../quickfix/UpdateConfigurationQuickFixTest.kt.191    | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

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 ->