From ba8dc49a31a25311ba313fcf52c199ef0731e547 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Tue, 14 Sep 2021 18:27:39 +0300 Subject: [PATCH] [FIX] Move backing field bytecodeListing tests to a separate folder --- ...nosisCompilerFirTestdataTestGenerated.java | 6 ++++ .../explicitBackingFieldUnsupported.fir.txt | 4 +++ .../explicitBackingFieldUnsupported.kt | 4 +++ .../runners/FirDiagnosticTestGenerated.java | 6 ++++ ...DiagnosticsWithLightTreeTestGenerated.java | 6 ++++ .../explicitBackingFieldsInJava.kt | 0 .../explicitBackingFieldsInJava.txt | 0 ...rSpecificBytecodeListingTestGenerated.java | 28 ++++++++++++++++--- .../trivialExplicitBackingFIeld.fir.kt | 2 +- .../codegen/AbstractBytecodeListingTest.kt | 2 +- 10 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.fir.txt create mode 100644 compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.kt rename compiler/fir/fir2ir/testData/codegen/bytecodeListing/{ => properties/backingField}/explicitBackingFieldsInJava.kt (100%) rename compiler/fir/fir2ir/testData/codegen/bytecodeListing/{ => properties/backingField}/explicitBackingFieldsInJava.txt (100%) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java index a8c1d65ffba..eb7ffe46f11 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java @@ -5541,6 +5541,12 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } + @Test + @TestMetadata("explicitBackingFieldUnsupported.kt") + public void testExplicitBackingFieldUnsupported() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.kt"); + } + @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/backingField") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.fir.txt new file mode 100644 index 00000000000..dd866e3c4ad --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.fir.txt @@ -0,0 +1,4 @@ +FILE: explicitBackingFieldUnsupported.kt + public final val that: R|kotlin/Number| + private : R|kotlin/Int| = Int(4) + public get(): R|kotlin/Number| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.kt new file mode 100644 index 00000000000..d6b0cbb9568 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.kt @@ -0,0 +1,4 @@ +// LANGUAGE: -ExplicitBackingFields + +val that: Number + field = 4 diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java index ade35c05d28..fe2833f1f84 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java @@ -5541,6 +5541,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } + @Test + @TestMetadata("explicitBackingFieldUnsupported.kt") + public void testExplicitBackingFieldUnsupported() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.kt"); + } + @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/backingField") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java index 970ae4cbcc8..88b32c58651 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java @@ -5541,6 +5541,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } + @Test + @TestMetadata("explicitBackingFieldUnsupported.kt") + public void testExplicitBackingFieldUnsupported() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/explicitBackingFieldUnsupported.kt"); + } + @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/properties/backingField") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/fir2ir/testData/codegen/bytecodeListing/explicitBackingFieldsInJava.kt b/compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties/backingField/explicitBackingFieldsInJava.kt similarity index 100% rename from compiler/fir/fir2ir/testData/codegen/bytecodeListing/explicitBackingFieldsInJava.kt rename to compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties/backingField/explicitBackingFieldsInJava.kt diff --git a/compiler/fir/fir2ir/testData/codegen/bytecodeListing/explicitBackingFieldsInJava.txt b/compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties/backingField/explicitBackingFieldsInJava.txt similarity index 100% rename from compiler/fir/fir2ir/testData/codegen/bytecodeListing/explicitBackingFieldsInJava.txt rename to compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties/backingField/explicitBackingFieldsInJava.txt diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingTestGenerated.java index 757c45ee3c7..8e382062d82 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingTestGenerated.java @@ -25,9 +25,29 @@ public class Fir2IrSpecificBytecodeListingTestGenerated extends AbstractFirBytec KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/codegen/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } - @Test - @TestMetadata("explicitBackingFieldsInJava.kt") - public void testExplicitBackingFieldsInJava() throws Exception { - runTest("compiler/fir/fir2ir/testData/codegen/bytecodeListing/explicitBackingFieldsInJava.kt"); + @Nested + @TestMetadata("compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties") + @TestDataPath("$PROJECT_ROOT") + public class Properties { + @Test + public void testAllFilesPresentInProperties() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Nested + @TestMetadata("compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties/backingField") + @TestDataPath("$PROJECT_ROOT") + public class BackingField { + @Test + public void testAllFilesPresentInBackingField() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties/backingField"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("explicitBackingFieldsInJava.kt") + public void testExplicitBackingFieldsInJava() throws Exception { + runTest("compiler/fir/fir2ir/testData/codegen/bytecodeListing/properties/backingField/explicitBackingFieldsInJava.kt"); + } + } } } diff --git a/compiler/testData/diagnostics/tests/properties/backingField/trivialExplicitBackingFIeld.fir.kt b/compiler/testData/diagnostics/tests/properties/backingField/trivialExplicitBackingFIeld.fir.kt index c1652b91c08..b6c9f1a42a5 100644 --- a/compiler/testData/diagnostics/tests/properties/backingField/trivialExplicitBackingFIeld.fir.kt +++ b/compiler/testData/diagnostics/tests/properties/backingField/trivialExplicitBackingFIeld.fir.kt @@ -1,4 +1,4 @@ class A { val number: Number - field = 1 + field = 1 } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt index cddc5fc9282..446593c73d4 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt @@ -46,7 +46,7 @@ abstract class AbstractBytecodeListingTestBase