From de7fb9606a3840954af2678e096441c92502d8ad Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 22 Sep 2021 17:21:53 +0300 Subject: [PATCH] Migrate all JDK 9 related tests to JDK 11 --- .../kotlin/platform/jvm/JvmPlatform.kt | 8 +-- ...nAnnotationsCompiledJavaTestGenerated.java | 68 +++++++++---------- ...dJavaWithPsiClassReadingTestGenerated.java | 68 +++++++++---------- ...ignAnnotationsSourceJavaTestGenerated.java | 68 +++++++++---------- .../jetbrains/kotlin/test/TestJavacVersion.kt | 4 +- .../org/jetbrains/kotlin/test/TestJdkKind.kt | 3 - .../kotlin/test/util/KtTestUtil.java | 5 -- .../test/directives/TargetPlatformEnum.kt | 4 +- .../stringOperations/concatDynamic.kt | 4 +- .../stringOperations/concatDynamic199.kt | 2 +- .../stringOperations/concatDynamic200.kt | 2 +- .../stringOperations/concatDynamic201.kt | 4 +- .../concatDynamicConstants.kt | 4 +- .../concatDynamicDataClass.kt | 4 +- .../stringOperations/concatDynamicIndy.kt | 4 +- .../stringOperations/concatDynamicIndy201.kt | 4 +- .../concatDynamicIndyDataClass.kt | 2 +- .../concatDynamicSpecialSymbols.kt | 4 +- .../stringOperations/concatDynamicUnit.kt | 2 +- .../stringOperations/concatNotDynamic.kt | 4 +- .../stringOperations/kt42457_old.kt | 2 +- .../moduleAnnotations/strict/basic.kt | 0 .../moduleAnnotations/strict/basic.txt | 0 .../composeWithClassDefaultAnnotation.kt | 0 .../composeWithClassDefaultAnnotation.txt | 0 .../composeWithPackageDefaultAnnotation.kt | 0 .../composeWithPackageDefaultAnnotation.txt | 0 .../strict/dependentModulesNoNullMarked.kt | 0 .../strict/dependentModulesNoNullMarked.txt | 0 .../strict/dependentModulesNullMarked.kt | 0 .../strict/dependentModulesNullMarked.txt | 0 ...nnotationToAnotherModuleWithSamePackage.kt | 0 ...notationToAnotherModuleWithSamePackage.txt | 0 .../strict/dotNamedModule.kt | 0 .../strict/dotNamedModule.txt | 0 .../strict/inheritanceAcrossModules.kt | 0 .../strict/inheritanceAcrossModules.txt | 0 .../moduleAnnotations/strict/nestedClasses.kt | 0 .../strict/nestedClasses.txt | 0 .../strict/overrideAtDeclarationLevel.kt | 0 .../strict/overrideAtDeclarationLevel.txt | 0 .../strict/severalModulesDifferentPackages.kt | 0 .../severalModulesDifferentPackages.txt | 0 .../moduleAnnotations/warn/basic.fir.kt | 0 .../jspecify/moduleAnnotations/warn/basic.kt | 0 .../jspecify/moduleAnnotations/warn/basic.txt | 0 .../composeWithClassDefaultAnnotation.fir.kt | 0 .../warn/composeWithClassDefaultAnnotation.kt | 0 .../composeWithClassDefaultAnnotation.txt | 0 ...composeWithPackageDefaultAnnotation.fir.kt | 0 .../composeWithPackageDefaultAnnotation.kt | 0 .../composeWithPackageDefaultAnnotation.txt | 0 .../warn/dependentModulesNoNullMarked.kt | 0 .../warn/dependentModulesNoNullMarked.txt | 0 .../warn/dependentModulesNullMarked.fir.kt | 0 .../warn/dependentModulesNullMarked.kt | 0 .../warn/dependentModulesNullMarked.txt | 0 ...nnotationToAnotherModuleWithSamePackage.kt | 0 ...notationToAnotherModuleWithSamePackage.txt | 0 .../warn/dotNamedModule.fir.kt | 0 .../moduleAnnotations/warn/dotNamedModule.kt | 0 .../moduleAnnotations/warn/dotNamedModule.txt | 0 .../warn/inheritanceAcrossModules.fir.kt | 0 .../warn/inheritanceAcrossModules.kt | 0 .../warn/inheritanceAcrossModules.txt | 0 .../warn/nestedClasses.fir.kt | 0 .../moduleAnnotations/warn/nestedClasses.kt | 0 .../moduleAnnotations/warn/nestedClasses.txt | 0 .../warn/overrideAtDeclarationLevel.kt | 0 .../warn/overrideAtDeclarationLevel.txt | 0 .../severalModulesDifferentPackages.fir.kt | 0 .../warn/severalModulesDifferentPackages.kt | 0 .../warn/severalModulesDifferentPackages.txt | 0 .../testData/diagnostics/tests/kt11167.kt | 2 +- ...nAnnotationsCompiledJavaTestGenerated.java | 68 +++++++++---------- ...dJavaWithPsiClassReadingTestGenerated.java | 68 +++++++++---------- ...ignAnnotationsSourceJavaTestGenerated.java | 68 +++++++++---------- .../backend/classic/JavaCompilerFacade.kt | 2 +- .../runners/AbstractForeignAnnotationsTest.kt | 6 +- .../JvmEnvironmentConfigurator.kt | 9 +-- .../JvmForeignAnnotationsConfigurator.kt | 6 +- .../impl/ModuleStructureExtractorImpl.kt | 8 +-- .../kotlin/test/KotlinTestUtils.java | 7 +- .../kotlin/test/MockLibraryUtilExt.kt | 8 +-- .../kotlin/test/JvmCompilationUtils.kt | 4 +- .../jetbrains/kotlin/test/MockLibraryUtil.kt | 16 ++--- .../generators/GenerateJUnit5CompilerTests.kt | 12 ++-- ...est.kt => Java11ModulesIntegrationTest.kt} | 20 +++--- .../kapt3/test/AbstractKotlinKapt3Test.kt | 1 - .../test/IrKotlinKapt3IntegrationTests.kt | 4 +- .../kapt3/test/KotlinKapt3IntegrationTests.kt | 4 +- .../kotlin/kapt3/test/java9TestUtils.kt | 7 -- 92 files changed, 284 insertions(+), 306 deletions(-) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/basic.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/basic.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/dotNamedModule.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/dotNamedModule.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/nestedClasses.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/nestedClasses.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/basic.fir.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/basic.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/basic.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dotNamedModule.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/dotNamedModule.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/nestedClasses.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/nestedClasses.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt (100%) rename compiler/testData/diagnostics/foreignAnnotationsTests/{java9Tests => java11Tests}/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.txt (100%) rename compiler/tests/org/jetbrains/kotlin/jvm/compiler/{Java9ModulesIntegrationTest.kt => Java11ModulesIntegrationTest.kt} (94%) diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt index 1f56059fa5a..650521a80da 100644 --- a/compiler/config.jvm/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt +++ b/compiler/config.jvm/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt @@ -31,10 +31,10 @@ object JvmPlatforms { val defaultJvmPlatform: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.DEFAULT]!! - val jvm16: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_1_6]!! - val jvm18: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_1_8]!! - val jvm9: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_9]!! - val jvm15: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_15]!! + val jvm6: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_1_6]!! + val jvm8: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_1_8]!! + val jvm11: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_11]!! + val jvm17: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_17]!! fun jvmPlatformByTargetVersion(targetVersion: JvmTarget): TargetPlatform = jvmTargetToJdkPlatform[targetVersion]!! diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java index b3b2186013e..08c905d6538 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java @@ -964,181 +964,181 @@ public class FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated extends A } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests") @TestDataPath("$PROJECT_ROOT") - public class Java9Tests { + public class Java11Tests { @Test - public void testAllFilesPresentInJava9Tests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + public void testAllFilesPresentInJava11Tests() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify") @TestDataPath("$PROJECT_ROOT") public class Jspecify { @Test public void testAllFilesPresentInJspecify() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations") @TestDataPath("$PROJECT_ROOT") public class ModuleAnnotations { @Test public void testAllFilesPresentInModuleAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict") @TestDataPath("$PROJECT_ROOT") public class Strict { @Test public void testAllFilesPresentInStrict() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); } } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn") @TestDataPath("$PROJECT_ROOT") public class Warn { @Test public void testAllFilesPresentInWarn() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); } } } diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java index af3e98aa3f7..d97294592a3 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java @@ -964,181 +964,181 @@ public class FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTest } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests") @TestDataPath("$PROJECT_ROOT") - public class Java9Tests { + public class Java11Tests { @Test - public void testAllFilesPresentInJava9Tests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + public void testAllFilesPresentInJava11Tests() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify") @TestDataPath("$PROJECT_ROOT") public class Jspecify { @Test public void testAllFilesPresentInJspecify() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations") @TestDataPath("$PROJECT_ROOT") public class ModuleAnnotations { @Test public void testAllFilesPresentInModuleAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict") @TestDataPath("$PROJECT_ROOT") public class Strict { @Test public void testAllFilesPresentInStrict() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); } } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn") @TestDataPath("$PROJECT_ROOT") public class Warn { @Test public void testAllFilesPresentInWarn() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); } } } diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsSourceJavaTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsSourceJavaTestGenerated.java index 8a134e345b4..9f23df9ea9f 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsSourceJavaTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsSourceJavaTestGenerated.java @@ -964,181 +964,181 @@ public class FirOldFrontendForeignAnnotationsSourceJavaTestGenerated extends Abs } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests") @TestDataPath("$PROJECT_ROOT") - public class Java9Tests { + public class Java11Tests { @Test - public void testAllFilesPresentInJava9Tests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + public void testAllFilesPresentInJava11Tests() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify") @TestDataPath("$PROJECT_ROOT") public class Jspecify { @Test public void testAllFilesPresentInJspecify() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations") @TestDataPath("$PROJECT_ROOT") public class ModuleAnnotations { @Test public void testAllFilesPresentInModuleAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict") @TestDataPath("$PROJECT_ROOT") public class Strict { @Test public void testAllFilesPresentInStrict() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); } } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn") @TestDataPath("$PROJECT_ROOT") public class Warn { @Test public void testAllFilesPresentInWarn() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); } } } diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJavacVersion.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJavacVersion.kt index 1f9d5c7839d..d5d3086470b 100644 --- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJavacVersion.kt +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJavacVersion.kt @@ -6,5 +6,5 @@ package org.jetbrains.kotlin.test enum class TestJavacVersion { - JAVAC_1_8, JAVAC_9 -} \ No newline at end of file + JAVAC_1_8, JAVAC_11 +} 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 49d50441533..9a004d23895 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 @@ -26,9 +26,6 @@ enum class TestJdkKind(val requiresSeparateProcess: Boolean = false) { // JDK found at $JDK_16 FULL_JDK_6(requiresSeparateProcess = true), - // JDK found at $JDK_9 - FULL_JDK_9(requiresSeparateProcess = true), - // JDK found at $JDK_11 FULL_JDK_11(requiresSeparateProcess = true), 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 9d034ed298f..6c9fe020f81 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 @@ -140,11 +140,6 @@ public class KtTestUtil { return getJdkHome("JDK_8", "JDK_18"); } - @NotNull - public static File getJdk9Home() { - return getJdkHome("JDK_9", "JDK_19"); - } - @NotNull public static File getJdk11Home() { return getJdkHome("JDK_11"); diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/TargetPlatformEnum.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/TargetPlatformEnum.kt index 27bc5c4e5be..5b1c7012863 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/TargetPlatformEnum.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/TargetPlatformEnum.kt @@ -25,8 +25,8 @@ enum class TargetPlatformEnum(val targetPlatform: TargetPlatform) { ), JVM(JvmPlatforms.unspecifiedJvmPlatform), - JVM_1_6(JvmPlatforms.jvm16), - JVM_1_8(JvmPlatforms.jvm18), + JVM_1_6(JvmPlatforms.jvm6), + JVM_1_8(JvmPlatforms.jvm8), JS(JsPlatforms.defaultJsPlatform), Native(NativePlatforms.unspecifiedNativePlatform) diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic.kt index 933ec8c876b..929f7664907 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic.kt @@ -1,4 +1,4 @@ -// JVM_TARGET: 9 +// JVM_TARGET: 11 class A inline class IC(val x: String) @@ -42,4 +42,4 @@ fun box(a: String, b: String?, x: IC?) { // .. but ir backend performs wise `toString-impl` call // one in IC.toString() + one in concatenation -// 2 INVOKESTATIC IC.toString-impl \ No newline at end of file +// 2 INVOKESTATIC IC.toString-impl diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic199.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic199.kt index 23900b36906..13ee2ab701f 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic199.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic199.kt @@ -1,5 +1,5 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants -// JVM_TARGET: 9 +// JVM_TARGET: 11 fun box() { val z = "0" diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic200.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic200.kt index d70aa654614..c9a4a4308ed 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic200.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic200.kt @@ -1,5 +1,5 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants -// JVM_TARGET: 9 +// JVM_TARGET: 11 fun box() { val z = "0" diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic201.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic201.kt index 58e88933106..dcb9a72f0db 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic201.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamic201.kt @@ -1,5 +1,5 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants -// JVM_TARGET: 9 +// JVM_TARGET: 11 fun box() { val z = "0" val result = z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + @@ -16,4 +16,4 @@ fun box() { } // 2 INVOKEDYNAMIC makeConcatWithConstants // 0 append -// 0 stringPlus \ No newline at end of file +// 0 stringPlus diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicConstants.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicConstants.kt index 882806bf9ad..b89a781ccd4 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicConstants.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicConstants.kt @@ -1,5 +1,5 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants -// JVM_TARGET: 9 +// JVM_TARGET: 11 class A inline fun test(s: (String) -> Unit) { @@ -12,4 +12,4 @@ fun box(a: String, b: String?) { // 1 INVOKEDYNAMIC makeConcatWithConstants // 0 append -// 0 stringPlus \ No newline at end of file +// 0 stringPlus diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicDataClass.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicDataClass.kt index edf0c63045a..a1cc00524c2 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicDataClass.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicDataClass.kt @@ -1,7 +1,7 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants -// JVM_TARGET: 9 +// JVM_TARGET: 11 data class A(val i: Int, val b: Byte, val c: Char, val s: Short, val f: Float, val d: Double, val bo: Boolean, val l: Long) // 1 INVOKEDYNAMIC makeConcatWithConstants // 1 INVOKEDYNAMIC makeConcatWithConstants\(IBCSFDZJ\)Ljava/lang/String; -// 1 "A\(i=\\u0001, b=\\u0001, c=\\u0001, s=\\u0001, f=\\u0001, d=\\u0001, bo=\\u0001, l=\\u0001\)" \ No newline at end of file +// 1 "A\(i=\\u0001, b=\\u0001, c=\\u0001, s=\\u0001, f=\\u0001, d=\\u0001, bo=\\u0001, l=\\u0001\)" diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndy.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndy.kt index d8ed0a68ff5..273fde5590c 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndy.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndy.kt @@ -1,5 +1,5 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy -// JVM_TARGET: 9 +// JVM_TARGET: 11 class A inline fun test(s: (String) -> Unit) { @@ -20,4 +20,4 @@ fun box(a: String, b: String?) { // 0 INVOKEDYNAMIC makeConcatWithConstants // 6 INVOKEDYNAMIC makeConcat // 0 append -// 0 stringPlus \ No newline at end of file +// 0 stringPlus diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndy201.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndy201.kt index bf450fc4679..5f04472de8d 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndy201.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndy201.kt @@ -1,5 +1,5 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy -// JVM_TARGET: 9 +// JVM_TARGET: 11 fun box() { val z = "0" val result = z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + @@ -17,4 +17,4 @@ fun box() { } // 2 INVOKEDYNAMIC makeConcat // 0 append -// 0 stringPlus \ No newline at end of file +// 0 stringPlus diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndyDataClass.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndyDataClass.kt index b80b70efb92..357ebae223a 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndyDataClass.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicIndyDataClass.kt @@ -1,5 +1,5 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy -// JVM_TARGET: 9 +// JVM_TARGET: 11 data class A(val i: Int, val b: Byte, val c: Char, val s: Short, val f: Float, val d: Double, val bo: Boolean, val l: Long) // 1 INVOKEDYNAMIC makeConcat diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicSpecialSymbols.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicSpecialSymbols.kt index bede79dee4a..3918c439c8a 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicSpecialSymbols.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicSpecialSymbols.kt @@ -1,4 +1,4 @@ -// JVM_TARGET: 9 +// JVM_TARGET: 11 fun box(a: String, b: String?) { val s = a + "\u0001" + 2.toChar() + 3.toChar() + 4L + b + 5.0 + 6F + '7' + b + "\u0002" + 1.toChar() @@ -14,4 +14,4 @@ fun box(a: String, b: String?) { // JVM_IR_TEMPLATES // 1 "\\u0001\\u0002\\u00015.06.07\\u0001\\u0002" // 1 "\\u0001\\u0002\\u00034" -// 1 "\\u0002\\u0001" \ No newline at end of file +// 1 "\\u0002\\u0001" diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicUnit.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicUnit.kt index 1d2a5d39a42..e744995772c 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicUnit.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatDynamicUnit.kt @@ -1,4 +1,4 @@ -// JVM_TARGET: 9 +// JVM_TARGET: 11 data class A(val x: Unit) fun test(): Unit {} diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/concatNotDynamic.kt b/compiler/testData/codegen/bytecodeText/stringOperations/concatNotDynamic.kt index 9ee0ca65348..92897c4ce16 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/concatNotDynamic.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/concatNotDynamic.kt @@ -1,5 +1,5 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants -// JVM_TARGET: 9 +// JVM_TARGET: 11 fun box(a: String, b: String?) { val sb = StringBuilder(); sb.append("123") @@ -7,4 +7,4 @@ fun box(a: String, b: String?) { // 0 INVOKEDYNAMIC makeConcatWithConstants // 1 append -// 0 stringPlus \ No newline at end of file +// 0 stringPlus diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/kt42457_old.kt b/compiler/testData/codegen/bytecodeText/stringOperations/kt42457_old.kt index fc5efe96610..e6ecd51f827 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/kt42457_old.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/kt42457_old.kt @@ -1,6 +1,6 @@ // KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants // IGNORE_JAVA_ERRORS -// JVM_TARGET: 9 +// JVM_TARGET: 11 // FILE: JavaClass.java public class JavaClass { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.fir.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.fir.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.fir.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.txt similarity index 100% rename from compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.txt rename to compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.txt diff --git a/compiler/testData/diagnostics/tests/kt11167.kt b/compiler/testData/diagnostics/tests/kt11167.kt index c68da98130d..3d29751ab9e 100644 --- a/compiler/testData/diagnostics/tests/kt11167.kt +++ b/compiler/testData/diagnostics/tests/kt11167.kt @@ -1,5 +1,5 @@ // FIR_IDENTICAL -// JDK_KIND: FULL_JDK_9 +// JDK_KIND: FULL_JDK_11 // WITH_STDLIB import java.util.stream.IntStream diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java index d8db3a432e6..abb85b55a07 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java @@ -964,181 +964,181 @@ public class ForeignAnnotationsCompiledJavaTestGenerated extends AbstractForeign } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests") @TestDataPath("$PROJECT_ROOT") - public class Java9Tests { + public class Java11Tests { @Test - public void testAllFilesPresentInJava9Tests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + public void testAllFilesPresentInJava11Tests() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify") @TestDataPath("$PROJECT_ROOT") public class Jspecify { @Test public void testAllFilesPresentInJspecify() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations") @TestDataPath("$PROJECT_ROOT") public class ModuleAnnotations { @Test public void testAllFilesPresentInModuleAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict") @TestDataPath("$PROJECT_ROOT") public class Strict { @Test public void testAllFilesPresentInStrict() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); } } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn") @TestDataPath("$PROJECT_ROOT") public class Warn { @Test public void testAllFilesPresentInWarn() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); } } } diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java index 96361164d9f..fef2f485e52 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java @@ -964,181 +964,181 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests") @TestDataPath("$PROJECT_ROOT") - public class Java9Tests { + public class Java11Tests { @Test - public void testAllFilesPresentInJava9Tests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + public void testAllFilesPresentInJava11Tests() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify") @TestDataPath("$PROJECT_ROOT") public class Jspecify { @Test public void testAllFilesPresentInJspecify() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations") @TestDataPath("$PROJECT_ROOT") public class ModuleAnnotations { @Test public void testAllFilesPresentInModuleAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict") @TestDataPath("$PROJECT_ROOT") public class Strict { @Test public void testAllFilesPresentInStrict() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); } } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn") @TestDataPath("$PROJECT_ROOT") public class Warn { @Test public void testAllFilesPresentInWarn() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); } } } diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java index 7d68bae0702..e553f58fb47 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java @@ -964,181 +964,181 @@ public class ForeignAnnotationsSourceJavaTestGenerated extends AbstractForeignAn } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests") @TestDataPath("$PROJECT_ROOT") - public class Java9Tests { + public class Java11Tests { @Test - public void testAllFilesPresentInJava9Tests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + public void testAllFilesPresentInJava11Tests() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify") @TestDataPath("$PROJECT_ROOT") public class Jspecify { @Test public void testAllFilesPresentInJspecify() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations") @TestDataPath("$PROJECT_ROOT") public class ModuleAnnotations { @Test public void testAllFilesPresentInModuleAnnotations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict") @TestDataPath("$PROJECT_ROOT") public class Strict { @Test public void testAllFilesPresentInStrict() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt"); } } @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn") + @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn") @TestDataPath("$PROJECT_ROOT") public class Warn { @Test public void testAllFilesPresentInWarn() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @Test @TestMetadata("basic.kt") public void testBasic() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/basic.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt"); } @Test @TestMetadata("composeWithClassDefaultAnnotation.kt") public void testComposeWithClassDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt"); } @Test @TestMetadata("composeWithPackageDefaultAnnotation.kt") public void testComposeWithPackageDefaultAnnotation() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt"); } @Test @TestMetadata("dependentModulesNoNullMarked.kt") public void testDependentModulesNoNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt"); } @Test @TestMetadata("dependentModulesNullMarked.kt") public void testDependentModulesNullMarked() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt"); } @Test @TestMetadata("dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt") public void testDontPropagateModuleAnnotationToAnotherModuleWithSamePackage() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt"); } @Test @TestMetadata("dotNamedModule.kt") public void testDotNamedModule() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt"); } @Test @TestMetadata("inheritanceAcrossModules.kt") public void testInheritanceAcrossModules() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt"); } @Test @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt"); } @Test @TestMetadata("overrideAtDeclarationLevel.kt") public void testOverrideAtDeclarationLevel() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt"); } @Test @TestMetadata("severalModulesDifferentPackages.kt") public void testSeveralModulesDifferentPackages() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt"); + runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.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 967d9a3af9c..22659d8af2e 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 @@ -81,7 +81,7 @@ class JavaCompilerFacade(private val testServices: TestServices) { val jdkHome = when (jvmTarget) { JvmTarget.JVM_1_6 -> KtTestUtil.getJdk6Home() JvmTarget.JVM_1_8 -> KtTestUtil.getJdk8Home() - JvmTarget.JVM_9 -> KtTestUtil.getJdk9Home() + JvmTarget.JVM_9, JvmTarget.JVM_11 -> KtTestUtil.getJdk11Home() JvmTarget.JVM_15, JvmTarget.JVM_17 -> KtTestUtil.getJdk17Home() diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt index 6f0a4d8f4da..232971c56cf 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt @@ -92,11 +92,11 @@ abstract class AbstractForeignAnnotationsTestBase(private val kind: ForeignAnnot } } - forTestsMatching("compiler/testData/diagnostics/foreignAnnotationsTests/java9Tests/*") { + forTestsMatching("compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/*") { defaultDirectives { ANNOTATIONS_PATH with JavaForeignAnnotationType.Java9Annotations - JDK_KIND with TestJdkKind.FULL_JDK_9 - COMPILE_JAVA_USING with TestJavacVersion.JAVAC_9 + JDK_KIND with TestJdkKind.FULL_JDK_11 + COMPILE_JAVA_USING with TestJavacVersion.JAVAC_11 } } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt index 3673477c3a8..83fc9b50cf7 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt @@ -166,9 +166,6 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig val jdk6 = System.getenv("JDK_16") ?: error("Environment variable JDK_16 is not set") configuration.put(JVMConfigurationKeys.JDK_HOME, File(jdk6)) } - TestJdkKind.FULL_JDK_9 -> { - configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk9Home()) - } TestJdkKind.FULL_JDK_11 -> { configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk11Home()) } @@ -195,7 +192,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig module.javaFiles.filter { INCLUDE_JAVA_AS_BINARY in it.directives } } else module.javaFiles - val useJava9ToCompileIncludedJavaFiles = javaVersionToCompile == TestJavacVersion.JAVAC_9 + val useJava11ToCompileIncludedJavaFiles = javaVersionToCompile == TestJavacVersion.JAVAC_11 if (configurationKind.withRuntime) { configuration.configureStandardLibs(PathUtil.kotlinPathsForDistDirectory, K2JVMCompilerArguments().also { it.noReflect = true }) @@ -239,7 +236,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig JAVA_BINARIES_JAR_NAME, extraClasspath = configuration.jvmClasspathRoots.map { it.absolutePath }, assertions = JUnit5Assertions, - useJava9 = useJava9ToCompileIncludedJavaFiles + useJava11 = useJava11ToCompileIncludedJavaFiles ) ) } @@ -340,7 +337,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig extraClasspath = configuration.jvmClasspathRoots.map { it.absolutePath }, extraModulepath = modulePath, assertions = JUnit5Assertions, - useJava9 = true + useJava11 = true ) } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt index 1d6f70caa95..8c6eee6ce16 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt @@ -78,7 +78,7 @@ open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : Envir override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { val registeredDirectives = module.directives val javaVersionToCompile = registeredDirectives[JvmEnvironmentConfigurationDirectives.COMPILE_JAVA_USING].singleOrNull() - val useJava9ToCompileIncludedJavaFiles = javaVersionToCompile == TestJavacVersion.JAVAC_9 + val useJava11ToCompileIncludedJavaFiles = javaVersionToCompile == TestJavacVersion.JAVAC_11 val annotationPath = registeredDirectives[ForeignAnnotationsDirectives.ANNOTATIONS_PATH].singleOrNull() ?: JavaForeignAnnotationType.Java8Annotations val javaFilesDir = createTempDirectory().toFile().also { @@ -89,9 +89,9 @@ open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : Envir "foreign-annotations", assertions = JUnit5Assertions, extraClasspath = configuration.jvmClasspathRoots.map { it.absolutePath }, - useJava9 = useJava9ToCompileIncludedJavaFiles + useJava11 = useJava11ToCompileIncludedJavaFiles ) - configuration.addModularRootIfNotNull(useJava9ToCompileIncludedJavaFiles, "java9_annotations", foreignAnnotationsJar) + configuration.addModularRootIfNotNull(useJava11ToCompileIncludedJavaFiles, "java9_annotations", foreignAnnotationsJar) configuration.addJvmClasspathRoot(ForTestCompileRuntime.jvmAnnotationsForTests()) if (JvmEnvironmentConfigurationDirectives.WITH_JSR305_TEST_ANNOTATIONS in registeredDirectives) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt index 7bf4d60e777..c4ce009149a 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt @@ -244,10 +244,10 @@ class ModuleStructureExtractorImpl( assertions.fail { "JVM target should be single" } } else { when (values.single()) { - "1.6" -> JvmPlatforms.jvm16 - "1.8" -> JvmPlatforms.jvm18 - "9" -> JvmPlatforms.jvm9 - "15" -> JvmPlatforms.jvm15 + "1.6" -> JvmPlatforms.jvm6 + "1.8" -> JvmPlatforms.jvm8 + "11" -> JvmPlatforms.jvm11 + "17" -> JvmPlatforms.jvm17 else -> assertions.fail { "Incorrect value for JVM target" } } } 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 2c95e2f1dd0..123f56aa060 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -190,9 +190,6 @@ public class KotlinTestUtils { assert jdk6 != null : "Environment variable JDK_16 is not set"; configuration.put(JVMConfigurationKeys.JDK_HOME, new File(jdk6)); } - else if (jdkKind == TestJdkKind.FULL_JDK_9) { - configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk9Home()); - } else if (jdkKind == TestJdkKind.FULL_JDK_17) { configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk17Home()); } @@ -415,8 +412,8 @@ public class KotlinTestUtils { return JvmCompilationUtils.compileJavaFiles(files, options, javaErrorFile, JUnit4Assertions.INSTANCE); } - public static boolean compileJavaFilesExternallyWithJava9(@NotNull Collection files, @NotNull List options) { - return JvmCompilationUtils.compileJavaFilesExternally(files, options, KtTestUtil.getJdk9Home()); + public static boolean compileJavaFilesExternallyWithJava11(@NotNull Collection files, @NotNull List options) { + return JvmCompilationUtils.compileJavaFilesExternally(files, options, KtTestUtil.getJdk11Home()); } public static boolean compileJavaFilesExternally(@NotNull Collection files, @NotNull List options, @NotNull File jdkHome) { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtilExt.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtilExt.kt index 03d39796080..869961ad982 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtilExt.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtilExt.kt @@ -38,7 +38,7 @@ object MockLibraryUtilExt { allowKotlinSources: Boolean = true, extraOptions: List = emptyList(), extraClasspath: List = emptyList(), - useJava9: Boolean = false, + useJava11: Boolean = false, ): File { return MockLibraryUtil.compileJvmLibraryToJar( sourcesPath, @@ -48,7 +48,7 @@ object MockLibraryUtilExt { extraOptions, extraClasspath, extraModulepath = listOf(), - useJava9, + useJava11, JUnit4Assertions ) } @@ -63,7 +63,7 @@ object MockLibraryUtilExt { allowKotlinSources: Boolean = true, extraOptions: List = emptyList(), extraClasspath: List = emptyList(), - useJava9: Boolean = false + useJava11: Boolean = false ): File { return MockLibraryUtil.compileLibraryToJar( sourcesPath, @@ -74,7 +74,7 @@ object MockLibraryUtilExt { extraOptions, extraClasspath, extraModulepath = listOf(), - useJava9, + useJava11, JUnit4Assertions ) } diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/JvmCompilationUtils.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/JvmCompilationUtils.kt index 1b1b1a805ca..dfdb6368393 100644 --- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/JvmCompilationUtils.kt +++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/JvmCompilationUtils.kt @@ -55,8 +55,8 @@ fun compileJavaFiles( } } -fun compileJavaFilesExternallyWithJava9(files: Collection, options: List): Boolean { - return compileJavaFilesExternally(files, options, KtTestUtil.getJdk9Home()) +fun compileJavaFilesExternallyWithJava11(files: Collection, options: List): Boolean { + return compileJavaFilesExternally(files, options, KtTestUtil.getJdk11Home()) } fun compileJavaFilesExternally(files: Collection, options: List, jdkHome: File): Boolean { diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt index 8db0a675674..016458d1175 100644 --- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt +++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt @@ -38,7 +38,7 @@ object MockLibraryUtil { extraOptions: List = emptyList(), extraClasspath: List = emptyList(), extraModulepath: List = emptyList(), - useJava9: Boolean = false, + useJava11: Boolean = false, assertions: Assertions ): File { return compileLibraryToJar( @@ -50,7 +50,7 @@ object MockLibraryUtil { extraOptions, extraClasspath, extraModulepath, - useJava9, + useJava11, assertions ) } @@ -64,7 +64,7 @@ object MockLibraryUtil { extraClasspath: List = emptyList(), extraModulepath: List = emptyList(), assertions: Assertions, - useJava9: Boolean = false + useJava11: Boolean = false ): File { return compileJvmLibraryToJar( sourcesPath, jarName, addSources, @@ -72,7 +72,7 @@ object MockLibraryUtil { extraOptions, extraClasspath, extraModulepath, - useJava9, + useJava11, assertions ) } @@ -88,10 +88,10 @@ object MockLibraryUtil { extraOptions: List = emptyList(), extraClasspath: List = emptyList(), extraModulepath: List = emptyList(), - useJava9: Boolean = false, + useJava11: Boolean = false, assertions: Assertions ): File { - assertTrue("Module path can be used only for compilation using javac 9 and higher", useJava9 || extraModulepath.isEmpty()) + assertTrue("Module path can be used only for compilation using javac 9 and higher", useJava11 || extraModulepath.isEmpty()) val classesDir = File(contentDir, "classes") @@ -121,14 +121,14 @@ object MockLibraryUtil { add("-d") add(classesDir.path) - if (useJava9 && extraModulepath.isNotEmpty()) { + if (useJava11 && extraModulepath.isNotEmpty()) { add("--module-path") add(extraModulepath.joinToString(File.pathSeparator)) } } val compile = - if (useJava9) ::compileJavaFilesExternallyWithJava9 + if (useJava11) ::compileJavaFilesExternallyWithJava11 else { files, opts -> compileJavaFiles(files, opts, assertions = assertions) } val success = compile(javaFiles, options) diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt index 252f41e0aac..1a5923f19c9 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt @@ -52,19 +52,19 @@ fun generateJUnit5CompilerTests(args: Array) { testClass { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedFirTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedFirTestdataPattern) - model("diagnostics/foreignAnnotationsTests/java9Tests", excludedPattern = excludedFirTestdataPattern) + model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedFirTestdataPattern) } testClass { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedFirTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedFirTestdataPattern) - model("diagnostics/foreignAnnotationsTests/java9Tests", excludedPattern = excludedFirTestdataPattern) + model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedFirTestdataPattern) } testClass { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedFirTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedFirTestdataPattern) - model("diagnostics/foreignAnnotationsTests/java9Tests", excludedPattern = excludedFirTestdataPattern) + model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedFirTestdataPattern) } testClass { @@ -160,7 +160,7 @@ fun generateJUnit5CompilerTests(args: Array) { ) { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedFirTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedFirTestdataPattern) - model("diagnostics/foreignAnnotationsTests/java9Tests", excludedPattern = excludedFirTestdataPattern) + model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedFirTestdataPattern) } testClass( @@ -168,7 +168,7 @@ fun generateJUnit5CompilerTests(args: Array) { ) { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedFirTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedFirTestdataPattern) - model("diagnostics/foreignAnnotationsTests/java9Tests", excludedPattern = excludedFirTestdataPattern) + model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedFirTestdataPattern) } testClass( @@ -176,7 +176,7 @@ fun generateJUnit5CompilerTests(args: Array) { ) { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedFirTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedFirTestdataPattern) - model("diagnostics/foreignAnnotationsTests/java9Tests", excludedPattern = excludedFirTestdataPattern) + model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedFirTestdataPattern) } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java9ModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt similarity index 94% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java9ModulesIntegrationTest.kt rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt index 8d58b8ff89d..546117f1313 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java9ModulesIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt @@ -14,7 +14,7 @@ import java.io.File import java.util.concurrent.TimeUnit import java.util.jar.Manifest -class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { +class Java11ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { override val testDataPath: String get() = "compiler/testData/javaModules/" @@ -29,7 +29,7 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { val paths = (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(separator = File.pathSeparator) { it.path } val kotlinOptions = mutableListOf( - "-jdk-home", KtTestUtil.getJdk9Home().path, + "-jdk-home", KtTestUtil.getJdk11Home().path, "-jvm-target", "1.8", "-Xmodule-path=$paths" ) @@ -50,7 +50,7 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { javaOptions += "--add-modules" javaOptions += addModules.joinToString() } - KotlinTestUtils.compileJavaFilesExternallyWithJava9(javaFiles, javaOptions) + KotlinTestUtils.compileJavaFilesExternallyWithJava11(javaFiles, javaOptions) }, checkKotlinOutput = checkKotlinOutput, manifest = manifest @@ -65,7 +65,7 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { private fun runModule(className: String, modulePath: List): ModuleRunResult { val command = listOf( - File(KtTestUtil.getJdk9Home(), "bin/java").path, + File(KtTestUtil.getJdk11Home(), "bin/java").path, "-p", (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(File.pathSeparator, transform = File::getPath), "-m", className ) @@ -172,7 +172,7 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { val kotlinOptions = mutableListOf( "$testDataDirectory/someOtherDirectoryWithTheActualModuleInfo/module-info.java", - "-jdk-home", KtTestUtil.getJdk9Home().path, + "-jdk-home", KtTestUtil.getJdk11Home().path, "-Xmodule-path=${a.path}" ) compileLibrary( @@ -186,15 +186,15 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { fun testMultiReleaseLibrary() { val librarySrc = FileUtil.findFilesByMask(JAVA_FILES, File(testDataDirectory, "library")) val libraryOut = File(tmpdir, "out") - KotlinTestUtils.compileJavaFilesExternallyWithJava9(librarySrc, listOf("-d", libraryOut.path)) + KotlinTestUtils.compileJavaFilesExternallyWithJava11(librarySrc, listOf("-d", libraryOut.path)) - val libraryOut9 = File(tmpdir, "out9") - libraryOut9.mkdirs() - File(libraryOut, "module-info.class").renameTo(File(libraryOut9, "module-info.class")) + val libraryOut11 = File(tmpdir, "out11") + libraryOut11.mkdirs() + File(libraryOut, "module-info.class").renameTo(File(libraryOut11, "module-info.class")) // Use the name other from 'library' to prevent it from being loaded as an automatic module if module-info.class is not found val libraryJar = createMultiReleaseJar( - KtTestUtil.getJdk9Home(), File(tmpdir, "multi-release-library.jar"), libraryOut, libraryOut9 + KtTestUtil.getJdk11Home(), File(tmpdir, "multi-release-library.jar"), libraryOut, libraryOut11 ) module("main", listOf(libraryJar)) diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt index 7d422f712a5..98a7ce893e0 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt @@ -264,7 +264,6 @@ open class AbstractClassFileToSourceStubConverterTest : AbstractKotlinKapt3Test( addOrRemoveFlag(KaptFlag.KEEP_KDOC_COMMENTS_IN_STUBS, testFile) super.doTest(filePath) - doTestWithJdk9(AbstractClassFileToSourceStubConverterTest::class.java, filePath) doTestWithJdk11(AbstractClassFileToSourceStubConverterTest::class.java, filePath) } diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/IrKotlinKapt3IntegrationTests.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/IrKotlinKapt3IntegrationTests.kt index b03d287f405..ab701a10b5f 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/IrKotlinKapt3IntegrationTests.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/IrKotlinKapt3IntegrationTests.kt @@ -20,7 +20,7 @@ class IrKotlinKapt3IntegrationTests : AbstractIrKotlinKapt3IntegrationTest(), Cu ) { super.test(name, *supportedAnnotations, options = options, process = process) - doTestWithJdk9( + doTestWithJdk11( SingleJUnitTestRunner::class.java, IrKotlinKapt3IntegrationTests::class.java.name + "#test" + getTestName(false) ) @@ -34,4 +34,4 @@ class IrKotlinKapt3IntegrationTests : AbstractIrKotlinKapt3IntegrationTest(), Cu assertEquals("myMethod", annotatedElements.single().simpleName.toString()) } -} \ No newline at end of file +} diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKapt3IntegrationTests.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKapt3IntegrationTests.kt index f47acfbc584..1556e6d806d 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKapt3IntegrationTests.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKapt3IntegrationTests.kt @@ -43,7 +43,7 @@ class KotlinKapt3IntegrationTests : AbstractKotlinKapt3IntegrationTest(), Custom ) { super.test(name, *supportedAnnotations, options = options, process = process) - doTestWithJdk9( + doTestWithJdk11( SingleJUnitTestRunner::class.java, KotlinKapt3IntegrationTests::class.java.name + "#test" + getTestName(false) ) @@ -228,4 +228,4 @@ internal class SingleJUnitTestRunner { exitProcess(if (result.wasSuccessful()) 0 else 1) } } -} \ No newline at end of file +} diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt index 88e69b54daf..ebdf8463cbf 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt @@ -26,13 +26,6 @@ import java.net.URLClassLoader import java.util.concurrent.TimeUnit interface CustomJdkTestLauncher { - fun doTestWithJdk9(mainClass: Class<*>, arg: String) { - // Already under Java 9 - if (isJava9OrLater()) return - - doTestCustomJdk(mainClass, arg, KtTestUtil.getJdk9Home()) - } - fun doTestWithJdk11(mainClass: Class<*>, arg: String) { if (isJava9OrLater()) return KtTestUtil.getJdk11Home().let { doTestCustomJdk(mainClass, arg, it) }