From 37b839f2c265a8cfae6d528dd175ac3c70d60630 Mon Sep 17 00:00:00 2001 From: Roman Efremov Date: Fri, 10 Nov 2023 12:30:43 +0100 Subject: [PATCH] [Tests] Refactor: move one more annotation arguments lazy resolve test for `ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT` checker near to other tests of this diagnostic. It is fine to move it out of `multiplatformCompositeAnalysis` dir, because, actually, it tests the case with comparison of FirAnnotationCall and FirAnnotationImpl, which doesn't require composite analysis mode. ^KT-62559 --- ...gnosticCompilerTestFE10TestdataTestGenerated.java | 12 ++++++------ ...dDiagnosticCompilerFE10TestDataTestGenerated.java | 12 ++++++------ ...tendMPPDiagnosticsWithLightTreeTestGenerated.java | 12 ++++++------ ...ldFrontendMPPDiagnosticsWithPsiTestGenerated.java | 12 ++++++------ .../typealiasToJavaWithAnnotationArgument.fir.kt | 0 .../typealiasToJavaWithAnnotationArgument.kt | 0 .../typealiasToJavaWithAnnotationArgument.ll.kt | 0 .../kotlin/test/runners/DiagnosticTestGenerated.java | 12 ++++++------ 8 files changed, 30 insertions(+), 30 deletions(-) rename compiler/testData/diagnostics/tests/multiplatform/{hmpp/multiplatformCompositeAnalysis/annotationMatching => actualAnnotationsNotMatchExpect}/typealiasToJavaWithAnnotationArgument.fir.kt (100%) rename compiler/testData/diagnostics/tests/multiplatform/{hmpp/multiplatformCompositeAnalysis/annotationMatching => actualAnnotationsNotMatchExpect}/typealiasToJavaWithAnnotationArgument.kt (100%) rename compiler/testData/diagnostics/tests/multiplatform/{hmpp/multiplatformCompositeAnalysis/annotationMatching => actualAnnotationsNotMatchExpect}/typealiasToJavaWithAnnotationArgument.ll.kt (100%) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index 40a5a37ce37..f3c36884a75 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -24049,6 +24049,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.kt"); } + @Test + @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") + public void testTypealiasToJavaWithAnnotationArgument() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.kt"); + } + @Test @TestMetadata("typealiasToKtLibrary.kt") public void testTypealiasToKtLibrary() throws Exception { @@ -25145,12 +25151,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.kt"); } - @Test - @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") - public void testTypealiasToJavaWithAnnotationArgument() throws Exception { - runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.kt"); - } - @Test @TestMetadata("typealiasedAnnotation.kt") public void testTypealiasedAnnotation() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index c14d1d35a3e..517b1ef03a0 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -24049,6 +24049,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.kt"); } + @Test + @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") + public void testTypealiasToJavaWithAnnotationArgument() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.kt"); + } + @Test @TestMetadata("typealiasToKtLibrary.kt") public void testTypealiasToKtLibrary() throws Exception { @@ -25145,12 +25151,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.kt"); } - @Test - @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") - public void testTypealiasToJavaWithAnnotationArgument() throws Exception { - runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.kt"); - } - @Test @TestMetadata("typealiasedAnnotation.kt") public void testTypealiasedAnnotation() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java index ba118bb28c4..b23a3284bca 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java @@ -646,6 +646,12 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.kt"); } + @Test + @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") + public void testTypealiasToJavaWithAnnotationArgument() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.kt"); + } + @Test @TestMetadata("typealiasToKtLibrary.kt") public void testTypealiasToKtLibrary() throws Exception { @@ -1742,12 +1748,6 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.kt"); } - @Test - @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") - public void testTypealiasToJavaWithAnnotationArgument() throws Exception { - runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.kt"); - } - @Test @TestMetadata("typealiasedAnnotation.kt") public void testTypealiasedAnnotation() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java index d9b0a27cc95..6eb490ba943 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java @@ -646,6 +646,12 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.kt"); } + @Test + @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") + public void testTypealiasToJavaWithAnnotationArgument() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.kt"); + } + @Test @TestMetadata("typealiasToKtLibrary.kt") public void testTypealiasToKtLibrary() throws Exception { @@ -1742,12 +1748,6 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.kt"); } - @Test - @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") - public void testTypealiasToJavaWithAnnotationArgument() throws Exception { - runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.kt"); - } - @Test @TestMetadata("typealiasedAnnotation.kt") public void testTypealiasedAnnotation() throws Exception { diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.fir.kt similarity index 100% rename from compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.fir.kt rename to compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.fir.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.kt similarity index 100% rename from compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.kt rename to compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.ll.kt similarity index 100% rename from compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.ll.kt rename to compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.ll.kt diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 8de234dab20..b768a94b1a6 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -24049,6 +24049,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.kt"); } + @Test + @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") + public void testTypealiasToJavaWithAnnotationArgument() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaWithAnnotationArgument.kt"); + } + @Test @TestMetadata("typealiasToKtLibrary.kt") public void testTypealiasToKtLibrary() throws Exception { @@ -25145,12 +25151,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.kt"); } - @Test - @TestMetadata("typealiasToJavaWithAnnotationArgument.kt") - public void testTypealiasToJavaWithAnnotationArgument() throws Exception { - runTest("compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.kt"); - } - @Test @TestMetadata("typealiasedAnnotation.kt") public void testTypealiasedAnnotation() throws Exception {