diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java index f9b1a487a46..a2ebc94ad72 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java @@ -64,7 +64,7 @@ public class IncrementalJsKlibCompilerRunnerTestGenerated extends AbstractIncrem } public void testAllFilesPresentInPureKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, false); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^sealed.*"), false); } @TestMetadata("annotations") @@ -572,31 +572,6 @@ public class IncrementalJsKlibCompilerRunnerTestGenerated extends AbstractIncrem runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } - @TestMetadata("sealedClassesAddImplements") - public void testSealedClassesAddImplements() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); - } - - @TestMetadata("sealedClassesAddInheritor") - public void testSealedClassesAddInheritor() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); - } - - @TestMetadata("sealedClassesRemoveImplements") - public void testSealedClassesRemoveImplements() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); - } - - @TestMetadata("sealedClassesRemoveInheritor") - public void testSealedClassesRemoveInheritor() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); - } - - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); - } - @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java index 4e71e9f4dc3..167f494865b 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.incremental; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.MuteExtraSuffix; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -20,7 +19,6 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { @TestMetadata("jps-plugin/testData/incremental/pureKotlin") - @MuteExtraSuffix(".jsklib") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { @@ -64,7 +62,7 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte } public void testAllFilesPresentInPureKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, false); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^sealed.*"), false); } @TestMetadata("annotations") @@ -572,31 +570,6 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } - @TestMetadata("sealedClassesAddImplements") - public void testSealedClassesAddImplements() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); - } - - @TestMetadata("sealedClassesAddInheritor") - public void testSealedClassesAddInheritor() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); - } - - @TestMetadata("sealedClassesRemoveImplements") - public void testSealedClassesRemoveImplements() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); - } - - @TestMetadata("sealedClassesRemoveInheritor") - public void testSealedClassesRemoveInheritor() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); - } - - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); - } - @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("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 066125041f5..9a4fe629763 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -194,7 +194,6 @@ import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnostic fun main(args: Array) { System.setProperty("java.awt.headless", "true") - generateTestGroupSuite(args) { testGroup("idea/jvm-debugger/jvm-debugger-test/test", "idea/jvm-debugger/jvm-debugger-test/testData") { testClass { @@ -1530,7 +1529,8 @@ fun main(args: Array) { } testClass(annotations = listOf(muteExtraSuffix(".jsklib"))) { - model("incremental/pureKotlin", extension = null, recursive = false) + // IC of sealed interfaces are not supported in JS + model("incremental/pureKotlin", extension = null, recursive = false, excludedPattern = "^sealed.*") model("incremental/classHierarchyAffected", extension = null, recursive = false) model("incremental/js", extension = null, excludeParentDirs = true) } @@ -1542,7 +1542,8 @@ fun main(args: Array) { } testClass { - model("incremental/pureKotlin", extension = null, recursive = false) + // IC of sealed interfaces are not supported in JS + model("incremental/pureKotlin", extension = null, recursive = false, excludedPattern = "^sealed.*") model("incremental/classHierarchyAffected", extension = null, recursive = false) model("incremental/js", extension = null, excludeParentDirs = true) model("incremental/scopeExpansion", extension = null, excludeParentDirs = true) diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java index 8b7ec2a5965..bb86570616d 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java @@ -606,7 +606,7 @@ public class IrKotlinEvaluateExpressionTestGenerated extends AbstractIrKotlinEva runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/coroutines/anyUpdateVariable.kt"); } - @TestMetadata("capturedReceiverName.kt") + @TestMetadata("capturedReceiverName.kt") public void testCapturedReceiverName() throws Exception { runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/coroutines/capturedReceiverName.kt"); } diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS