azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate and mute JPS+K2 Tests

Browse Source 
#KT-55195 Related
This commit is contained in:
Aleksei.Cherepanov
2023-01-11 12:05:33 +01:00
parent 32b98135a9
commit c120b185af
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/GenerateJpsPluginTests.kt
+6 -1
View File
@@ -54,7 +54,12 @@ fun main(args: Array<String>) {
} }
// K2 // K2
testClass<AbstractIncrementalK2JvmJpsTest>(init = incrementalJvmTestData(TargetBackend.JVM_IR, excludePattern = "^.*Expect.*")) testClass<AbstractIncrementalK2JvmJpsTest>(
init = incrementalJvmTestData(
TargetBackend.JVM_IR,
excludePattern = "(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"
)
)
testClass<AbstractIncrementalK2LightTreeJvmJpsTest>( testClass<AbstractIncrementalK2LightTreeJvmJpsTest>(
init = incrementalJvmTestData( init = incrementalJvmTestData(
TargetBackend.JVM_IR, TargetBackend.JVM_IR,
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2JvmJpsTestGenerated.java
Generated
+2 -12
View File
@@ -64,7 +64,7 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
} }
public void testAllFilesPresentInPureKotlin() throws Exception { public void testAllFilesPresentInPureKotlin() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^.*Expect.*"), TargetBackend.JVM_IR, false); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotations") @TestMetadata("annotations")
@@ -117,11 +117,6 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
runTest("jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); runTest("jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
} }
@TestMetadata("companionConstantChanged")
public void testCompanionConstantChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/");
}
@TestMetadata("compilationErrorThenFixedOtherPackage") @TestMetadata("compilationErrorThenFixedOtherPackage")
public void testCompilationErrorThenFixedOtherPackage() throws Exception { public void testCompilationErrorThenFixedOtherPackage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/"); runTest("jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/");
@@ -697,7 +692,7 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
} }
public void testAllFilesPresentInClassHierarchyAffected() throws Exception { public void testAllFilesPresentInClassHierarchyAffected() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^.*Expect.*"), TargetBackend.JVM_IR, false); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("(^.*Expect.*)|(^classMovedIntoOtherClass)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotationFlagRemoved") @TestMetadata("annotationFlagRemoved")
@@ -730,11 +725,6 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/"); runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/");
} }
@TestMetadata("classMovedIntoOtherClass")
public void testClassMovedIntoOtherClass() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/");
}
@TestMetadata("classRemoved") @TestMetadata("classRemoved")
public void testClassRemoved() throws Exception { public void testClassRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/"); runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/");