From 22439250e221ffad7dac3364d42453ce6b894eb8 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 3 May 2018 10:25:53 +0200 Subject: [PATCH] Use kts file extension instead of kt in tests... since all "kt" files are now considered - definitely non-scripts --- .../codegen/scriptCustom/{fib.lang.kt => fib.lang.kts} | 0 .../scriptCustom/{fibwp.lang.kt => fibwp.lang.kts} | 0 ...dWithClosure.lang.kt => methodWithClosure.lang.kts} | 0 .../org/jetbrains/kotlin/codegen/ScriptGenTest.kt | 10 +++++----- 4 files changed, 5 insertions(+), 5 deletions(-) rename compiler/testData/codegen/scriptCustom/{fib.lang.kt => fib.lang.kts} (100%) rename compiler/testData/codegen/scriptCustom/{fibwp.lang.kt => fibwp.lang.kts} (100%) rename compiler/testData/codegen/scriptCustom/{methodWithClosure.lang.kt => methodWithClosure.lang.kts} (100%) diff --git a/compiler/testData/codegen/scriptCustom/fib.lang.kt b/compiler/testData/codegen/scriptCustom/fib.lang.kts similarity index 100% rename from compiler/testData/codegen/scriptCustom/fib.lang.kt rename to compiler/testData/codegen/scriptCustom/fib.lang.kts diff --git a/compiler/testData/codegen/scriptCustom/fibwp.lang.kt b/compiler/testData/codegen/scriptCustom/fibwp.lang.kts similarity index 100% rename from compiler/testData/codegen/scriptCustom/fibwp.lang.kt rename to compiler/testData/codegen/scriptCustom/fibwp.lang.kts diff --git a/compiler/testData/codegen/scriptCustom/methodWithClosure.lang.kt b/compiler/testData/codegen/scriptCustom/methodWithClosure.lang.kts similarity index 100% rename from compiler/testData/codegen/scriptCustom/methodWithClosure.lang.kt rename to compiler/testData/codegen/scriptCustom/methodWithClosure.lang.kts diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt index 29031a9741c..142380f3c8d 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt @@ -50,7 +50,7 @@ class ScriptGenTest : CodegenTestCase() { } fun testLanguage() { - setUpEnvironment("scriptCustom/fib.lang.kt") + setUpEnvironment("scriptCustom/fib.lang.kts") val aClass = generateClass("Fib_lang") val constructor = aClass.getConstructor(Integer.TYPE) @@ -61,7 +61,7 @@ class ScriptGenTest : CodegenTestCase() { } fun testLanguageWithPackage() { - setUpEnvironment("scriptCustom/fibwp.lang.kt") + setUpEnvironment("scriptCustom/fibwp.lang.kts") val aClass = generateClass("test.Fibwp_lang") val constructor = aClass.getConstructor(Integer.TYPE) @@ -72,7 +72,7 @@ class ScriptGenTest : CodegenTestCase() { } fun testDependentScripts() { - setUpEnvironment(listOf("scriptCustom/fibwp.lang.kt", "scriptCustom/fibwprunner.kts")) + setUpEnvironment(listOf("scriptCustom/fibwp.lang.kts", "scriptCustom/fibwprunner.kts")) val aClass = generateClass("Fibwprunner") val constructor = aClass.getConstructor() @@ -88,7 +88,7 @@ class ScriptGenTest : CodegenTestCase() { } fun testScriptWhereMethodHasClosure() { - setUpEnvironment("scriptCustom/methodWithClosure.lang.kt") + setUpEnvironment("scriptCustom/methodWithClosure.lang.kts") val aClass = generateClass("MethodWithClosure_lang") val constructor = aClass.getConstructor(Integer.TYPE) @@ -127,6 +127,6 @@ class ScriptGenTest : CodegenTestCase() { } @ScriptTemplateDefinition( - scriptFilePattern =".*\\.lang\\.kt", + scriptFilePattern =".*\\.lang\\.kts", resolver = TestKotlinScriptDependenciesResolver::class) abstract class ScriptWithIntParam(val num: Int) \ No newline at end of file