diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java index 0e22e12c759..e41953956c9 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java @@ -64,7 +64,7 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs } public void testAllFilesPresentInPureKotlin() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^.*Expect.*"), TargetBackend.JVM_IR, false); } @TestMetadata("annotations") @@ -622,11 +622,6 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); } - @TestMetadata("sealedClassesWithExpectActual") - public void testSealedClassesWithExpectActual() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); - } - @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java index 97bff33b263..46fe6f1bc8d 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java @@ -64,7 +64,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem } public void testAllFilesPresentInPureKotlin() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^.*Expect.*"), TargetBackend.JVM_IR, false); } @TestMetadata("annotations") @@ -622,11 +622,6 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); } - @TestMetadata("sealedClassesWithExpectActual") - public void testSealedClassesWithExpectActual() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); - } - @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java index 501327dd0e9..47de6426261 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java @@ -64,7 +64,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr } public void testAllFilesPresentInPureKotlin() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^.*Expect.*"), TargetBackend.JVM_IR, false); } @TestMetadata("annotations") @@ -622,11 +622,6 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); } - @TestMetadata("sealedClassesWithExpectActual") - public void testSealedClassesWithExpectActual() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); - } - @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index fecceb26c9a..31fc34a4b72 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -44,8 +44,8 @@ fun main(args: Array) { System.setProperty("java.awt.headless", "true") generateTestGroupSuite(args) { testGroup("compiler/incremental-compilation-impl/test", "jps/jps-plugin/testData") { - fun incrementalJvmTestData(targetBackend: TargetBackend): TestGroup.TestClass.() -> Unit = { - model("incremental/pureKotlin", extension = null, recursive = false, targetBackend = targetBackend) + fun incrementalJvmTestData(targetBackend: TargetBackend, excludePattern: String? = null): TestGroup.TestClass.() -> Unit = { + model("incremental/pureKotlin", extension = null, recursive = false, targetBackend = targetBackend, excludedPattern = excludePattern) model("incremental/classHierarchyAffected", extension = null, recursive = false, targetBackend = targetBackend) model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true, targetBackend = targetBackend) model("incremental/withJava", extension = null, excludeParentDirs = true, targetBackend = targetBackend) @@ -53,9 +53,9 @@ fun main(args: Array) { } testClass(init = incrementalJvmTestData(TargetBackend.JVM_IR)) testClass(init = incrementalJvmTestData(TargetBackend.JVM)) - testClass(init = incrementalJvmTestData(TargetBackend.JVM_IR)) - testClass(init = incrementalJvmTestData(TargetBackend.JVM_IR)) - testClass(init = incrementalJvmTestData(TargetBackend.JVM_IR)) + testClass(init = incrementalJvmTestData(TargetBackend.JVM_IR, excludePattern = "^.*Expect.*")) + testClass(init = incrementalJvmTestData(TargetBackend.JVM_IR, excludePattern = "^.*Expect.*")) + testClass(init = incrementalJvmTestData(TargetBackend.JVM_IR, excludePattern = "^.*Expect.*")) testClass { model("incremental/pureKotlin", extension = null, recursive = false)