jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TEST] Mute tests in IC JS Klib tests using exclude pattern instead of .mute file

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-15 15:45:01 +03:00
parent d9848544dc
commit f8ad096abb
9 changed files with 7 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java generated
View File

@@ -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/");

29
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java generated
View File

@@ -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/");

7
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
View File

@@ -194,7 +194,6 @@ import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnostic
fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true")
generateTestGroupSuite(args) {
testGroup("idea/jvm-debugger/jvm-debugger-test/test", "idea/jvm-debugger/jvm-debugger-test/testData") {
testClass<AbstractKotlinSteppingTest> {
@@ -1530,7 +1529,8 @@ fun main(args: Array<String>) {
}
testClass<AbstractIncrementalJsKlibCompilerRunnerTest>(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<String>) {
}
testClass<AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest> {
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)

2
idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java generated
View File

@@ -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");
}

1
jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute vendored
View File

@@ -1 +0,0 @@
IC of sealed interfaces are not supported in JS

1
jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute vendored
View File

@@ -1 +0,0 @@
IC of sealed interfaces are not supported in JS

1
jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute vendored
View File

@@ -1 +0,0 @@
IC of sealed interfaces are not supported in JS

1
jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute vendored
View File

@@ -1 +0,0 @@
IC of sealed interfaces are not supported in JS

1
jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute vendored
View File

@@ -1 +0,0 @@
IC of sealed interfaces are not supported in JS