From 1fa74ef939774163c75d426413ebdf0a21456841 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 15 Jul 2021 16:10:41 +0300 Subject: [PATCH] [Test] Move test on modern jdk to separate test runners This is needed to avoid problems with installation of proper jdk on developer machines. Those tests will be moved back to main box suites after migrating our tests on LTS versions of jdk (11 and 17 instead of 9 and 15) --- .../FirBlackBoxCodegenTestGenerated.java | 165 --------------- .../testsWithJava15/_tags.txt | 0 .../records/bytecodeShapeForJava.kt | 0 .../records/collectionSizeOverrides.kt | 0 .../testsWithJava15/records/dataJvmRecord.kt | 0 .../records/jvmRecordBinary.kt | 0 .../records/propertiesOverrides.kt | 0 ...tiesOverridesAllCompatibilityJvmDefault.kt | 0 .../propertiesOverridesEnableJvmDefault.kt | 0 .../recordDifferentPropertyOverride.kt | 0 .../recordDifferentSyntheticProperty.kt | 0 .../records/recordPropertyAccess.kt | 0 .../testsWithJava9/_tags.txt | 0 .../testsWithJava9/concatDynamic.kt | 0 .../testsWithJava9/concatDynamic200.kt | 0 .../testsWithJava9/concatDynamic200Long.kt | 0 .../testsWithJava9/concatDynamic201.kt | 0 .../testsWithJava9/concatDynamicIndy200.kt | 0 .../concatDynamicIndy200Long.kt | 0 .../testsWithJava9/concatDynamicIndy201.kt | 0 .../concatDynamicInlineClasses.kt | 0 .../concatDynamicSpecialSymbols.kt | 0 .../testsWithJava9/concatDynamicWithInline.kt | 0 .../testsWithJava9/kt36984.kt | 0 .../testsWithJava9/varHandle.kt | 0 .../codegen/BlackBoxCodegenTestGenerated.java | 165 --------------- ...BlackBoxModernJdkCodegenTestGenerated.java | 192 ++++++++++++++++++ .../IrBlackBoxCodegenTestGenerated.java | 165 --------------- ...BlackBoxModernJdkCodegenTestGenerated.java | 192 ++++++++++++++++++ .../AbstractJvmBlackBoxCodegenTestBase.kt | 4 +- .../generators/GenerateJUnit5CompilerTests.kt | 8 + 31 files changed, 394 insertions(+), 497 deletions(-) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/_tags.txt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/bytecodeShapeForJava.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/collectionSizeOverrides.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/dataJvmRecord.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/jvmRecordBinary.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/propertiesOverrides.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/recordDifferentPropertyOverride.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/recordDifferentSyntheticProperty.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava15/records/recordPropertyAccess.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/_tags.txt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamic.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamic200.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamic200Long.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamic201.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamicIndy200.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamicIndy200Long.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamicIndy201.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamicInlineClasses.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamicSpecialSymbols.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/concatDynamicWithInline.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/kt36984.kt (100%) rename compiler/testData/codegen/{box => boxModernJdk}/testsWithJava9/varHandle.kt (100%) create mode 100644 compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxModernJdkCodegenTestGenerated.java create mode 100644 compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java index 3918816e075..8a13adfe2e9 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Tag; import java.io.File; import java.util.regex.Pattern; @@ -41680,170 +41679,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } } - @Nested - @Tag("") - @TestMetadata("compiler/testData/codegen/box/testsWithJava15") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava15 { - @Test - public void testAllFilesPresentInTestsWithJava15() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/testsWithJava15/records") - @TestDataPath("$PROJECT_ROOT") - public class Records { - @Test - public void testAllFilesPresentInRecords() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava15/records"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("bytecodeShapeForJava.kt") - public void testBytecodeShapeForJava() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/bytecodeShapeForJava.kt"); - } - - @Test - @TestMetadata("collectionSizeOverrides.kt") - public void testCollectionSizeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/collectionSizeOverrides.kt"); - } - - @Test - @TestMetadata("dataJvmRecord.kt") - public void testDataJvmRecord() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/dataJvmRecord.kt"); - } - - @Test - @TestMetadata("jvmRecordBinary.kt") - public void testJvmRecordBinary() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/jvmRecordBinary.kt"); - } - - @Test - @TestMetadata("propertiesOverrides.kt") - public void testPropertiesOverrides() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverrides.kt"); - } - - @Test - @TestMetadata("propertiesOverridesAllCompatibilityJvmDefault.kt") - public void testPropertiesOverridesAllCompatibilityJvmDefault() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt"); - } - - @Test - @TestMetadata("propertiesOverridesEnableJvmDefault.kt") - public void testPropertiesOverridesEnableJvmDefault() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt"); - } - - @Test - @TestMetadata("recordDifferentPropertyOverride.kt") - public void testRecordDifferentPropertyOverride() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordDifferentPropertyOverride.kt"); - } - - @Test - @TestMetadata("recordDifferentSyntheticProperty.kt") - public void testRecordDifferentSyntheticProperty() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordDifferentSyntheticProperty.kt"); - } - - @Test - @TestMetadata("recordPropertyAccess.kt") - public void testRecordPropertyAccess() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordPropertyAccess.kt"); - } - } - } - - @Nested - @Tag("") - @TestMetadata("compiler/testData/codegen/box/testsWithJava9") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava9 { - @Test - public void testAllFilesPresentInTestsWithJava9() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava9"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("concatDynamic.kt") - public void testConcatDynamic() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic.kt"); - } - - @Test - @TestMetadata("concatDynamic200.kt") - public void testConcatDynamic200() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200.kt"); - } - - @Test - @TestMetadata("concatDynamic200Long.kt") - public void testConcatDynamic200Long() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200Long.kt"); - } - - @Test - @TestMetadata("concatDynamic201.kt") - public void testConcatDynamic201() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic201.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy200.kt") - public void testConcatDynamicIndy200() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy200Long.kt") - public void testConcatDynamicIndy200Long() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200Long.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy201.kt") - public void testConcatDynamicIndy201() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy201.kt"); - } - - @Test - @TestMetadata("concatDynamicInlineClasses.kt") - public void testConcatDynamicInlineClasses() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicInlineClasses.kt"); - } - - @Test - @TestMetadata("concatDynamicSpecialSymbols.kt") - public void testConcatDynamicSpecialSymbols() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicSpecialSymbols.kt"); - } - - @Test - @TestMetadata("concatDynamicWithInline.kt") - public void testConcatDynamicWithInline() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicWithInline.kt"); - } - - @Test - @TestMetadata("kt36984.kt") - public void testKt36984() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/kt36984.kt"); - } - - @Test - @TestMetadata("varHandle.kt") - public void testVarHandle() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/varHandle.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/throws") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/testData/codegen/box/testsWithJava15/_tags.txt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/_tags.txt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/_tags.txt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/_tags.txt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/bytecodeShapeForJava.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/bytecodeShapeForJava.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/bytecodeShapeForJava.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/bytecodeShapeForJava.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/collectionSizeOverrides.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/collectionSizeOverrides.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/collectionSizeOverrides.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/collectionSizeOverrides.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/dataJvmRecord.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/dataJvmRecord.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/dataJvmRecord.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/dataJvmRecord.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/jvmRecordBinary.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/jvmRecordBinary.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/jvmRecordBinary.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/jvmRecordBinary.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/propertiesOverrides.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverrides.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/propertiesOverrides.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverrides.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/recordDifferentPropertyOverride.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentPropertyOverride.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/recordDifferentPropertyOverride.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentPropertyOverride.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/recordDifferentSyntheticProperty.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentSyntheticProperty.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/recordDifferentSyntheticProperty.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentSyntheticProperty.kt diff --git a/compiler/testData/codegen/box/testsWithJava15/records/recordPropertyAccess.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordPropertyAccess.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava15/records/recordPropertyAccess.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordPropertyAccess.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/_tags.txt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/_tags.txt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/_tags.txt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/_tags.txt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamic.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamic.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamic200.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic200.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamic200.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic200.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamic200Long.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic200Long.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamic200Long.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic200Long.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamic201.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic201.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamic201.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic201.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy200.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy200.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200Long.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy200Long.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200Long.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy200Long.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy201.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy201.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy201.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy201.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamicInlineClasses.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicInlineClasses.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamicInlineClasses.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicInlineClasses.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamicSpecialSymbols.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicSpecialSymbols.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamicSpecialSymbols.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicSpecialSymbols.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/concatDynamicWithInline.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicWithInline.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/concatDynamicWithInline.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicWithInline.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/kt36984.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/kt36984.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/kt36984.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/kt36984.kt diff --git a/compiler/testData/codegen/box/testsWithJava9/varHandle.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava9/varHandle.kt similarity index 100% rename from compiler/testData/codegen/box/testsWithJava9/varHandle.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava9/varHandle.kt diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index bfae5b499bf..f25770f9bf8 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Tag; import java.io.File; import java.util.regex.Pattern; @@ -41524,170 +41523,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @Nested - @Tag("") - @TestMetadata("compiler/testData/codegen/box/testsWithJava15") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava15 { - @Test - public void testAllFilesPresentInTestsWithJava15() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/testsWithJava15/records") - @TestDataPath("$PROJECT_ROOT") - public class Records { - @Test - public void testAllFilesPresentInRecords() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava15/records"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("bytecodeShapeForJava.kt") - public void testBytecodeShapeForJava() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/bytecodeShapeForJava.kt"); - } - - @Test - @TestMetadata("collectionSizeOverrides.kt") - public void testCollectionSizeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/collectionSizeOverrides.kt"); - } - - @Test - @TestMetadata("dataJvmRecord.kt") - public void testDataJvmRecord() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/dataJvmRecord.kt"); - } - - @Test - @TestMetadata("jvmRecordBinary.kt") - public void testJvmRecordBinary() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/jvmRecordBinary.kt"); - } - - @Test - @TestMetadata("propertiesOverrides.kt") - public void testPropertiesOverrides() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverrides.kt"); - } - - @Test - @TestMetadata("propertiesOverridesAllCompatibilityJvmDefault.kt") - public void testPropertiesOverridesAllCompatibilityJvmDefault() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt"); - } - - @Test - @TestMetadata("propertiesOverridesEnableJvmDefault.kt") - public void testPropertiesOverridesEnableJvmDefault() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt"); - } - - @Test - @TestMetadata("recordDifferentPropertyOverride.kt") - public void testRecordDifferentPropertyOverride() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordDifferentPropertyOverride.kt"); - } - - @Test - @TestMetadata("recordDifferentSyntheticProperty.kt") - public void testRecordDifferentSyntheticProperty() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordDifferentSyntheticProperty.kt"); - } - - @Test - @TestMetadata("recordPropertyAccess.kt") - public void testRecordPropertyAccess() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordPropertyAccess.kt"); - } - } - } - - @Nested - @Tag("") - @TestMetadata("compiler/testData/codegen/box/testsWithJava9") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava9 { - @Test - public void testAllFilesPresentInTestsWithJava9() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava9"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); - } - - @Test - @TestMetadata("concatDynamic.kt") - public void testConcatDynamic() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic.kt"); - } - - @Test - @TestMetadata("concatDynamic200.kt") - public void testConcatDynamic200() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200.kt"); - } - - @Test - @TestMetadata("concatDynamic200Long.kt") - public void testConcatDynamic200Long() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200Long.kt"); - } - - @Test - @TestMetadata("concatDynamic201.kt") - public void testConcatDynamic201() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic201.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy200.kt") - public void testConcatDynamicIndy200() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy200Long.kt") - public void testConcatDynamicIndy200Long() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200Long.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy201.kt") - public void testConcatDynamicIndy201() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy201.kt"); - } - - @Test - @TestMetadata("concatDynamicInlineClasses.kt") - public void testConcatDynamicInlineClasses() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicInlineClasses.kt"); - } - - @Test - @TestMetadata("concatDynamicSpecialSymbols.kt") - public void testConcatDynamicSpecialSymbols() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicSpecialSymbols.kt"); - } - - @Test - @TestMetadata("concatDynamicWithInline.kt") - public void testConcatDynamicWithInline() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicWithInline.kt"); - } - - @Test - @TestMetadata("kt36984.kt") - public void testKt36984() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/kt36984.kt"); - } - - @Test - @TestMetadata("varHandle.kt") - public void testVarHandle() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/varHandle.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/throws") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxModernJdkCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxModernJdkCodegenTestGenerated.java new file mode 100644 index 00000000000..f9c7da77f23 --- /dev/null +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxModernJdkCodegenTestGenerated.java @@ -0,0 +1,192 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.test.runners.codegen; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.kotlin.test.TargetBackend; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Tag; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("compiler/testData/codegen/boxModernJdk") +@TestDataPath("$PROJECT_ROOT") +public class BlackBoxModernJdkCodegenTestGenerated extends AbstractBlackBoxCodegenTest { + @Test + public void testAllFilesPresentInBoxModernJdk() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Nested + @Tag("") + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava15") + @TestDataPath("$PROJECT_ROOT") + public class TestsWithJava15 { + @Test + public void testAllFilesPresentInTestsWithJava15() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Nested + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava15/records") + @TestDataPath("$PROJECT_ROOT") + public class Records { + @Test + public void testAllFilesPresentInRecords() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava15/records"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Test + @TestMetadata("bytecodeShapeForJava.kt") + public void testBytecodeShapeForJava() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/bytecodeShapeForJava.kt"); + } + + @Test + @TestMetadata("collectionSizeOverrides.kt") + public void testCollectionSizeOverrides() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/collectionSizeOverrides.kt"); + } + + @Test + @TestMetadata("dataJvmRecord.kt") + public void testDataJvmRecord() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/dataJvmRecord.kt"); + } + + @Test + @TestMetadata("jvmRecordBinary.kt") + public void testJvmRecordBinary() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/jvmRecordBinary.kt"); + } + + @Test + @TestMetadata("propertiesOverrides.kt") + public void testPropertiesOverrides() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverrides.kt"); + } + + @Test + @TestMetadata("propertiesOverridesAllCompatibilityJvmDefault.kt") + public void testPropertiesOverridesAllCompatibilityJvmDefault() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt"); + } + + @Test + @TestMetadata("propertiesOverridesEnableJvmDefault.kt") + public void testPropertiesOverridesEnableJvmDefault() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt"); + } + + @Test + @TestMetadata("recordDifferentPropertyOverride.kt") + public void testRecordDifferentPropertyOverride() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentPropertyOverride.kt"); + } + + @Test + @TestMetadata("recordDifferentSyntheticProperty.kt") + public void testRecordDifferentSyntheticProperty() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentSyntheticProperty.kt"); + } + + @Test + @TestMetadata("recordPropertyAccess.kt") + public void testRecordPropertyAccess() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordPropertyAccess.kt"); + } + } + } + + @Nested + @Tag("") + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava9") + @TestDataPath("$PROJECT_ROOT") + public class TestsWithJava9 { + @Test + public void testAllFilesPresentInTestsWithJava9() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava9"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Test + @TestMetadata("concatDynamic.kt") + public void testConcatDynamic() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic.kt"); + } + + @Test + @TestMetadata("concatDynamic200.kt") + public void testConcatDynamic200() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic200.kt"); + } + + @Test + @TestMetadata("concatDynamic200Long.kt") + public void testConcatDynamic200Long() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic200Long.kt"); + } + + @Test + @TestMetadata("concatDynamic201.kt") + public void testConcatDynamic201() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic201.kt"); + } + + @Test + @TestMetadata("concatDynamicIndy200.kt") + public void testConcatDynamicIndy200() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy200.kt"); + } + + @Test + @TestMetadata("concatDynamicIndy200Long.kt") + public void testConcatDynamicIndy200Long() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy200Long.kt"); + } + + @Test + @TestMetadata("concatDynamicIndy201.kt") + public void testConcatDynamicIndy201() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy201.kt"); + } + + @Test + @TestMetadata("concatDynamicInlineClasses.kt") + public void testConcatDynamicInlineClasses() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicInlineClasses.kt"); + } + + @Test + @TestMetadata("concatDynamicSpecialSymbols.kt") + public void testConcatDynamicSpecialSymbols() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicSpecialSymbols.kt"); + } + + @Test + @TestMetadata("concatDynamicWithInline.kt") + public void testConcatDynamicWithInline() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicWithInline.kt"); + } + + @Test + @TestMetadata("kt36984.kt") + public void testKt36984() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/kt36984.kt"); + } + + @Test + @TestMetadata("varHandle.kt") + public void testVarHandle() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/varHandle.kt"); + } + } +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 18ce151a92b..13e147b2447 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Tag; import java.io.File; import java.util.regex.Pattern; @@ -41680,170 +41679,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } - @Nested - @Tag("") - @TestMetadata("compiler/testData/codegen/box/testsWithJava15") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava15 { - @Test - public void testAllFilesPresentInTestsWithJava15() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Nested - @TestMetadata("compiler/testData/codegen/box/testsWithJava15/records") - @TestDataPath("$PROJECT_ROOT") - public class Records { - @Test - public void testAllFilesPresentInRecords() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava15/records"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("bytecodeShapeForJava.kt") - public void testBytecodeShapeForJava() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/bytecodeShapeForJava.kt"); - } - - @Test - @TestMetadata("collectionSizeOverrides.kt") - public void testCollectionSizeOverrides() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/collectionSizeOverrides.kt"); - } - - @Test - @TestMetadata("dataJvmRecord.kt") - public void testDataJvmRecord() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/dataJvmRecord.kt"); - } - - @Test - @TestMetadata("jvmRecordBinary.kt") - public void testJvmRecordBinary() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/jvmRecordBinary.kt"); - } - - @Test - @TestMetadata("propertiesOverrides.kt") - public void testPropertiesOverrides() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverrides.kt"); - } - - @Test - @TestMetadata("propertiesOverridesAllCompatibilityJvmDefault.kt") - public void testPropertiesOverridesAllCompatibilityJvmDefault() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt"); - } - - @Test - @TestMetadata("propertiesOverridesEnableJvmDefault.kt") - public void testPropertiesOverridesEnableJvmDefault() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt"); - } - - @Test - @TestMetadata("recordDifferentPropertyOverride.kt") - public void testRecordDifferentPropertyOverride() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordDifferentPropertyOverride.kt"); - } - - @Test - @TestMetadata("recordDifferentSyntheticProperty.kt") - public void testRecordDifferentSyntheticProperty() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordDifferentSyntheticProperty.kt"); - } - - @Test - @TestMetadata("recordPropertyAccess.kt") - public void testRecordPropertyAccess() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava15/records/recordPropertyAccess.kt"); - } - } - } - - @Nested - @Tag("") - @TestMetadata("compiler/testData/codegen/box/testsWithJava9") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava9 { - @Test - public void testAllFilesPresentInTestsWithJava9() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava9"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("concatDynamic.kt") - public void testConcatDynamic() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic.kt"); - } - - @Test - @TestMetadata("concatDynamic200.kt") - public void testConcatDynamic200() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200.kt"); - } - - @Test - @TestMetadata("concatDynamic200Long.kt") - public void testConcatDynamic200Long() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200Long.kt"); - } - - @Test - @TestMetadata("concatDynamic201.kt") - public void testConcatDynamic201() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic201.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy200.kt") - public void testConcatDynamicIndy200() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy200Long.kt") - public void testConcatDynamicIndy200Long() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200Long.kt"); - } - - @Test - @TestMetadata("concatDynamicIndy201.kt") - public void testConcatDynamicIndy201() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy201.kt"); - } - - @Test - @TestMetadata("concatDynamicInlineClasses.kt") - public void testConcatDynamicInlineClasses() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicInlineClasses.kt"); - } - - @Test - @TestMetadata("concatDynamicSpecialSymbols.kt") - public void testConcatDynamicSpecialSymbols() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicSpecialSymbols.kt"); - } - - @Test - @TestMetadata("concatDynamicWithInline.kt") - public void testConcatDynamicWithInline() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicWithInline.kt"); - } - - @Test - @TestMetadata("kt36984.kt") - public void testKt36984() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/kt36984.kt"); - } - - @Test - @TestMetadata("varHandle.kt") - public void testVarHandle() throws Exception { - runTest("compiler/testData/codegen/box/testsWithJava9/varHandle.kt"); - } - } - @Nested @TestMetadata("compiler/testData/codegen/box/throws") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java new file mode 100644 index 00000000000..6cda0bd9916 --- /dev/null +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java @@ -0,0 +1,192 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.test.runners.codegen; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.kotlin.test.TargetBackend; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Tag; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("compiler/testData/codegen/boxModernJdk") +@TestDataPath("$PROJECT_ROOT") +public class IrBlackBoxModernJdkCodegenTestGenerated extends AbstractIrBlackBoxCodegenTest { + @Test + public void testAllFilesPresentInBoxModernJdk() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Nested + @Tag("") + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava15") + @TestDataPath("$PROJECT_ROOT") + public class TestsWithJava15 { + @Test + public void testAllFilesPresentInTestsWithJava15() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Nested + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava15/records") + @TestDataPath("$PROJECT_ROOT") + public class Records { + @Test + public void testAllFilesPresentInRecords() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava15/records"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("bytecodeShapeForJava.kt") + public void testBytecodeShapeForJava() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/bytecodeShapeForJava.kt"); + } + + @Test + @TestMetadata("collectionSizeOverrides.kt") + public void testCollectionSizeOverrides() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/collectionSizeOverrides.kt"); + } + + @Test + @TestMetadata("dataJvmRecord.kt") + public void testDataJvmRecord() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/dataJvmRecord.kt"); + } + + @Test + @TestMetadata("jvmRecordBinary.kt") + public void testJvmRecordBinary() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/jvmRecordBinary.kt"); + } + + @Test + @TestMetadata("propertiesOverrides.kt") + public void testPropertiesOverrides() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverrides.kt"); + } + + @Test + @TestMetadata("propertiesOverridesAllCompatibilityJvmDefault.kt") + public void testPropertiesOverridesAllCompatibilityJvmDefault() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt"); + } + + @Test + @TestMetadata("propertiesOverridesEnableJvmDefault.kt") + public void testPropertiesOverridesEnableJvmDefault() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt"); + } + + @Test + @TestMetadata("recordDifferentPropertyOverride.kt") + public void testRecordDifferentPropertyOverride() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentPropertyOverride.kt"); + } + + @Test + @TestMetadata("recordDifferentSyntheticProperty.kt") + public void testRecordDifferentSyntheticProperty() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentSyntheticProperty.kt"); + } + + @Test + @TestMetadata("recordPropertyAccess.kt") + public void testRecordPropertyAccess() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordPropertyAccess.kt"); + } + } + } + + @Nested + @Tag("") + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava9") + @TestDataPath("$PROJECT_ROOT") + public class TestsWithJava9 { + @Test + public void testAllFilesPresentInTestsWithJava9() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava9"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("concatDynamic.kt") + public void testConcatDynamic() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic.kt"); + } + + @Test + @TestMetadata("concatDynamic200.kt") + public void testConcatDynamic200() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic200.kt"); + } + + @Test + @TestMetadata("concatDynamic200Long.kt") + public void testConcatDynamic200Long() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic200Long.kt"); + } + + @Test + @TestMetadata("concatDynamic201.kt") + public void testConcatDynamic201() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamic201.kt"); + } + + @Test + @TestMetadata("concatDynamicIndy200.kt") + public void testConcatDynamicIndy200() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy200.kt"); + } + + @Test + @TestMetadata("concatDynamicIndy200Long.kt") + public void testConcatDynamicIndy200Long() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy200Long.kt"); + } + + @Test + @TestMetadata("concatDynamicIndy201.kt") + public void testConcatDynamicIndy201() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicIndy201.kt"); + } + + @Test + @TestMetadata("concatDynamicInlineClasses.kt") + public void testConcatDynamicInlineClasses() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicInlineClasses.kt"); + } + + @Test + @TestMetadata("concatDynamicSpecialSymbols.kt") + public void testConcatDynamicSpecialSymbols() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicSpecialSymbols.kt"); + } + + @Test + @TestMetadata("concatDynamicWithInline.kt") + public void testConcatDynamicWithInline() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/concatDynamicWithInline.kt"); + } + + @Test + @TestMetadata("kt36984.kt") + public void testKt36984() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/kt36984.kt"); + } + + @Test + @TestMetadata("varHandle.kt") + public void testVarHandle() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava9/varHandle.kt"); + } + } +} diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt index b51fa993cae..3dcd5709138 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt @@ -56,11 +56,11 @@ abstract class AbstractJvmBlackBoxCodegenTestBase) { model("codegen/box") } + testClass("BlackBoxModernJdkCodegenTestGenerated") { + model("codegen/boxModernJdk") + } + + testClass("IrBlackBoxModernJdkCodegenTestGenerated") { + model("codegen/boxModernJdk") + } + testClass { model("codegen/box/compileKotlinAgainstKotlin") }