From f330d6774083039d56abb61cb1ba865203ebed14 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Fri, 30 Apr 2021 11:37:45 +0300 Subject: [PATCH] Mute foreign annotations tests with compiled java through psi class files reading --- ...dJavaWithPsiClassReadingTestGenerated.java | 356 +----------------- .../generators/GenerateJUnit5CompilerTests.kt | 3 +- 2 files changed, 4 insertions(+), 355 deletions(-) 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 78f0bcc7195..7529c2ea9e3 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 @@ -543,7 +543,7 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte public class Java8Tests { @Test public void testAllFilesPresentInJava8Tests() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancement/onCompiled"); } @Test @@ -564,276 +564,6 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeUseOnObject.kt"); } - @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify") - @TestDataPath("$PROJECT_ROOT") - public class Jspecify { - @Test - public void testAllFilesPresentInJspecify() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode") - @TestDataPath("$PROJECT_ROOT") - public class StrictMode { - @Test - public void testAllFilesPresentInStrictMode() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("AnnotatedBoundsOfWildcard.kt") - public void testAnnotatedBoundsOfWildcard() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt"); - } - - @Test - @TestMetadata("AnnotatedBoundsOfWildcard.fir.kt") - public void testAnnotatedBoundsOfWildcard_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt"); - } - - @Test - @TestMetadata("Defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.kt"); - } - - @Test - @TestMetadata("Defaults.fir.kt") - public void testDefaults_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.fir.kt"); - } - - @Test - @TestMetadata("IgnoreAnnotations.kt") - public void testIgnoreAnnotations() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.kt"); - } - - @Test - @TestMetadata("IgnoreAnnotations.fir.kt") - public void testIgnoreAnnotations_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.fir.kt"); - } - - @Test - @TestMetadata("NonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt"); - } - - @Test - @TestMetadata("NonPlatformTypeParameter.fir.kt") - public void testNonPlatformTypeParameter_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.fir.kt"); - } - - @Test - @TestMetadata("NullnessUnspecifiedTypeParameter.kt") - public void testNullnessUnspecifiedTypeParameter() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt"); - } - - @Test - @TestMetadata("NullnessUnspecifiedTypeParameter.fir.kt") - public void testNullnessUnspecifiedTypeParameter_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt"); - } - - @Test - @TestMetadata("SelfType.kt") - public void testSelfType() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt"); - } - - @Test - @TestMetadata("SelfType.fir.kt") - public void testSelfType_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt"); - } - - @Test - @TestMetadata("Simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.kt"); - } - - @Test - @TestMetadata("Simple.fir.kt") - public void testSimple_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.fir.kt"); - } - - @Test - @TestMetadata("TypeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt"); - } - - @Test - @TestMetadata("TypeArgumentsFromParameterBounds.fir.kt") - public void testTypeArgumentsFromParameterBounds_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt"); - } - - @Test - @TestMetadata("TypeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt"); - } - - @Test - @TestMetadata("TypeParameterBounds.fir.kt") - public void testTypeParameterBounds_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt"); - } - - @Test - @TestMetadata("WildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt"); - } - - @Test - @TestMetadata("WildcardsWithDefault.fir.kt") - public void testWildcardsWithDefault_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.fir.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode") - @TestDataPath("$PROJECT_ROOT") - public class WarnMode { - @Test - public void testAllFilesPresentInWarnMode() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("AnnotatedBoundsOfWildcard.kt") - public void testAnnotatedBoundsOfWildcard() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt"); - } - - @Test - @TestMetadata("AnnotatedBoundsOfWildcard.fir.kt") - public void testAnnotatedBoundsOfWildcard_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt"); - } - - @Test - @TestMetadata("Defaults.kt") - public void testDefaults() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.kt"); - } - - @Test - @TestMetadata("Defaults.fir.kt") - public void testDefaults_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.fir.kt"); - } - - @Test - @TestMetadata("IgnoreAnnotations.kt") - public void testIgnoreAnnotations() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.kt"); - } - - @Test - @TestMetadata("IgnoreAnnotations.fir.kt") - public void testIgnoreAnnotations_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.fir.kt"); - } - - @Test - @TestMetadata("NonPlatformTypeParameter.kt") - public void testNonPlatformTypeParameter() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt"); - } - - @Test - @TestMetadata("NonPlatformTypeParameter.fir.kt") - public void testNonPlatformTypeParameter_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt"); - } - - @Test - @TestMetadata("NullnessUnspecifiedTypeParameter.kt") - public void testNullnessUnspecifiedTypeParameter() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.kt"); - } - - @Test - @TestMetadata("NullnessUnspecifiedTypeParameter.fir.kt") - public void testNullnessUnspecifiedTypeParameter_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.fir.kt"); - } - - @Test - @TestMetadata("SelfType.kt") - public void testSelfType() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt"); - } - - @Test - @TestMetadata("SelfType.fir.kt") - public void testSelfType_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.fir.kt"); - } - - @Test - @TestMetadata("Simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.kt"); - } - - @Test - @TestMetadata("Simple.fir.kt") - public void testSimple_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.fir.kt"); - } - - @Test - @TestMetadata("TypeArgumentsFromParameterBounds.kt") - public void testTypeArgumentsFromParameterBounds() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt"); - } - - @Test - @TestMetadata("TypeArgumentsFromParameterBounds.fir.kt") - public void testTypeArgumentsFromParameterBounds_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt"); - } - - @Test - @TestMetadata("TypeParameterBounds.kt") - public void testTypeParameterBounds() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt"); - } - - @Test - @TestMetadata("TypeParameterBounds.fir.kt") - public void testTypeParameterBounds_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.fir.kt"); - } - - @Test - @TestMetadata("WildcardsWithDefault.kt") - public void testWildcardsWithDefault() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt"); - } - - @Test - @TestMetadata("WildcardsWithDefault.fir.kt") - public void testWildcardsWithDefault_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.fir.kt"); - } - } - } - @Nested @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305") @TestDataPath("$PROJECT_ROOT") @@ -880,89 +610,7 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte public class TypeEnhancement { @Test public void testAllFilesPresentInTypeEnhancement() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Nested - @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled") - @TestDataPath("$PROJECT_ROOT") - public class OnCompiled { - @Test - public void testAllFilesPresentInOnCompiled() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("classTypeParameterBound.kt") - public void testClassTypeParameterBound() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.kt"); - } - - @Test - @TestMetadata("classTypeParameterBoundWithWarnings.kt") - public void testClassTypeParameterBoundWithWarnings() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.kt"); - } - - @Test - @TestMetadata("classTypeParameterBoundWithWarnings.fir.kt") - public void testClassTypeParameterBoundWithWarnings_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.fir.kt"); - } - - @Test - @TestMetadata("classTypeParameterBound.fir.kt") - public void testClassTypeParameterBound_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.fir.kt"); - } - - @Test - @TestMetadata("returnType.kt") - public void testReturnType() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.kt"); - } - - @Test - @TestMetadata("returnTypeWithWarnings.kt") - public void testReturnTypeWithWarnings() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.kt"); - } - - @Test - @TestMetadata("returnTypeWithWarnings.fir.kt") - public void testReturnTypeWithWarnings_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.fir.kt"); - } - - @Test - @TestMetadata("returnType.fir.kt") - public void testReturnType_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.fir.kt"); - } - - @Test - @TestMetadata("valueParameter.kt") - public void testValueParameter() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.kt"); - } - - @Test - @TestMetadata("valueParameterWithWarnings.kt") - public void testValueParameterWithWarnings() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.kt"); - } - - @Test - @TestMetadata("valueParameterWithWarnings.fir.kt") - public void testValueParameterWithWarnings_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.fir.kt"); - } - - @Test - @TestMetadata("valueParameter.fir.kt") - public void testValueParameter_fir() throws Exception { - runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.fir.kt"); - } + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true, "onCompiled"); } @Nested 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 045a8041a39..d766fe39bc9 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 @@ -61,7 +61,8 @@ fun generateJUnit5CompilerTests(args: Array) { testClass { model("diagnostics/foreignAnnotationsTests/tests") - model("diagnostics/foreignAnnotationsTests/java8Tests") + // TODO: remove exclusion of these dirs after advance dependent intellij platform + model("diagnostics/foreignAnnotationsTests/java8Tests", excludeDirs = listOf("jspecify", "typeEnhancement/onCompiled")) model("diagnostics/foreignAnnotationsTests/java9Tests") }