From ce3562f0e893b2828397724cfcc80f7ecd99fd65 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 22 Sep 2021 17:07:59 +0300 Subject: [PATCH] Migrate all JDK 15 related tests to JDK 17 --- ...CompilerTestFE10TestdataTestGenerated.java | 102 ++++---- ...irOldFrontendDiagnosticsTestGenerated.java | 102 ++++---- ...DiagnosticsWithLightTreeTestGenerated.java | 102 ++++---- .../org/jetbrains/kotlin/test/TestJdkKind.kt | 7 +- .../kotlin/test/util/KtTestUtil.java | 5 - compiler/testData/cli/jvm/jvmRecordOk.args | 4 +- .../cli/jvm/jvmRecordWrongTarget.args | 2 +- .../boxModernJdk/testsWithJava15/_tags.txt | 1 - .../records/bytecodeShapeForJava.kt | 0 .../records/collectionSizeOverrides.kt | 0 .../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 .../{ => sealed}/compiledJavaSealedClass.kt | 0 .../compiledJavaSealedInterface.kt | 0 .../javaRecordsViaKotlinReflection.kt | 0 .../{ => sealed}/javaSealedClass.kt | 0 .../{ => sealed}/javaSealedInterface.kt | 0 .../sealedJavaClassViaJavaReflection.kt | 0 .../sealedJavaClassViaKotlinReflection.kt | 0 .../sealedJavaInterfaceViaKotlinReflection.kt | 0 .../bytecodeListing/jvmRecordStructure.kt | 4 +- .../jvmRecord/diagnostics.kt | 2 +- .../jvmRecord/disabledFeature.fir.kt | 0 .../jvmRecord/disabledFeature.kt | 0 .../jvmRecord/irrelevantFields.fir.kt | 2 +- .../jvmRecord/irrelevantFields.kt | 2 +- .../jvmRecordDescriptorStructure.fir.kt | 2 +- .../jvmRecord/jvmRecordDescriptorStructure.kt | 2 +- .../jvmRecordDescriptorStructure.txt | 0 .../jvmRecord/simpleRecords.fir.kt | 0 .../jvmRecord/simpleRecords.kt | 0 .../jvmRecord/simpleRecords.txt | 0 .../jvmRecord/supertypesCheck.fir.kt | 2 +- .../jvmRecord/supertypesCheck.kt | 2 +- .../jvmRecord/supertypesCheck.txt | 0 .../GenericRecord.compiled.psi.txt | 0 .../GenericRecord.compiled.txt | 0 .../GenericRecord.java | 0 .../GenericRecord.txt | 0 .../SimpleRecord.compiled.psi.txt | 0 .../SimpleRecord.compiled.txt | 0 .../SimpleRecord.java | 0 .../SimpleRecord.txt | 0 .../test/runners/DiagnosticTestGenerated.java | 102 ++++---- ...BlackBoxModernJdkCodegenTestGenerated.java | 237 +++++++++--------- ...BlackBoxModernJdkCodegenTestGenerated.java | 237 +++++++++--------- .../backend/classic/JavaCompilerFacade.kt | 2 +- .../test/backend/handlers/JvmBoxRunner.kt | 1 - .../test/runners/AbstractDiagnosticTest.kt | 8 - .../test/runners/AbstractFirDiagnosticTest.kt | 4 +- .../AbstractJvmBlackBoxCodegenTestBase.kt | 4 - .../JvmEnvironmentConfigurator.kt | 3 - .../jetbrains/kotlin/cli/AbstractCliTest.java | 4 +- ...ava15Test.kt => AbstractLoadJava17Test.kt} | 10 +- ...tractLoadJava17WithPsiClassReadingTest.kt} | 8 +- .../jetbrains/kotlin/test/KotlinBaseTest.kt | 2 +- .../kotlin/test/KotlinTestUtils.java | 4 +- compiler/tests-different-jdk/build.gradle.kts | 9 - .../generators/GenerateJUnit3CompilerTests.kt | 10 +- ...ated.java => LoadJava17TestGenerated.java} | 22 +- ...va17WithPsiClassReadingTestGenerated.java} | 12 +- .../kotlin/cli/LauncherScriptTest.kt | 8 +- 68 files changed, 477 insertions(+), 553 deletions(-) delete mode 100644 compiler/testData/codegen/boxModernJdk/testsWithJava15/_tags.txt rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/bytecodeShapeForJava.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/collectionSizeOverrides.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/dataJvmRecord.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/jvmRecordBinary.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/propertiesOverrides.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/propertiesOverridesAllCompatibilityJvmDefault.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/propertiesOverridesEnableJvmDefault.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/recordDifferentPropertyOverride.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/recordDifferentSyntheticProperty.kt (100%) rename compiler/testData/codegen/boxModernJdk/{testsWithJava15 => testsWithJava17}/records/recordPropertyAccess.kt (100%) rename compiler/testData/codegen/boxModernJdk/testsWithJava17/{ => sealed}/compiledJavaSealedClass.kt (100%) rename compiler/testData/codegen/boxModernJdk/testsWithJava17/{ => sealed}/compiledJavaSealedInterface.kt (100%) rename compiler/testData/codegen/boxModernJdk/testsWithJava17/{ => sealed}/javaRecordsViaKotlinReflection.kt (100%) rename compiler/testData/codegen/boxModernJdk/testsWithJava17/{ => sealed}/javaSealedClass.kt (100%) rename compiler/testData/codegen/boxModernJdk/testsWithJava17/{ => sealed}/javaSealedInterface.kt (100%) rename compiler/testData/codegen/boxModernJdk/testsWithJava17/{ => sealed}/sealedJavaClassViaJavaReflection.kt (100%) rename compiler/testData/codegen/boxModernJdk/testsWithJava17/{ => sealed}/sealedJavaClassViaKotlinReflection.kt (100%) rename compiler/testData/codegen/boxModernJdk/testsWithJava17/{ => sealed}/sealedJavaInterfaceViaKotlinReflection.kt (100%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/diagnostics.kt (98%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/disabledFeature.fir.kt (100%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/disabledFeature.kt (100%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/irrelevantFields.fir.kt (97%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/irrelevantFields.kt (97%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/jvmRecordDescriptorStructure.fir.kt (96%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/jvmRecordDescriptorStructure.kt (95%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/jvmRecordDescriptorStructure.txt (100%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/simpleRecords.fir.kt (100%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/simpleRecords.kt (100%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/simpleRecords.txt (100%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/supertypesCheck.fir.kt (97%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/supertypesCheck.kt (97%) rename compiler/testData/diagnostics/tests/{testsWithJava15 => testsWithJava17}/jvmRecord/supertypesCheck.txt (100%) rename compiler/testData/{loadJava15 => loadJava17}/GenericRecord.compiled.psi.txt (100%) rename compiler/testData/{loadJava15 => loadJava17}/GenericRecord.compiled.txt (100%) rename compiler/testData/{loadJava15 => loadJava17}/GenericRecord.java (100%) rename compiler/testData/{loadJava15 => loadJava17}/GenericRecord.txt (100%) rename compiler/testData/{loadJava15 => loadJava17}/SimpleRecord.compiled.psi.txt (100%) rename compiler/testData/{loadJava15 => loadJava17}/SimpleRecord.compiled.txt (100%) rename compiler/testData/{loadJava15 => loadJava17}/SimpleRecord.java (100%) rename compiler/testData/{loadJava15 => loadJava17}/SimpleRecord.txt (100%) rename compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/{AbstractLoadJava15Test.kt => AbstractLoadJava17Test.kt} (75%) rename compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/{AbstractLoadJava15WithPsiClassReadingTest.kt => AbstractLoadJava17WithPsiClassReadingTest.kt} (85%) rename compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/{LoadJava15TestGenerated.java => LoadJava17TestGenerated.java} (76%) rename compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/{LoadJava15WithPsiClassReadingTestGenerated.java => LoadJava17WithPsiClassReadingTestGenerated.java} (75%) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java index 1f2ec735628..96fa8d5d1c2 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java @@ -30070,62 +30070,6 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava15 { - @Test - public void testAllFilesPresentInTestsWithJava15() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord") - @TestDataPath("$PROJECT_ROOT") - public class JvmRecord { - @Test - public void testAllFilesPresentInJvmRecord() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); - } - - @Test - @TestMetadata("diagnostics.kt") - public void testDiagnostics() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt"); - } - - @Test - @TestMetadata("disabledFeature.kt") - public void testDisabledFeature() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt"); - } - - @Test - @TestMetadata("irrelevantFields.kt") - public void testIrrelevantFields() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt"); - } - - @Test - @TestMetadata("jvmRecordDescriptorStructure.kt") - public void testJvmRecordDescriptorStructure() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt"); - } - - @Test - @TestMetadata("simpleRecords.kt") - public void testSimpleRecords() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt"); - } - - @Test - @TestMetadata("supertypesCheck.kt") - public void testSupertypesCheck() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17") @TestDataPath("$PROJECT_ROOT") @@ -30135,6 +30079,52 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava17"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } + @Nested + @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord") + @TestDataPath("$PROJECT_ROOT") + public class JvmRecord { + @Test + public void testAllFilesPresentInJvmRecord() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + } + + @Test + @TestMetadata("diagnostics.kt") + public void testDiagnostics() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/diagnostics.kt"); + } + + @Test + @TestMetadata("disabledFeature.kt") + public void testDisabledFeature() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt"); + } + + @Test + @TestMetadata("irrelevantFields.kt") + public void testIrrelevantFields() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.kt"); + } + + @Test + @TestMetadata("jvmRecordDescriptorStructure.kt") + public void testJvmRecordDescriptorStructure() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.kt"); + } + + @Test + @TestMetadata("simpleRecords.kt") + public void testSimpleRecords() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.kt"); + } + + @Test + @TestMetadata("supertypesCheck.kt") + public void testSupertypesCheck() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17/sealedClasses") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java index bd18d9dbd7d..6cce1ea9733 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java @@ -30070,62 +30070,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava15 { - @Test - public void testAllFilesPresentInTestsWithJava15() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord") - @TestDataPath("$PROJECT_ROOT") - public class JvmRecord { - @Test - public void testAllFilesPresentInJvmRecord() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); - } - - @Test - @TestMetadata("diagnostics.kt") - public void testDiagnostics() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt"); - } - - @Test - @TestMetadata("disabledFeature.kt") - public void testDisabledFeature() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt"); - } - - @Test - @TestMetadata("irrelevantFields.kt") - public void testIrrelevantFields() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt"); - } - - @Test - @TestMetadata("jvmRecordDescriptorStructure.kt") - public void testJvmRecordDescriptorStructure() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt"); - } - - @Test - @TestMetadata("simpleRecords.kt") - public void testSimpleRecords() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt"); - } - - @Test - @TestMetadata("supertypesCheck.kt") - public void testSupertypesCheck() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17") @TestDataPath("$PROJECT_ROOT") @@ -30135,6 +30079,52 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava17"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } + @Nested + @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord") + @TestDataPath("$PROJECT_ROOT") + public class JvmRecord { + @Test + public void testAllFilesPresentInJvmRecord() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + } + + @Test + @TestMetadata("diagnostics.kt") + public void testDiagnostics() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/diagnostics.kt"); + } + + @Test + @TestMetadata("disabledFeature.kt") + public void testDisabledFeature() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt"); + } + + @Test + @TestMetadata("irrelevantFields.kt") + public void testIrrelevantFields() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.kt"); + } + + @Test + @TestMetadata("jvmRecordDescriptorStructure.kt") + public void testJvmRecordDescriptorStructure() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.kt"); + } + + @Test + @TestMetadata("simpleRecords.kt") + public void testSimpleRecords() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.kt"); + } + + @Test + @TestMetadata("supertypesCheck.kt") + public void testSupertypesCheck() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17/sealedClasses") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java index 0bfd0f4a0f5..cabe63e43f4 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java @@ -30070,62 +30070,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava15 { - @Test - public void testAllFilesPresentInTestsWithJava15() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord") - @TestDataPath("$PROJECT_ROOT") - public class JvmRecord { - @Test - public void testAllFilesPresentInJvmRecord() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); - } - - @Test - @TestMetadata("diagnostics.kt") - public void testDiagnostics() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt"); - } - - @Test - @TestMetadata("disabledFeature.kt") - public void testDisabledFeature() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt"); - } - - @Test - @TestMetadata("irrelevantFields.kt") - public void testIrrelevantFields() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt"); - } - - @Test - @TestMetadata("jvmRecordDescriptorStructure.kt") - public void testJvmRecordDescriptorStructure() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt"); - } - - @Test - @TestMetadata("simpleRecords.kt") - public void testSimpleRecords() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt"); - } - - @Test - @TestMetadata("supertypesCheck.kt") - public void testSupertypesCheck() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17") @TestDataPath("$PROJECT_ROOT") @@ -30135,6 +30079,52 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava17"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } + @Nested + @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord") + @TestDataPath("$PROJECT_ROOT") + public class JvmRecord { + @Test + public void testAllFilesPresentInJvmRecord() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + } + + @Test + @TestMetadata("diagnostics.kt") + public void testDiagnostics() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/diagnostics.kt"); + } + + @Test + @TestMetadata("disabledFeature.kt") + public void testDisabledFeature() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt"); + } + + @Test + @TestMetadata("irrelevantFields.kt") + public void testIrrelevantFields() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.kt"); + } + + @Test + @TestMetadata("jvmRecordDescriptorStructure.kt") + public void testJvmRecordDescriptorStructure() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.kt"); + } + + @Test + @TestMetadata("simpleRecords.kt") + public void testSimpleRecords() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.kt"); + } + + @Test + @TestMetadata("supertypesCheck.kt") + public void testSupertypesCheck() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17/sealedClasses") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJdkKind.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJdkKind.kt index 15829bdd5ad..49d50441533 100644 --- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJdkKind.kt +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJdkKind.kt @@ -29,13 +29,10 @@ enum class TestJdkKind(val requiresSeparateProcess: Boolean = false) { // JDK found at $JDK_9 FULL_JDK_9(requiresSeparateProcess = true), - // JDK found at $JDK_15 + // JDK found at $JDK_11 FULL_JDK_11(requiresSeparateProcess = true), - // JDK found at $JDK_15 - FULL_JDK_15(requiresSeparateProcess = true), - - // JDK found at $JDK_15 + // JDK found at $JDK_17 FULL_JDK_17(requiresSeparateProcess = true), // JDK found at java.home diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java index 46ded45af2d..9d034ed298f 100644 --- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java @@ -150,11 +150,6 @@ public class KtTestUtil { return getJdkHome("JDK_11"); } - @NotNull - public static File getJdk15Home() { - return getJdkHome("JDK_15", "JDK_15_0"); - } - @NotNull public static File getJdk17Home() { return getJdkHome("JDK_17_0", "JDK_17"); diff --git a/compiler/testData/cli/jvm/jvmRecordOk.args b/compiler/testData/cli/jvm/jvmRecordOk.args index 9d635ef6d36..f6e68a62227 100644 --- a/compiler/testData/cli/jvm/jvmRecordOk.args +++ b/compiler/testData/cli/jvm/jvmRecordOk.args @@ -6,8 +6,8 @@ $TEMP_DIR$ -language-version 1.5 -jdk-home -$JDK_15$ +$JDK_17$ -XXLanguage\:+JvmRecordSupport -Xjvm-enable-preview -jvm-target -15 +17 diff --git a/compiler/testData/cli/jvm/jvmRecordWrongTarget.args b/compiler/testData/cli/jvm/jvmRecordWrongTarget.args index 3848a851905..95cb893844d 100644 --- a/compiler/testData/cli/jvm/jvmRecordWrongTarget.args +++ b/compiler/testData/cli/jvm/jvmRecordWrongTarget.args @@ -6,7 +6,7 @@ $TEMP_DIR$ -language-version 1.5 -jdk-home -$JDK_15$ +$JDK_17$ -XXLanguage\:+JvmRecordSupport -jvm-target 9 diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/_tags.txt b/compiler/testData/codegen/boxModernJdk/testsWithJava15/_tags.txt deleted file mode 100644 index 167aa007616..00000000000 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava15/_tags.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/bytecodeShapeForJava.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/bytecodeShapeForJava.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/bytecodeShapeForJava.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/bytecodeShapeForJava.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/collectionSizeOverrides.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/collectionSizeOverrides.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/collectionSizeOverrides.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/collectionSizeOverrides.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/dataJvmRecord.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/dataJvmRecord.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/dataJvmRecord.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/dataJvmRecord.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/jvmRecordBinary.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/jvmRecordBinary.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/jvmRecordBinary.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/jvmRecordBinary.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverrides.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverrides.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverrides.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverrides.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllCompatibilityJvmDefault.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesAllCompatibilityJvmDefault.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllCompatibilityJvmDefault.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/propertiesOverridesEnableJvmDefault.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentPropertyOverride.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordDifferentPropertyOverride.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentPropertyOverride.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordDifferentPropertyOverride.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentSyntheticProperty.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordDifferentSyntheticProperty.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordDifferentSyntheticProperty.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordDifferentSyntheticProperty.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordPropertyAccess.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordPropertyAccess.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava15/records/recordPropertyAccess.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordPropertyAccess.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedClass.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedClass.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedClass.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedClass.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedInterface.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedInterface.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedInterface.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedInterface.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/javaRecordsViaKotlinReflection.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaRecordsViaKotlinReflection.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/javaRecordsViaKotlinReflection.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaRecordsViaKotlinReflection.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedClass.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedClass.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedClass.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedClass.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedInterface.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedInterface.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaJavaReflection.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaClassViaJavaReflection.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaJavaReflection.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaClassViaJavaReflection.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaKotlinReflection.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaClassViaKotlinReflection.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaKotlinReflection.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaClassViaKotlinReflection.kt diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaInterfaceViaKotlinReflection.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaInterfaceViaKotlinReflection.kt similarity index 100% rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaInterfaceViaKotlinReflection.kt rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaInterfaceViaKotlinReflection.kt diff --git a/compiler/testData/codegen/bytecodeListing/jvmRecordStructure.kt b/compiler/testData/codegen/bytecodeListing/jvmRecordStructure.kt index d38fbd2dfbc..258fa82abb2 100644 --- a/compiler/testData/codegen/bytecodeListing/jvmRecordStructure.kt +++ b/compiler/testData/codegen/bytecodeListing/jvmRecordStructure.kt @@ -1,9 +1,9 @@ // !API_VERSION: 1.5 // !LANGUAGE: +JvmRecordSupport -// JVM_TARGET: 15 +// JVM_TARGET: 17 // ENABLE_JVM_PREVIEW // WITH_RUNTIME -// JDK_KIND: FULL_JDK_15 +// JDK_KIND: FULL_JDK_17 // D8 does not yet desugar java records. // IGNORE_DEXING diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/diagnostics.kt similarity index 98% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/diagnostics.kt index 8d9d7eaccd7..b994437084a 100644 --- a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/diagnostics.kt @@ -2,7 +2,7 @@ // !API_VERSION: 1.5 // !LANGUAGE: +JvmRecordSupport // SKIP_TXT -// JVM_TARGET: 15 +// JVM_TARGET: 17 // ENABLE_JVM_PREVIEW @JvmRecord diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.fir.kt similarity index 100% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.fir.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.fir.kt diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt similarity index 100% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.fir.kt similarity index 97% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.fir.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.fir.kt index 3359d6dd8b2..b156cf8a130 100644 --- a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.fir.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.fir.kt @@ -1,7 +1,7 @@ // !API_VERSION: 1.5 // !LANGUAGE: +JvmRecordSupport // SKIP_TXT -// JVM_TARGET: 15 +// JVM_TARGET: 17 // ENABLE_JVM_PREVIEW interface I diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.kt similarity index 97% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.kt index f2a38f74978..034e3e6532d 100644 --- a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.kt @@ -1,7 +1,7 @@ // !API_VERSION: 1.5 // !LANGUAGE: +JvmRecordSupport // SKIP_TXT -// JVM_TARGET: 15 +// JVM_TARGET: 17 // ENABLE_JVM_PREVIEW interface I diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.fir.kt similarity index 96% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.fir.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.fir.kt index fdf9e2fcea2..abc6026d229 100644 --- a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.fir.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.fir.kt @@ -1,6 +1,6 @@ // !API_VERSION: 1.5 // !LANGUAGE: +JvmRecordSupport -// JVM_TARGET: 15 +// JVM_TARGET: 17 // ENABLE_JVM_PREVIEW @JvmRecord diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.kt similarity index 95% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.kt index f54099ef474..b6fb7ca4b76 100644 --- a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.kt @@ -1,6 +1,6 @@ // !API_VERSION: 1.5 // !LANGUAGE: +JvmRecordSupport -// JVM_TARGET: 15 +// JVM_TARGET: 17 // ENABLE_JVM_PREVIEW @JvmRecord diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.txt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.txt similarity index 100% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.txt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.txt diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.fir.kt similarity index 100% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.fir.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.fir.kt diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.kt similarity index 100% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.kt diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.txt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.txt similarity index 100% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.txt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.txt diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.fir.kt similarity index 97% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.fir.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.fir.kt index 79c94bd830f..d278e6ea6b4 100644 --- a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.fir.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.fir.kt @@ -1,6 +1,6 @@ // !API_VERSION: 1.5 // !LANGUAGE: +JvmRecordSupport -// JVM_TARGET: 15 +// JVM_TARGET: 17 // ENABLE_JVM_PREVIEW abstract class Abstract diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.kt similarity index 97% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.kt index 0af7efaafc7..cb68f3313e7 100644 --- a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt +++ b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.kt @@ -1,6 +1,6 @@ // !API_VERSION: 1.5 // !LANGUAGE: +JvmRecordSupport -// JVM_TARGET: 15 +// JVM_TARGET: 17 // ENABLE_JVM_PREVIEW abstract class Abstract diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.txt b/compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.txt similarity index 100% rename from compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.txt rename to compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.txt diff --git a/compiler/testData/loadJava15/GenericRecord.compiled.psi.txt b/compiler/testData/loadJava17/GenericRecord.compiled.psi.txt similarity index 100% rename from compiler/testData/loadJava15/GenericRecord.compiled.psi.txt rename to compiler/testData/loadJava17/GenericRecord.compiled.psi.txt diff --git a/compiler/testData/loadJava15/GenericRecord.compiled.txt b/compiler/testData/loadJava17/GenericRecord.compiled.txt similarity index 100% rename from compiler/testData/loadJava15/GenericRecord.compiled.txt rename to compiler/testData/loadJava17/GenericRecord.compiled.txt diff --git a/compiler/testData/loadJava15/GenericRecord.java b/compiler/testData/loadJava17/GenericRecord.java similarity index 100% rename from compiler/testData/loadJava15/GenericRecord.java rename to compiler/testData/loadJava17/GenericRecord.java diff --git a/compiler/testData/loadJava15/GenericRecord.txt b/compiler/testData/loadJava17/GenericRecord.txt similarity index 100% rename from compiler/testData/loadJava15/GenericRecord.txt rename to compiler/testData/loadJava17/GenericRecord.txt diff --git a/compiler/testData/loadJava15/SimpleRecord.compiled.psi.txt b/compiler/testData/loadJava17/SimpleRecord.compiled.psi.txt similarity index 100% rename from compiler/testData/loadJava15/SimpleRecord.compiled.psi.txt rename to compiler/testData/loadJava17/SimpleRecord.compiled.psi.txt diff --git a/compiler/testData/loadJava15/SimpleRecord.compiled.txt b/compiler/testData/loadJava17/SimpleRecord.compiled.txt similarity index 100% rename from compiler/testData/loadJava15/SimpleRecord.compiled.txt rename to compiler/testData/loadJava17/SimpleRecord.compiled.txt diff --git a/compiler/testData/loadJava15/SimpleRecord.java b/compiler/testData/loadJava17/SimpleRecord.java similarity index 100% rename from compiler/testData/loadJava15/SimpleRecord.java rename to compiler/testData/loadJava17/SimpleRecord.java diff --git a/compiler/testData/loadJava15/SimpleRecord.txt b/compiler/testData/loadJava17/SimpleRecord.txt similarity index 100% rename from compiler/testData/loadJava15/SimpleRecord.txt rename to compiler/testData/loadJava17/SimpleRecord.txt diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 14cec3f90a0..19ccd31442d 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -30166,62 +30166,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { } } - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15") - @TestDataPath("$PROJECT_ROOT") - public class TestsWithJava15 { - @Test - public void testAllFilesPresentInTestsWithJava15() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord") - @TestDataPath("$PROJECT_ROOT") - public class JvmRecord { - @Test - public void testAllFilesPresentInJvmRecord() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); - } - - @Test - @TestMetadata("diagnostics.kt") - public void testDiagnostics() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt"); - } - - @Test - @TestMetadata("disabledFeature.kt") - public void testDisabledFeature() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt"); - } - - @Test - @TestMetadata("irrelevantFields.kt") - public void testIrrelevantFields() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt"); - } - - @Test - @TestMetadata("jvmRecordDescriptorStructure.kt") - public void testJvmRecordDescriptorStructure() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt"); - } - - @Test - @TestMetadata("simpleRecords.kt") - public void testSimpleRecords() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt"); - } - - @Test - @TestMetadata("supertypesCheck.kt") - public void testSupertypesCheck() throws Exception { - runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17") @TestDataPath("$PROJECT_ROOT") @@ -30231,6 +30175,52 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava17"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } + @Nested + @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord") + @TestDataPath("$PROJECT_ROOT") + public class JvmRecord { + @Test + public void testAllFilesPresentInJvmRecord() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + } + + @Test + @TestMetadata("diagnostics.kt") + public void testDiagnostics() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/diagnostics.kt"); + } + + @Test + @TestMetadata("disabledFeature.kt") + public void testDisabledFeature() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/disabledFeature.kt"); + } + + @Test + @TestMetadata("irrelevantFields.kt") + public void testIrrelevantFields() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/irrelevantFields.kt"); + } + + @Test + @TestMetadata("jvmRecordDescriptorStructure.kt") + public void testJvmRecordDescriptorStructure() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/jvmRecordDescriptorStructure.kt"); + } + + @Test + @TestMetadata("simpleRecords.kt") + public void testSimpleRecords() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/simpleRecords.kt"); + } + + @Test + @TestMetadata("supertypesCheck.kt") + public void testSupertypesCheck() throws Exception { + runTest("compiler/testData/diagnostics/tests/testsWithJava17/jvmRecord/supertypesCheck.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava17/sealedClasses") @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 index 4b4ba2b3549..096e284d5e4 100644 --- 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 @@ -127,87 +127,6 @@ public class BlackBoxModernJdkCodegenTestGenerated extends AbstractBlackBoxCodeg } } - @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/testsWithJava17") @@ -218,52 +137,132 @@ public class BlackBoxModernJdkCodegenTestGenerated extends AbstractBlackBoxCodeg KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava17"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } - @Test - @TestMetadata("compiledJavaSealedClass.kt") - public void testCompiledJavaSealedClass() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedClass.kt"); + @Nested + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava17/records") + @TestDataPath("$PROJECT_ROOT") + public class Records { + @Test + public void testAllFilesPresentInRecords() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava17/records"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @Test + @TestMetadata("bytecodeShapeForJava.kt") + public void testBytecodeShapeForJava() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/bytecodeShapeForJava.kt"); + } + + @Test + @TestMetadata("collectionSizeOverrides.kt") + public void testCollectionSizeOverrides() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/collectionSizeOverrides.kt"); + } + + @Test + @TestMetadata("dataJvmRecord.kt") + public void testDataJvmRecord() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/dataJvmRecord.kt"); + } + + @Test + @TestMetadata("jvmRecordBinary.kt") + public void testJvmRecordBinary() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/jvmRecordBinary.kt"); + } + + @Test + @TestMetadata("propertiesOverrides.kt") + public void testPropertiesOverrides() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverrides.kt"); + } + + @Test + @TestMetadata("propertiesOverridesAllCompatibilityJvmDefault.kt") + public void testPropertiesOverridesAllCompatibilityJvmDefault() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllCompatibilityJvmDefault.kt"); + } + + @Test + @TestMetadata("propertiesOverridesEnableJvmDefault.kt") + public void testPropertiesOverridesEnableJvmDefault() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt"); + } + + @Test + @TestMetadata("recordDifferentPropertyOverride.kt") + public void testRecordDifferentPropertyOverride() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordDifferentPropertyOverride.kt"); + } + + @Test + @TestMetadata("recordDifferentSyntheticProperty.kt") + public void testRecordDifferentSyntheticProperty() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordDifferentSyntheticProperty.kt"); + } + + @Test + @TestMetadata("recordPropertyAccess.kt") + public void testRecordPropertyAccess() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordPropertyAccess.kt"); + } } - @Test - @TestMetadata("compiledJavaSealedInterface.kt") - public void testCompiledJavaSealedInterface() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedInterface.kt"); - } + @Nested + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed") + @TestDataPath("$PROJECT_ROOT") + public class Sealed { + @Test + public void testAllFilesPresentInSealed() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } - @Test - @TestMetadata("javaRecordsViaKotlinReflection.kt") - public void testJavaRecordsViaKotlinReflection() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaRecordsViaKotlinReflection.kt"); - } + @Test + @TestMetadata("compiledJavaSealedClass.kt") + public void testCompiledJavaSealedClass() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedClass.kt"); + } - @Test - @TestMetadata("javaSealedClass.kt") - public void testJavaSealedClass() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedClass.kt"); - } + @Test + @TestMetadata("compiledJavaSealedInterface.kt") + public void testCompiledJavaSealedInterface() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedInterface.kt"); + } - @Test - @TestMetadata("javaSealedInterface.kt") - public void testJavaSealedInterface() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedInterface.kt"); - } + @Test + @TestMetadata("javaRecordsViaKotlinReflection.kt") + public void testJavaRecordsViaKotlinReflection() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaRecordsViaKotlinReflection.kt"); + } - @Test - @TestMetadata("sealedJavaClassViaJavaReflection.kt") - public void testSealedJavaClassViaJavaReflection() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaJavaReflection.kt"); - } + @Test + @TestMetadata("javaSealedClass.kt") + public void testJavaSealedClass() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedClass.kt"); + } - @Test - @TestMetadata("sealedJavaClassViaKotlinReflection.kt") - public void testSealedJavaClassViaKotlinReflection() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaKotlinReflection.kt"); - } + @Test + @TestMetadata("javaSealedInterface.kt") + public void testJavaSealedInterface() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt"); + } - @Test - @TestMetadata("sealedJavaInterfaceViaKotlinReflection.kt") - public void testSealedJavaInterfaceViaKotlinReflection() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaInterfaceViaKotlinReflection.kt"); + @Test + @TestMetadata("sealedJavaClassViaJavaReflection.kt") + public void testSealedJavaClassViaJavaReflection() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaClassViaJavaReflection.kt"); + } + + @Test + @TestMetadata("sealedJavaClassViaKotlinReflection.kt") + public void testSealedJavaClassViaKotlinReflection() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaClassViaKotlinReflection.kt"); + } + + @Test + @TestMetadata("sealedJavaInterfaceViaKotlinReflection.kt") + public void testSealedJavaInterfaceViaKotlinReflection() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaInterfaceViaKotlinReflection.kt"); + } } } } 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 index ab226294689..9379e2c57d9 100644 --- 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 @@ -145,87 +145,6 @@ public class IrBlackBoxModernJdkCodegenTestGenerated extends AbstractIrBlackBoxC } } - @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/testsWithJava17") @@ -236,52 +155,132 @@ public class IrBlackBoxModernJdkCodegenTestGenerated extends AbstractIrBlackBoxC KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava17"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } - @Test - @TestMetadata("compiledJavaSealedClass.kt") - public void testCompiledJavaSealedClass() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedClass.kt"); + @Nested + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava17/records") + @TestDataPath("$PROJECT_ROOT") + public class Records { + @Test + public void testAllFilesPresentInRecords() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava17/records"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("bytecodeShapeForJava.kt") + public void testBytecodeShapeForJava() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/bytecodeShapeForJava.kt"); + } + + @Test + @TestMetadata("collectionSizeOverrides.kt") + public void testCollectionSizeOverrides() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/collectionSizeOverrides.kt"); + } + + @Test + @TestMetadata("dataJvmRecord.kt") + public void testDataJvmRecord() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/dataJvmRecord.kt"); + } + + @Test + @TestMetadata("jvmRecordBinary.kt") + public void testJvmRecordBinary() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/jvmRecordBinary.kt"); + } + + @Test + @TestMetadata("propertiesOverrides.kt") + public void testPropertiesOverrides() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverrides.kt"); + } + + @Test + @TestMetadata("propertiesOverridesAllCompatibilityJvmDefault.kt") + public void testPropertiesOverridesAllCompatibilityJvmDefault() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllCompatibilityJvmDefault.kt"); + } + + @Test + @TestMetadata("propertiesOverridesEnableJvmDefault.kt") + public void testPropertiesOverridesEnableJvmDefault() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt"); + } + + @Test + @TestMetadata("recordDifferentPropertyOverride.kt") + public void testRecordDifferentPropertyOverride() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordDifferentPropertyOverride.kt"); + } + + @Test + @TestMetadata("recordDifferentSyntheticProperty.kt") + public void testRecordDifferentSyntheticProperty() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordDifferentSyntheticProperty.kt"); + } + + @Test + @TestMetadata("recordPropertyAccess.kt") + public void testRecordPropertyAccess() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordPropertyAccess.kt"); + } } - @Test - @TestMetadata("compiledJavaSealedInterface.kt") - public void testCompiledJavaSealedInterface() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedInterface.kt"); - } + @Nested + @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed") + @TestDataPath("$PROJECT_ROOT") + public class Sealed { + @Test + public void testAllFilesPresentInSealed() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } - @Test - @TestMetadata("javaRecordsViaKotlinReflection.kt") - public void testJavaRecordsViaKotlinReflection() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaRecordsViaKotlinReflection.kt"); - } + @Test + @TestMetadata("compiledJavaSealedClass.kt") + public void testCompiledJavaSealedClass() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedClass.kt"); + } - @Test - @TestMetadata("javaSealedClass.kt") - public void testJavaSealedClass() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedClass.kt"); - } + @Test + @TestMetadata("compiledJavaSealedInterface.kt") + public void testCompiledJavaSealedInterface() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedInterface.kt"); + } - @Test - @TestMetadata("javaSealedInterface.kt") - public void testJavaSealedInterface() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedInterface.kt"); - } + @Test + @TestMetadata("javaRecordsViaKotlinReflection.kt") + public void testJavaRecordsViaKotlinReflection() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaRecordsViaKotlinReflection.kt"); + } - @Test - @TestMetadata("sealedJavaClassViaJavaReflection.kt") - public void testSealedJavaClassViaJavaReflection() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaJavaReflection.kt"); - } + @Test + @TestMetadata("javaSealedClass.kt") + public void testJavaSealedClass() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedClass.kt"); + } - @Test - @TestMetadata("sealedJavaClassViaKotlinReflection.kt") - public void testSealedJavaClassViaKotlinReflection() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaKotlinReflection.kt"); - } + @Test + @TestMetadata("javaSealedInterface.kt") + public void testJavaSealedInterface() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt"); + } - @Test - @TestMetadata("sealedJavaInterfaceViaKotlinReflection.kt") - public void testSealedJavaInterfaceViaKotlinReflection() throws Exception { - runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaInterfaceViaKotlinReflection.kt"); + @Test + @TestMetadata("sealedJavaClassViaJavaReflection.kt") + public void testSealedJavaClassViaJavaReflection() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaClassViaJavaReflection.kt"); + } + + @Test + @TestMetadata("sealedJavaClassViaKotlinReflection.kt") + public void testSealedJavaClassViaKotlinReflection() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaClassViaKotlinReflection.kt"); + } + + @Test + @TestMetadata("sealedJavaInterfaceViaKotlinReflection.kt") + public void testSealedJavaInterfaceViaKotlinReflection() throws Exception { + runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/sealedJavaInterfaceViaKotlinReflection.kt"); + } } } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/JavaCompilerFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/JavaCompilerFacade.kt index 2e61ff2c0af..967d9a3af9c 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/JavaCompilerFacade.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/JavaCompilerFacade.kt @@ -83,7 +83,7 @@ class JavaCompilerFacade(private val testServices: TestServices) { JvmTarget.JVM_1_8 -> KtTestUtil.getJdk8Home() JvmTarget.JVM_9 -> KtTestUtil.getJdk9Home() JvmTarget.JVM_11 -> KtTestUtil.getJdk11Home() - JvmTarget.JVM_15 -> KtTestUtil.getJdk15Home() + JvmTarget.JVM_15, JvmTarget.JVM_17 -> KtTestUtil.getJdk17Home() else -> null } ?: error("JDK for $jvmTarget is not found") diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt index 67dca99eb55..9de0845975e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBoxRunner.kt @@ -182,7 +182,6 @@ class JvmBoxRunner(testServices: TestServices) : JvmBinaryArtifactHandler(testSe ): String { val jdkHome = when (jdkKind) { TestJdkKind.FULL_JDK_11 -> KtTestUtil.getJdk11Home() - TestJdkKind.FULL_JDK_15 -> KtTestUtil.getJdk15Home() TestJdkKind.FULL_JDK_17 -> KtTestUtil.getJdk17Home() else -> error("Unsupported JDK kind: $jdkKind") } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt index 461696a1435..f1682b8cc9e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt @@ -109,14 +109,6 @@ abstract class AbstractDiagnosticTest : AbstractKotlinCompilerTest() { } } - forTestsMatching("compiler/testData/diagnostics/tests/testsWithJava15/*") { - defaultDirectives { - JDK_KIND with TestJdkKind.FULL_JDK_15 - +WITH_STDLIB - +WITH_REFLECT - } - } - forTestsMatching("compiler/testData/diagnostics/tests/testsWithJava17/*") { defaultDirectives { JDK_KIND with TestJdkKind.FULL_JDK_17 diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt index 03f2220400e..e9e11426a72 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt @@ -117,9 +117,9 @@ fun TestConfigurationBuilder.baseFirDiagnosticTestConfiguration( } } - forTestsMatching("compiler/testData/diagnostics/tests/testsWithJava15/*") { + forTestsMatching("compiler/testData/diagnostics/tests/testsWithJava17/*") { defaultDirectives { - JDK_KIND with TestJdkKind.FULL_JDK_15 + JDK_KIND with TestJdkKind.FULL_JDK_17 +WITH_STDLIB +WITH_REFLECT } 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 7642594a8e0..8cbddf85f9f 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 @@ -77,10 +77,6 @@ abstract class AbstractJvmBlackBoxCodegenTestBase { configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk11Home()) } - TestJdkKind.FULL_JDK_15 -> { - configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk15Home()) - } TestJdkKind.FULL_JDK_17 -> { configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk17Home()) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java index 6b216c63828..b2090266a91 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java @@ -264,8 +264,8 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir { "$FOREIGN_ANNOTATIONS_DIR$", new File(ThirdPartyAnnotationPathsKt.FOREIGN_ANNOTATIONS_SOURCES_PATH).getPath() ).replace( - "$JDK_15$", - KtTestUtil.getJdk15Home().getPath() + "$JDK_17$", + KtTestUtil.getJdk17Home().getPath() ); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15Test.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava17Test.kt similarity index 75% rename from compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15Test.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava17Test.kt index 100ea799eb3..6e9b39e3399 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15Test.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava17Test.kt @@ -9,10 +9,10 @@ import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File -abstract class AbstractLoadJava15Test : AbstractLoadJavaTest() { - override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_15 - override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk15Home() - override fun getAdditionalJavacArgs(): List = ADDITIONAL_JAVAC_ARGS_FOR_15 +abstract class AbstractLoadJava17Test : AbstractLoadJavaTest() { + override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_17 + override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk17Home() + override fun getAdditionalJavacArgs(): List = ADDITIONAL_JAVAC_ARGS_FOR_17 } -val ADDITIONAL_JAVAC_ARGS_FOR_15 = listOf("--release", "15", "--enable-preview") +val ADDITIONAL_JAVAC_ARGS_FOR_17 = listOf("--release", "17") diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15WithPsiClassReadingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava17WithPsiClassReadingTest.kt similarity index 85% rename from compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15WithPsiClassReadingTest.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava17WithPsiClassReadingTest.kt index 5b5028ab17c..cdb00992626 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15WithPsiClassReadingTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava17WithPsiClassReadingTest.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File -abstract class AbstractLoadJava15WithPsiClassReadingTest : AbstractLoadJavaWithPsiClassReadingTest() { - override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_15 - override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk15Home() - override fun getAdditionalJavacArgs(): List = ADDITIONAL_JAVAC_ARGS_FOR_15 +abstract class AbstractLoadJava17WithPsiClassReadingTest : AbstractLoadJavaWithPsiClassReadingTest() { + override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_17 + override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk17Home() + override fun getAdditionalJavacArgs(): List = ADDITIONAL_JAVAC_ARGS_FOR_17 } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt index d48a37f5048..0c02178edcd 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt @@ -42,7 +42,7 @@ abstract class KotlinBaseTest : KtUsefulTestCase() } protected open fun getTestJdkKind(files: List): TestJdkKind { - if (files.any { file -> InTextDirectivesUtils.isDirectiveDefined(file.content, "JDK_15") }) return TestJdkKind.FULL_JDK_15 + if (files.any { file -> InTextDirectivesUtils.isDirectiveDefined(file.content, "JDK_17") }) return TestJdkKind.FULL_JDK_17 for (file in files) { if (InTextDirectivesUtils.isDirectiveDefined(file.content, "FULL_JDK")) { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 1c9795e929c..2c95e2f1dd0 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -193,8 +193,8 @@ public class KotlinTestUtils { else if (jdkKind == TestJdkKind.FULL_JDK_9) { configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk9Home()); } - else if (jdkKind == TestJdkKind.FULL_JDK_15) { - configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk15Home()); + else if (jdkKind == TestJdkKind.FULL_JDK_17) { + configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk17Home()); } else if (SystemInfo.IS_AT_LEAST_JAVA9) { configuration.put(JVMConfigurationKeys.JDK_HOME, new File(System.getProperty("java.home"))); diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts index 98266abea02..49ccf8ff62a 100644 --- a/compiler/tests-different-jdk/build.gradle.kts +++ b/compiler/tests-different-jdk/build.gradle.kts @@ -85,15 +85,6 @@ codegenTest(target = 8, jdk = JdkMajorVersion.JDK_11) codegenTest(target = 11, jdk = JdkMajorVersion.JDK_11) -//JDK 15 (TODO: remove) -codegenTest(target = 6, jdk = JdkMajorVersion.JDK_15) - -codegenTest(target = 8, jdk = JdkMajorVersion.JDK_15) - -codegenTest(target = 15, jdk = JdkMajorVersion.JDK_15) { - systemProperty("kotlin.test.box.d8.disable", true) -} - //JDK 17 codegenTest(target = 6, jdk = JdkMajorVersion.JDK_17) diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt index 458209fce71..7e1c088f92c 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt @@ -206,13 +206,13 @@ fun generateJUnit3CompilerTests(args: Array) { model("loadJava/compiledJava", extension = "java", testMethod = "doTestCompiledJava") } - testClass { - model("loadJava15", extension = "java", testMethod = "doTestCompiledJava", testClassName = "CompiledJava") - model("loadJava15", extension = "java", testMethod = "doTestSourceJava", testClassName = "SourceJava") + testClass { + model("loadJava17", extension = "java", testMethod = "doTestCompiledJava", testClassName = "CompiledJava") + model("loadJava17", extension = "java", testMethod = "doTestSourceJava", testClassName = "SourceJava") } - testClass { - model("loadJava15", extension = "java", testMethod = "doTestCompiledJava") + testClass { + model("loadJava17", extension = "java", testMethod = "doTestCompiledJava") } testClass { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava15TestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava17TestGenerated.java similarity index 76% rename from compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava15TestGenerated.java rename to compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava17TestGenerated.java index 5d397aecd27..1df22323029 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava15TestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava17TestGenerated.java @@ -18,50 +18,50 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class LoadJava15TestGenerated extends AbstractLoadJava15Test { - @TestMetadata("compiler/testData/loadJava15") +public class LoadJava17TestGenerated extends AbstractLoadJava17Test { + @TestMetadata("compiler/testData/loadJava17") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompiledJava extends AbstractLoadJava15Test { + public static class CompiledJava extends AbstractLoadJava17Test { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } public void testAllFilesPresentInCompiledJava() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava15"), Pattern.compile("^(.+)\\.java$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava17"), Pattern.compile("^(.+)\\.java$"), null, true); } @TestMetadata("GenericRecord.java") public void testGenericRecord() throws Exception { - runTest("compiler/testData/loadJava15/GenericRecord.java"); + runTest("compiler/testData/loadJava17/GenericRecord.java"); } @TestMetadata("SimpleRecord.java") public void testSimpleRecord() throws Exception { - runTest("compiler/testData/loadJava15/SimpleRecord.java"); + runTest("compiler/testData/loadJava17/SimpleRecord.java"); } } - @TestMetadata("compiler/testData/loadJava15") + @TestMetadata("compiler/testData/loadJava17") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SourceJava extends AbstractLoadJava15Test { + public static class SourceJava extends AbstractLoadJava17Test { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestSourceJava, this, testDataFilePath); } public void testAllFilesPresentInSourceJava() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava15"), Pattern.compile("^(.+)\\.java$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava17"), Pattern.compile("^(.+)\\.java$"), null, true); } @TestMetadata("GenericRecord.java") public void testGenericRecord() throws Exception { - runTest("compiler/testData/loadJava15/GenericRecord.java"); + runTest("compiler/testData/loadJava17/GenericRecord.java"); } @TestMetadata("SimpleRecord.java") public void testSimpleRecord() throws Exception { - runTest("compiler/testData/loadJava15/SimpleRecord.java"); + runTest("compiler/testData/loadJava17/SimpleRecord.java"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava15WithPsiClassReadingTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava17WithPsiClassReadingTestGenerated.java similarity index 75% rename from compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava15WithPsiClassReadingTestGenerated.java rename to compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava17WithPsiClassReadingTestGenerated.java index 440959a61d7..c3324e81a89 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava15WithPsiClassReadingTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJava17WithPsiClassReadingTestGenerated.java @@ -17,25 +17,25 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/loadJava15") +@TestMetadata("compiler/testData/loadJava17") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class LoadJava15WithPsiClassReadingTestGenerated extends AbstractLoadJava15WithPsiClassReadingTest { +public class LoadJava17WithPsiClassReadingTestGenerated extends AbstractLoadJava17WithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } - public void testAllFilesPresentInLoadJava15() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava15"), Pattern.compile("^(.+)\\.java$"), null, true); + public void testAllFilesPresentInLoadJava17() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava17"), Pattern.compile("^(.+)\\.java$"), null, true); } @TestMetadata("GenericRecord.java") public void testGenericRecord() throws Exception { - runTest("compiler/testData/loadJava15/GenericRecord.java"); + runTest("compiler/testData/loadJava17/GenericRecord.java"); } @TestMetadata("SimpleRecord.java") public void testSimpleRecord() throws Exception { - runTest("compiler/testData/loadJava15/SimpleRecord.java"); + runTest("compiler/testData/loadJava17/SimpleRecord.java"); } } diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt index 55cc255baa6..87ab9a1acdb 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt @@ -332,16 +332,16 @@ compiler/testData/launcher/noInline.myscript:1:7: error: unresolved reference: C runProcess("kotlin", "-howtorun", "classfile", "test.HelloWorldKt", expectedStdout = "Hello!\n", workDirectory = tmpdir) } - fun testKotlincJdk15() { - val jdk15 = mapOf("JAVA_HOME" to KtTestUtil.getJdk15Home().absolutePath) + fun testKotlincJdk17() { + val jdk17 = mapOf("JAVA_HOME" to KtTestUtil.getJdk17Home().absolutePath) runProcess( "kotlinc", "$testDataDirectory/helloWorld.kt", "-d", tmpdir.path, - environment = jdk15, + environment = jdk17, ) runProcess( "kotlin", "-e", "listOf('O'.toString() + 'K')", - expectedStdout = "[OK]\n", environment = jdk15, + expectedStdout = "[OK]\n", environment = jdk17, ) }