diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index bfac6f7c569..f8ff7b067cb 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.generators.tests import junit.framework.TestCase +import org.intellij.lang.annotations.Language import org.jetbrains.kotlin.AbstractDataFlowValueRenderingTest import org.jetbrains.kotlin.addImport.AbstractAddImportTest import org.jetbrains.kotlin.android.* @@ -144,7 +145,8 @@ import java.io.File import java.util.* import java.util.regex.Pattern -private val kotlinFileOrScript = "^(.+)\\.(kt|kts)\$" +@Language("RegExp") private val KT_OR_KTS = """^(.+)\.(kt|kts)$""" +@Language("RegExp") private val KT_WITHOUT_DOTS_IN_NAME = """^([^\.]+)\.kt$""" fun main(args: Array) { System.setProperty("java.awt.headless", "true") @@ -577,7 +579,7 @@ fun main(args: Array) { } testClass() { - model("resolve/references", pattern = """^([^\.]+)\.kt$""") + model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass() { @@ -669,8 +671,8 @@ fun main(args: Array) { } testClass() { - model("copyPaste/imports", pattern = """^([^\.]+)\.kt$""", testMethod = "doTestCopy", testClassName = "Copy", recursive = false) - model("copyPaste/imports", pattern = """^([^\.]+)\.kt$""", testMethod = "doTestCut", testClassName = "Cut", recursive = false) + model("copyPaste/imports", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doTestCopy", testClassName = "Copy", recursive = false) + model("copyPaste/imports", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doTestCut", testClassName = "Cut", recursive = false) } testClass() { @@ -682,22 +684,22 @@ fun main(args: Array) { } testClass() { - model("shortenRefs", pattern = """^([^\.]+)\.kt$""") + model("shortenRefs", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass() { - model("addImport", pattern = """^([^\.]+)\.kt$""") + model("addImport", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass() { - model("smartSelection", testMethod = "doTestSmartSelection", pattern = """^([^\.]+)\.kt$""") + model("smartSelection", testMethod = "doTestSmartSelection", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass() { - model("structureView/fileStructure", pattern = """^([^\.]+)\.kt$""") + model("structureView/fileStructure", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass() { - model("expressionSelection", testMethod = "doTestExpressionSelection", pattern = """^([^\.]+)\.kt$""") + model("expressionSelection", testMethod = "doTestExpressionSelection", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass(AbstractCommonDecompiledTextTest::class.java) { @@ -721,7 +723,7 @@ fun main(args: Array) { } testClass() { - model("editor/optimizeImports", pattern = """^([^\.]+)\.kt$""") + model("editor/optimizeImports", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass() { @@ -765,13 +767,13 @@ fun main(args: Array) { } testClass() { - model("refactoring/introduceVariable", pattern = kotlinFileOrScript, testMethod = "doIntroduceVariableTest") - model("refactoring/extractFunction", pattern = kotlinFileOrScript, testMethod = "doExtractFunctionTest") - model("refactoring/introduceProperty", pattern = kotlinFileOrScript, testMethod = "doIntroducePropertyTest") - model("refactoring/introduceParameter", pattern = kotlinFileOrScript, testMethod = "doIntroduceSimpleParameterTest") - model("refactoring/introduceLambdaParameter", pattern = kotlinFileOrScript, testMethod = "doIntroduceLambdaParameterTest") + model("refactoring/introduceVariable", pattern = KT_OR_KTS, testMethod = "doIntroduceVariableTest") + model("refactoring/extractFunction", pattern = KT_OR_KTS, testMethod = "doExtractFunctionTest") + model("refactoring/introduceProperty", pattern = KT_OR_KTS, testMethod = "doIntroducePropertyTest") + model("refactoring/introduceParameter", pattern = KT_OR_KTS, testMethod = "doIntroduceSimpleParameterTest") + model("refactoring/introduceLambdaParameter", pattern = KT_OR_KTS, testMethod = "doIntroduceLambdaParameterTest") model("refactoring/introduceJavaParameter", extension = "java", testMethod = "doIntroduceJavaParameterTest") - model("refactoring/introduceTypeAlias", pattern = kotlinFileOrScript, testMethod = "doIntroduceTypeAliasTest") + model("refactoring/introduceTypeAlias", pattern = KT_OR_KTS, testMethod = "doIntroduceTypeAliasTest") } testClass() { @@ -853,7 +855,7 @@ fun main(args: Array) { } testClass { - model("asJava/lightClasses", pattern = """^([^\.]+)\.kt$""") + model("asJava/lightClasses", pattern = KT_WITHOUT_DOTS_IN_NAME) } } @@ -867,11 +869,11 @@ fun main(args: Array) { } testClass() { - model("weighers/basic", pattern = """^([^\.]+)\.kt$""") + model("weighers/basic", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass() { - model("weighers/smart", pattern = """^([^\.]+)\.kt$""") + model("weighers/smart", pattern = KT_WITHOUT_DOTS_IN_NAME) } testClass() {