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

Revert unmuting unfixed test - companionConstantChanged

Browse Source 
incorrectly unmuted i the commit "FIR: fix use-site file in supertypes
resolution"
related to #KT-56242
This commit is contained in:
Ilya Chernikov
2023-01-27 12:45:28 +01:00
committed by Space Team
parent 45213e1468
commit e4529f38ac
4 changed files with 9 additions and 24 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
+3 -3
View File
@@ -57,19 +57,19 @@ fun main(args: Array<String>) {
testClass<AbstractIncrementalK2JvmJpsTest>( testClass<AbstractIncrementalK2JvmJpsTest>(
init = incrementalJvmTestData( init = incrementalJvmTestData(
TargetBackend.JVM_IR, TargetBackend.JVM_IR,
excludePattern = "(^.*Expect.*)" excludePattern = "(^.*Expect.*)|(^companionConstantChanged)"
) )
) )
testClass<AbstractIncrementalK2LightTreeJvmJpsTest>( testClass<AbstractIncrementalK2LightTreeJvmJpsTest>(
init = incrementalJvmTestData( init = incrementalJvmTestData(
TargetBackend.JVM_IR, TargetBackend.JVM_IR,
excludePattern = "(^.*Expect.*)" excludePattern = "(^.*Expect.*)|(^companionConstantChanged)"
) )
) )
testClass<AbstractIncrementalK2FirICLightTreeJvmJpsTest>( testClass<AbstractIncrementalK2FirICLightTreeJvmJpsTest>(
init = incrementalJvmTestData( init = incrementalJvmTestData(
TargetBackend.JVM_IR, TargetBackend.JVM_IR,
excludePattern = "(^.*Expect.*)" excludePattern = "(^.*Expect.*)|(^companionConstantChanged)"
) )
) )
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2FirICLightTreeJvmJpsTestGenerated.java
Generated
+2 -7
View File
@@ -64,7 +64,7 @@ public class IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
} }
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.*)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotations") @TestMetadata("annotations")
@@ -117,11 +117,6 @@ public class IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
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 IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
} }
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.*)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotationFlagRemoved") @TestMetadata("annotationFlagRemoved")
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2JvmJpsTestGenerated.java
Generated
+2 -7
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.*)|(^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.*)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotationFlagRemoved") @TestMetadata("annotationFlagRemoved")
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2LightTreeJvmJpsTestGenerated.java
Generated
+2 -7
View File
@@ -64,7 +64,7 @@ public class IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
} }
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.*)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotations") @TestMetadata("annotations")
@@ -117,11 +117,6 @@ public class IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
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 IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
} }
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.*)|(^companionConstantChanged)"), TargetBackend.JVM_IR, false);
} }
@TestMetadata("annotationFlagRemoved") @TestMetadata("annotationFlagRemoved")