From 600381dd2ddb120dbe38db4fd29599c63eb57fdb Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Mon, 13 Jul 2020 10:33:42 +0200
Subject: [PATCH] Fixed ScriptConfigurationTest

GitOrigin-RevId: 9eda247ccf4d9ad873831eb1a926258340cc134f
---
 .../idea/script/AbstractScriptConfigurationTest.kt  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
index fd898bda9ffc..6bedfe0c4dea 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
@@ -33,13 +33,10 @@ import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
 import org.jetbrains.kotlin.test.KotlinCompilerStandalone
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.TestJdkKind
-import org.jetbrains.kotlin.test.TestMetadata
 import org.jetbrains.kotlin.test.util.addDependency
 import org.jetbrains.kotlin.test.util.projectLibrary
 import java.io.File
 import java.nio.file.Paths
-import java.util.regex.Pattern
-import kotlin.reflect.full.findAnnotation
 import kotlin.script.dependencies.Environment
 import kotlin.script.experimental.api.ScriptDiagnostic
 
@@ -189,7 +186,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
     }
 
     private fun createScriptEnvironment(scriptFile: File): Environment {
-        val defaultEnvironment = defaultEnvironment(scriptFile.parent + File.separator)
+        val defaultEnvironment = defaultEnvironment(scriptFile.parent)
         val env = mutableMapOf<String, Any?>()
         scriptFile.forEachLine { line ->
 
@@ -236,17 +233,19 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
     }
 
     private fun defaultEnvironment(path: String): Map<String, File?> {
-        val templateOutDir = File("${path}template").takeIf { it.isDirectory }?.let {
+        val templateOutDir = File(path, "template").takeIf { it.isDirectory }?.let {
             compileLibToDir(it, getScriptingClasspath())
-        } ?: File("idea/testData/script/definition/defaultTemplate").takeIf { it.isDirectory }?.let {
+        } ?: testDataFile("../defaultTemplate").takeIf { it.isDirectory }?.let {
             compileLibToDir(it, getScriptingClasspath())
         }
 
         if (templateOutDir != null) {
             System.setProperty("kotlin.script.classpath", templateOutDir.path)
+        } else {
+            LOG.warn("templateOutDir is not found")
         }
 
-        val libSrcDir = File("${path}lib").takeIf { it.isDirectory }
+        val libSrcDir = File(path, "lib").takeIf { it.isDirectory }
 
         val libClasses = libSrcDir?.let { compileLibToDir(it, emptyList()) }