Migrate all JDK 15 related tests to JDK 17

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")

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")

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")

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
+    // JDK found at $JDK_17
-    FULL_JDK_15(requiresSeparateProcess = true),
-
-    // JDK found at $JDK_15
     FULL_JDK_17(requiresSeparateProcess = true),
 
     // JDK found at java.home

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");

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

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

compiler/testData/codegen/boxModernJdk/testsWithJava15/_tags.txt

@@ -1 +0,0 @@
-<modernJava>

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

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
 
 <!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>

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

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

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
 
 <!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>

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
 
 <!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>

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

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

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")

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("<modernJava>")
-    @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("<modernJava>")
     @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
+        @Nested
-        @TestMetadata("compiledJavaSealedClass.kt")
+        @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava17/records")
-        public void testCompiledJavaSealedClass() throws Exception {
+        @TestDataPath("$PROJECT_ROOT")
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedClass.kt");
+        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
+        @Nested
-        @TestMetadata("compiledJavaSealedInterface.kt")
+        @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed")
-        public void testCompiledJavaSealedInterface() throws Exception {
+        @TestDataPath("$PROJECT_ROOT")
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedInterface.kt");
+        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
+            @Test
-        @TestMetadata("javaRecordsViaKotlinReflection.kt")
+            @TestMetadata("compiledJavaSealedClass.kt")
-        public void testJavaRecordsViaKotlinReflection() throws Exception {
+            public void testCompiledJavaSealedClass() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaRecordsViaKotlinReflection.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedClass.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("javaSealedClass.kt")
+            @TestMetadata("compiledJavaSealedInterface.kt")
-        public void testJavaSealedClass() throws Exception {
+            public void testCompiledJavaSealedInterface() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedClass.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedInterface.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("javaSealedInterface.kt")
+            @TestMetadata("javaRecordsViaKotlinReflection.kt")
-        public void testJavaSealedInterface() throws Exception {
+            public void testJavaRecordsViaKotlinReflection() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedInterface.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaRecordsViaKotlinReflection.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("sealedJavaClassViaJavaReflection.kt")
+            @TestMetadata("javaSealedClass.kt")
-        public void testSealedJavaClassViaJavaReflection() throws Exception {
+            public void testJavaSealedClass() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaJavaReflection.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedClass.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("sealedJavaClassViaKotlinReflection.kt")
+            @TestMetadata("javaSealedInterface.kt")
-        public void testSealedJavaClassViaKotlinReflection() throws Exception {
+            public void testJavaSealedInterface() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaKotlinReflection.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("sealedJavaInterfaceViaKotlinReflection.kt")
+            @TestMetadata("sealedJavaClassViaJavaReflection.kt")
-        public void testSealedJavaInterfaceViaKotlinReflection() throws Exception {
+            public void testSealedJavaClassViaJavaReflection() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaInterfaceViaKotlinReflection.kt");
+                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");
+            }
         }
     }
 }

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("<modernJava>")
-    @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("<modernJava>")
     @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
+        @Nested
-        @TestMetadata("compiledJavaSealedClass.kt")
+        @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava17/records")
-        public void testCompiledJavaSealedClass() throws Exception {
+        @TestDataPath("$PROJECT_ROOT")
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedClass.kt");
+        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
+        @Nested
-        @TestMetadata("compiledJavaSealedInterface.kt")
+        @TestMetadata("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed")
-        public void testCompiledJavaSealedInterface() throws Exception {
+        @TestDataPath("$PROJECT_ROOT")
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/compiledJavaSealedInterface.kt");
+        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
+            @Test
-        @TestMetadata("javaRecordsViaKotlinReflection.kt")
+            @TestMetadata("compiledJavaSealedClass.kt")
-        public void testJavaRecordsViaKotlinReflection() throws Exception {
+            public void testCompiledJavaSealedClass() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaRecordsViaKotlinReflection.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedClass.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("javaSealedClass.kt")
+            @TestMetadata("compiledJavaSealedInterface.kt")
-        public void testJavaSealedClass() throws Exception {
+            public void testCompiledJavaSealedInterface() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedClass.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/compiledJavaSealedInterface.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("javaSealedInterface.kt")
+            @TestMetadata("javaRecordsViaKotlinReflection.kt")
-        public void testJavaSealedInterface() throws Exception {
+            public void testJavaRecordsViaKotlinReflection() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/javaSealedInterface.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaRecordsViaKotlinReflection.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("sealedJavaClassViaJavaReflection.kt")
+            @TestMetadata("javaSealedClass.kt")
-        public void testSealedJavaClassViaJavaReflection() throws Exception {
+            public void testJavaSealedClass() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaJavaReflection.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedClass.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("sealedJavaClassViaKotlinReflection.kt")
+            @TestMetadata("javaSealedInterface.kt")
-        public void testSealedJavaClassViaKotlinReflection() throws Exception {
+            public void testJavaSealedInterface() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaClassViaKotlinReflection.kt");
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt");
-        }
+            }
 
-        @Test
+            @Test
-        @TestMetadata("sealedJavaInterfaceViaKotlinReflection.kt")
+            @TestMetadata("sealedJavaClassViaJavaReflection.kt")
-        public void testSealedJavaInterfaceViaKotlinReflection() throws Exception {
+            public void testSealedJavaClassViaJavaReflection() throws Exception {
-            runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealedJavaInterfaceViaKotlinReflection.kt");
+                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");
+            }
         }
     }
 }

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")

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")
         }

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

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
         }

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt

@@ -77,10 +77,6 @@ abstract class AbstractJvmBlackBoxCodegenTestBase<R : ResultingArtifact.Frontend
             configureModernJavaTest(TestJdkKind.FULL_JDK_11, JvmTarget.JVM_11)
         }
 
-        forTestsMatching("compiler/testData/codegen/boxModernJdk/testsWithJava15/*") {
-            configureModernJavaTest(TestJdkKind.FULL_JDK_15, JvmTarget.JVM_15)
-        }
-
         forTestsMatching("compiler/testData/codegen/boxModernJdk/testsWithJava17/*") {
             configureModernJavaTest(TestJdkKind.FULL_JDK_17, JvmTarget.JVM_17)
         }

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt

@@ -172,9 +172,6 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
             TestJdkKind.FULL_JDK_11 -> {
                 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())
             }

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$",
+                        "$JDK_17$",
-                        KtTestUtil.getJdk15Home().getPath()
+                        KtTestUtil.getJdk17Home().getPath()
                 );
     }
 

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() {
+abstract class AbstractLoadJava17Test : AbstractLoadJavaTest() {
-    override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_15
+    override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_17
-    override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk15Home()
+    override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk17Home()
-    override fun getAdditionalJavacArgs(): List<String> = ADDITIONAL_JAVAC_ARGS_FOR_15
+    override fun getAdditionalJavacArgs(): List<String> = 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")

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() {
+abstract class AbstractLoadJava17WithPsiClassReadingTest : AbstractLoadJavaWithPsiClassReadingTest() {
-    override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_15
+    override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_17
-    override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk15Home()
+    override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk17Home()
-    override fun getAdditionalJavacArgs(): List<String> = ADDITIONAL_JAVAC_ARGS_FOR_15
+    override fun getAdditionalJavacArgs(): List<String> = ADDITIONAL_JAVAC_ARGS_FOR_17
 }

compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt

@@ -42,7 +42,7 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
     }
 
     protected open fun getTestJdkKind(files: List<F>): 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")) {

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) {
+        else if (jdkKind == TestJdkKind.FULL_JDK_17) {
-            configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk15Home());
+            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")));

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)
 

compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt

@@ -206,13 +206,13 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
                 model("loadJava/compiledJava", extension = "java", testMethod = "doTestCompiledJava")
             }
 
-            testClass<AbstractLoadJava15Test> {
+            testClass<AbstractLoadJava17Test> {
-                model("loadJava15", extension = "java", testMethod = "doTestCompiledJava", testClassName = "CompiledJava")
+                model("loadJava17", extension = "java", testMethod = "doTestCompiledJava", testClassName = "CompiledJava")
-                model("loadJava15", extension = "java", testMethod = "doTestSourceJava", testClassName = "SourceJava")
+                model("loadJava17", extension = "java", testMethod = "doTestSourceJava", testClassName = "SourceJava")
             }
 
-            testClass<AbstractLoadJava15WithPsiClassReadingTest> {
+            testClass<AbstractLoadJava17WithPsiClassReadingTest> {
-                model("loadJava15", extension = "java", testMethod = "doTestCompiledJava")
+                model("loadJava17", extension = "java", testMethod = "doTestCompiledJava")
             }
 
             testClass<AbstractCompileJavaAgainstKotlinTest> {

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 {
+public class LoadJava17TestGenerated extends AbstractLoadJava17Test {
-    @TestMetadata("compiler/testData/loadJava15")
+    @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");
         }
     }
 }

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 {
+    public void testAllFilesPresentInLoadJava17() 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");
     }
 }

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() {
+    fun testKotlincJdk17() {
-        val jdk15 = mapOf("JAVA_HOME" to KtTestUtil.getJdk15Home().absolutePath)
+        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,
         )
     }