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

[JS IR] Enable all K2 klib IC tests

Browse Source
This commit is contained in:
Alexander Korepanov
2023-05-03 16:49:05 +02:00
committed by Space Team
parent 1fb8293968
commit 6f7fc14695
3 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt
+3
View File
@@ -32,4 +32,7 @@ abstract class AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest
languageVersion = "2.0"
}
}
override val buildLogFinder: BuildLogFinder
get() = super.buildLogFinder.copy(isFirEnabled = true)
}
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated.java
Generated
+45 -10
View File
@@ -58,7 +58,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInPureKotlin() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(sealed|propertyRedeclaration|funRedeclaration|funVsConstructorOverloadConflict).*"), false);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(sealed|fileWithConstantRemoved).*"), false);
}
@TestMetadata("annotations")
@@ -216,11 +216,6 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
runTest("jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/");
}
@TestMetadata("fileWithConstantRemoved")
public void testFileWithConstantRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/");
}
@TestMetadata("fileWithInlineFunctionRemoved")
public void testFileWithInlineFunctionRemoved() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/");
@@ -231,6 +226,16 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
runTest("jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/");
}
@TestMetadata("funRedeclaration")
public void testFunRedeclaration() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/");
}
@TestMetadata("funVsConstructorOverloadConflict")
public void testFunVsConstructorOverloadConflict() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/");
}
@TestMetadata("functionBecameInline")
public void testFunctionBecameInline() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/");
@@ -511,6 +516,11 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
runTest("jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/");
}
@TestMetadata("propertyRedeclaration")
public void testPropertyRedeclaration() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/");
}
@TestMetadata("publicPropertyWithPrivateSetter")
public void testPublicPropertyWithPrivateSetter() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/");
@@ -651,7 +661,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInClassHierarchyAffected() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(secondaryConstructorAdded|withIntermediateBodiesChanged|companionObjectNameChanged).*"), false);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), null, false);
}
@TestMetadata("annotationFlagRemoved")
@@ -709,6 +719,11 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/");
}
@TestMetadata("companionObjectNameChanged")
public void testCompanionObjectNameChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/");
}
@TestMetadata("companionObjectToSimpleObject")
public void testCompanionObjectToSimpleObject() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/");
@@ -824,6 +839,11 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/");
}
@TestMetadata("secondaryConstructorAdded")
public void testSecondaryConstructorAdded() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/");
}
@TestMetadata("starProjectionUpperBoundChanged")
public void testStarProjectionUpperBoundChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/");
@@ -843,6 +863,11 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
public void testVarianceChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/");
}
@TestMetadata("withIntermediateBodiesChanged")
public void testWithIntermediateBodiesChanged() throws Exception {
runTest("jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/");
}
}
@TestMetadata("jps/jps-plugin/testData/incremental/js")
@@ -916,7 +941,17 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInScopeExpansion() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion"), Pattern.compile("^([^\\.]+)$"), null, true);
}
@TestMetadata("changeTypeAliasAndUsage")
public void testChangeTypeAliasAndUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/");
}
@TestMetadata("protectedBecomesPublicAccessedTroughChild")
public void testProtectedBecomesPublicAccessedTroughChild() throws Exception {
runTest("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/");
}
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage")
@@ -928,7 +963,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInChangeTypeAliasAndUsage() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
@@ -941,7 +976,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInProtectedBecomesPublicAccessedTroughChild() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild"), Pattern.compile("^([^\\.]+)$"), null, true);
}
}
}
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+4 -6
View File
@@ -131,14 +131,12 @@ fun main(args: Array<String>) {
testClass<AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest> {
// IC of sealed interfaces are not supported in JS
// Some IC tests fail with K2
model("incremental/pureKotlin", extension = null, recursive = false,
excludedPattern = "^(sealed|propertyRedeclaration|funRedeclaration|funVsConstructorOverloadConflict).*")
model("incremental/classHierarchyAffected", extension = null, recursive = false,
excludedPattern = "^(secondaryConstructorAdded|withIntermediateBodiesChanged|companionObjectNameChanged).*")
// TODO: 'fileWithConstantRemoved' should be fixed in https://youtrack.jetbrains.com/issue/KT-58824
excludedPattern = "^(sealed|fileWithConstantRemoved).*")
model("incremental/classHierarchyAffected", extension = null, recursive = false)
model("incremental/js", extension = null, excludeParentDirs = true)
model("incremental/scopeExpansion", extension = null, excludeParentDirs = true,
excludedPattern = "^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*")
model("incremental/scopeExpansion", extension = null, excludeParentDirs = true)
}
testClass<AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest> {