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

[test] Exclude "K1-only" from FIR IR text tests and "K2-only" from Classic IR text tests

Browse Source 
^KT-60390
This commit is contained in:
Dmitriy Dolovov
2023-12-12 11:48:45 +01:00
committed by Space Team
parent 44d57c7751
commit b5d8db0267
12 changed files with 63 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
+12 -3
View File
@@ -232,15 +232,24 @@ fun main(args: Array<String>) {
}
testClass<AbstractClassicJsIrTextTest> {
model("ir/irText")
model(
"ir/irText",
excludeDirs = listOf("declarations/multiplatform/k2")
)
}
testClass<AbstractFirLightTreeJsIrTextTest> {
model("ir/irText")
model(
"ir/irText",
excludeDirs = listOf("declarations/multiplatform/k1")
)
}
testClass<AbstractFirPsiJsIrTextTest> {
model("ir/irText")
model(
"ir/irText",
excludeDirs = listOf("declarations/multiplatform/k1")
)
}
testClass<AbstractFirJsCodegenBoxTest> {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java
Generated
+3 -43
View File
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrTextTest {
@Test
public void testAllFilesPresentInIrText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "declarations/multiplatform/k1");
}
@Nested
@@ -363,7 +363,7 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrT
public class Declarations {
@Test
public void testAllFilesPresentInDeclarations() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "multiplatform/k1");
}
@Test
@@ -938,47 +938,7 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrT
public class Multiplatform {
@Test
public void testAllFilesPresentInMultiplatform() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Nested
@TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k1")
@TestDataPath("$PROJECT_ROOT")
public class K1 {
@Test
public void testAllFilesPresentInK1() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k1"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("expectClassInherited.kt")
public void testExpectClassInherited() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt");
}
@Test
@TestMetadata("expectIntersectionOverride.kt")
public void testExpectIntersectionOverride() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectIntersectionOverride.kt");
}
@Test
@TestMetadata("expectMemberInNotExpectClass.kt")
public void testExpectMemberInNotExpectClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt");
}
@Test
@TestMetadata("expectedEnumClass.kt")
public void testExpectedEnumClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt");
}
@Test
@TestMetadata("expectedSealedClass.kt")
public void testExpectedSealedClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
}
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "k1");
}
@Nested
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java
Generated
+3 -43
View File
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest {
@Test
public void testAllFilesPresentInIrText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "declarations/multiplatform/k1");
}
@Nested
@@ -363,7 +363,7 @@ public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest {
public class Declarations {
@Test
public void testAllFilesPresentInDeclarations() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "multiplatform/k1");
}
@Test
@@ -938,47 +938,7 @@ public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest {
public class Multiplatform {
@Test
public void testAllFilesPresentInMultiplatform() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Nested
@TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k1")
@TestDataPath("$PROJECT_ROOT")
public class K1 {
@Test
public void testAllFilesPresentInK1() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k1"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("expectClassInherited.kt")
public void testExpectClassInherited() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt");
}
@Test
@TestMetadata("expectIntersectionOverride.kt")
public void testExpectIntersectionOverride() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectIntersectionOverride.kt");
}
@Test
@TestMetadata("expectMemberInNotExpectClass.kt")
public void testExpectMemberInNotExpectClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt");
}
@Test
@TestMetadata("expectedEnumClass.kt")
public void testExpectedEnumClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt");
}
@Test
@TestMetadata("expectedSealedClass.kt")
public void testExpectedSealedClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
}
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "k1");
}
@Nested
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java
Generated
+3 -43
View File
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
@Test
public void testAllFilesPresentInIrText() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "declarations/multiplatform/k2");
}
@Nested
@@ -363,7 +363,7 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
public class Declarations {
@Test
public void testAllFilesPresentInDeclarations() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "multiplatform/k2");
}
@Test
@@ -938,7 +938,7 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
public class Multiplatform {
@Test
public void testAllFilesPresentInMultiplatform() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "k2");
}
@Nested
@@ -980,46 +980,6 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
}
}
@Nested
@TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k2")
@TestDataPath("$PROJECT_ROOT")
public class K2 {
@Test
public void testAllFilesPresentInK2() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("expectClassInherited.kt")
public void testExpectClassInherited() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectClassInherited.kt");
}
@Test
@TestMetadata("expectIntersectionOverride.kt")
public void testExpectIntersectionOverride() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt");
}
@Test
@TestMetadata("expectMemberInNotExpectClass.kt")
public void testExpectMemberInNotExpectClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt");
}
@Test
@TestMetadata("expectedEnumClass.kt")
public void testExpectedEnumClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt");
}
@Test
@TestMetadata("expectedSealedClass.kt")
public void testExpectedSealedClass() throws Exception {
runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectedSealedClass.kt");
}
}
}
@Nested