From ebafdd3af09e9928e76945b527ddd1d869f744fb Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Thu, 9 Mar 2023 18:48:37 +0100 Subject: [PATCH] [test] Move irText tests from fir2ir/testData to compiler/testData Let's store them conveniently in one place! --- .../fir2ir/testData/ir/irText/sample.ir.txt | 3 - .../fir/fir2ir/testData/ir/irText/sample.kt | 2 - .../fir2ir/testData/ir/irText/sample.kt.txt | 2 - .../fir/fir2ir/testData/ir/irText/sample.txt | 3 - ...ghtTreeJvmIrSpecificTextTestGenerated.java | 77 ------------------- .../FirLightTreeJvmIrTextTestGenerated.java | 44 +++++++++++ .../FirPsiJvmIrSpecificTextTestGenerated.java | 77 ------------------- .../ir/FirPsiJvmIrTextTestGenerated.java | 44 +++++++++++ .../backingFieldVisibility.ir.txt | 0 .../backingField/backingFieldVisibility.kt | 0 .../backingFieldVisibility.kt.txt | 0 .../explicitBackingFieldType.ir.txt | 0 .../backingField/explicitBackingFieldType.kt | 0 .../explicitBackingFieldType.kt.txt | 0 .../independentBackingFieldType.ir.txt | 0 .../independentBackingFieldType.kt | 0 .../independentBackingFieldType.kt.txt | 0 .../backingField/propertyTypeNarrowing.ir.txt | 0 .../backingField/propertyTypeNarrowing.kt | 0 .../backingField/propertyTypeNarrowing.kt.txt | 0 .../ir/ClassicJvmIrTextTestGenerated.java | 44 +++++++++++ .../test/runners/ir/AbstractIrTextTest.kt | 2 +- .../generators/GenerateJUnit5CompilerTests.kt | 12 --- .../klib/KlibIrTextTestCaseGenerated.java | 46 +++++++++++ 24 files changed, 179 insertions(+), 177 deletions(-) delete mode 100644 compiler/fir/fir2ir/testData/ir/irText/sample.ir.txt delete mode 100644 compiler/fir/fir2ir/testData/ir/irText/sample.kt delete mode 100644 compiler/fir/fir2ir/testData/ir/irText/sample.kt.txt delete mode 100644 compiler/fir/fir2ir/testData/ir/irText/sample.txt delete mode 100644 compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSpecificTextTestGenerated.java delete mode 100644 compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSpecificTextTestGenerated.java rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/backingFieldVisibility.ir.txt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/backingFieldVisibility.kt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/backingFieldVisibility.kt.txt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt.txt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/independentBackingFieldType.kt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/independentBackingFieldType.kt.txt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt (100%) rename compiler/{fir/fir2ir => }/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt.txt (100%) diff --git a/compiler/fir/fir2ir/testData/ir/irText/sample.ir.txt b/compiler/fir/fir2ir/testData/ir/irText/sample.ir.txt deleted file mode 100644 index 3dfd109d8ab..00000000000 --- a/compiler/fir/fir2ir/testData/ir/irText/sample.ir.txt +++ /dev/null @@ -1,3 +0,0 @@ -FILE fqName: fileName:/sample.kt - FUN name:sample visibility:public modality:FINAL <> () returnType:kotlin.Unit - BLOCK_BODY diff --git a/compiler/fir/fir2ir/testData/ir/irText/sample.kt b/compiler/fir/fir2ir/testData/ir/irText/sample.kt deleted file mode 100644 index 7528383fc82..00000000000 --- a/compiler/fir/fir2ir/testData/ir/irText/sample.kt +++ /dev/null @@ -1,2 +0,0 @@ -// FIR_IDENTICAL -fun sample() {} diff --git a/compiler/fir/fir2ir/testData/ir/irText/sample.kt.txt b/compiler/fir/fir2ir/testData/ir/irText/sample.kt.txt deleted file mode 100644 index 944e04220b4..00000000000 --- a/compiler/fir/fir2ir/testData/ir/irText/sample.kt.txt +++ /dev/null @@ -1,2 +0,0 @@ -fun sample() { -} diff --git a/compiler/fir/fir2ir/testData/ir/irText/sample.txt b/compiler/fir/fir2ir/testData/ir/irText/sample.txt deleted file mode 100644 index 3dfd109d8ab..00000000000 --- a/compiler/fir/fir2ir/testData/ir/irText/sample.txt +++ /dev/null @@ -1,3 +0,0 @@ -FILE fqName: fileName:/sample.kt - FUN name:sample visibility:public modality:FINAL <> () returnType:kotlin.Unit - BLOCK_BODY diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSpecificTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSpecificTextTestGenerated.java deleted file mode 100644 index 85b62dd156c..00000000000 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSpecificTextTestGenerated.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.test.runners.ir; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/fir/fir2ir/testData/ir/irText") -@TestDataPath("$PROJECT_ROOT") -public class FirLightTreeJvmIrSpecificTextTestGenerated extends AbstractFirLightTreeJvmIrTextTest { - @Test - public void testAllFilesPresentInIrText() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("sample.kt") - public void testSample() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/sample.kt"); - } - - @Nested - @TestMetadata("compiler/fir/fir2ir/testData/ir/irText/properties") - @TestDataPath("$PROJECT_ROOT") - public class Properties { - @Test - public void testAllFilesPresentInProperties() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText/properties"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Nested - @TestMetadata("compiler/fir/fir2ir/testData/ir/irText/properties/backingField") - @TestDataPath("$PROJECT_ROOT") - public class BackingField { - @Test - public void testAllFilesPresentInBackingField() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText/properties/backingField"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("backingFieldVisibility.kt") - public void testBackingFieldVisibility() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/backingFieldVisibility.kt"); - } - - @Test - @TestMetadata("explicitBackingFieldType.kt") - public void testExplicitBackingFieldType() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt"); - } - - @Test - @TestMetadata("independentBackingFieldType.kt") - public void testIndependentBackingFieldType() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/independentBackingFieldType.kt"); - } - - @Test - @TestMetadata("propertyTypeNarrowing.kt") - public void testPropertyTypeNarrowing() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt"); - } - } - } -} diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java index 11511d7a58f..41d246687df 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java @@ -2905,6 +2905,50 @@ public class FirLightTreeJvmIrTextTestGenerated extends AbstractFirLightTreeJvmI } } + @Nested + @TestMetadata("compiler/testData/ir/irText/properties") + @TestDataPath("$PROJECT_ROOT") + public class Properties { + @Test + public void testAllFilesPresentInProperties() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/properties"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Nested + @TestMetadata("compiler/testData/ir/irText/properties/backingField") + @TestDataPath("$PROJECT_ROOT") + public class BackingField { + @Test + public void testAllFilesPresentInBackingField() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/properties/backingField"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("backingFieldVisibility.kt") + public void testBackingFieldVisibility() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.kt"); + } + + @Test + @TestMetadata("explicitBackingFieldType.kt") + public void testExplicitBackingFieldType() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt"); + } + + @Test + @TestMetadata("independentBackingFieldType.kt") + public void testIndependentBackingFieldType() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.kt"); + } + + @Test + @TestMetadata("propertyTypeNarrowing.kt") + public void testPropertyTypeNarrowing() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt"); + } + } + } + @Nested @TestMetadata("compiler/testData/ir/irText/regressions") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSpecificTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSpecificTextTestGenerated.java deleted file mode 100644 index a241d3094ec..00000000000 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSpecificTextTestGenerated.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.test.runners.ir; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/fir/fir2ir/testData/ir/irText") -@TestDataPath("$PROJECT_ROOT") -public class FirPsiJvmIrSpecificTextTestGenerated extends AbstractFirPsiJvmIrTextTest { - @Test - public void testAllFilesPresentInIrText() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("sample.kt") - public void testSample() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/sample.kt"); - } - - @Nested - @TestMetadata("compiler/fir/fir2ir/testData/ir/irText/properties") - @TestDataPath("$PROJECT_ROOT") - public class Properties { - @Test - public void testAllFilesPresentInProperties() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText/properties"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Nested - @TestMetadata("compiler/fir/fir2ir/testData/ir/irText/properties/backingField") - @TestDataPath("$PROJECT_ROOT") - public class BackingField { - @Test - public void testAllFilesPresentInBackingField() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText/properties/backingField"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); - } - - @Test - @TestMetadata("backingFieldVisibility.kt") - public void testBackingFieldVisibility() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/backingFieldVisibility.kt"); - } - - @Test - @TestMetadata("explicitBackingFieldType.kt") - public void testExplicitBackingFieldType() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt"); - } - - @Test - @TestMetadata("independentBackingFieldType.kt") - public void testIndependentBackingFieldType() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/independentBackingFieldType.kt"); - } - - @Test - @TestMetadata("propertyTypeNarrowing.kt") - public void testPropertyTypeNarrowing() throws Exception { - runTest("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt"); - } - } - } -} diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java index 3dfda6489fe..1300233ee3b 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java @@ -2905,6 +2905,50 @@ public class FirPsiJvmIrTextTestGenerated extends AbstractFirPsiJvmIrTextTest { } } + @Nested + @TestMetadata("compiler/testData/ir/irText/properties") + @TestDataPath("$PROJECT_ROOT") + public class Properties { + @Test + public void testAllFilesPresentInProperties() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/properties"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Nested + @TestMetadata("compiler/testData/ir/irText/properties/backingField") + @TestDataPath("$PROJECT_ROOT") + public class BackingField { + @Test + public void testAllFilesPresentInBackingField() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/properties/backingField"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("backingFieldVisibility.kt") + public void testBackingFieldVisibility() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.kt"); + } + + @Test + @TestMetadata("explicitBackingFieldType.kt") + public void testExplicitBackingFieldType() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt"); + } + + @Test + @TestMetadata("independentBackingFieldType.kt") + public void testIndependentBackingFieldType() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.kt"); + } + + @Test + @TestMetadata("propertyTypeNarrowing.kt") + public void testPropertyTypeNarrowing() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt"); + } + } + } + @Nested @TestMetadata("compiler/testData/ir/irText/regressions") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/backingFieldVisibility.ir.txt b/compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.ir.txt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/backingFieldVisibility.ir.txt rename to compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.ir.txt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/backingFieldVisibility.kt b/compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.kt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/backingFieldVisibility.kt rename to compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.kt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/backingFieldVisibility.kt.txt b/compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.kt.txt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/backingFieldVisibility.kt.txt rename to compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.kt.txt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt b/compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt rename to compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt b/compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt rename to compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt.txt b/compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt.txt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt.txt rename to compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt.txt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt b/compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt rename to compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/independentBackingFieldType.kt b/compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.kt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/independentBackingFieldType.kt rename to compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.kt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/independentBackingFieldType.kt.txt b/compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.kt.txt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/independentBackingFieldType.kt.txt rename to compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.kt.txt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt b/compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt rename to compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt b/compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt rename to compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt diff --git a/compiler/fir/fir2ir/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt.txt b/compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt.txt similarity index 100% rename from compiler/fir/fir2ir/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt.txt rename to compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt.txt diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java index d6389f89192..95497c2e5ab 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java @@ -2905,6 +2905,50 @@ public class ClassicJvmIrTextTestGenerated extends AbstractClassicJvmIrTextTest } } + @Nested + @TestMetadata("compiler/testData/ir/irText/properties") + @TestDataPath("$PROJECT_ROOT") + public class Properties { + @Test + public void testAllFilesPresentInProperties() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/properties"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Nested + @TestMetadata("compiler/testData/ir/irText/properties/backingField") + @TestDataPath("$PROJECT_ROOT") + public class BackingField { + @Test + public void testAllFilesPresentInBackingField() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/properties/backingField"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("backingFieldVisibility.kt") + public void testBackingFieldVisibility() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.kt"); + } + + @Test + @TestMetadata("explicitBackingFieldType.kt") + public void testExplicitBackingFieldType() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt"); + } + + @Test + @TestMetadata("independentBackingFieldType.kt") + public void testIndependentBackingFieldType() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.kt"); + } + + @Test + @TestMetadata("propertyTypeNarrowing.kt") + public void testPropertyTypeNarrowing() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt"); + } + } + } + @Nested @TestMetadata("compiler/testData/ir/irText/regressions") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt index 90af33ee5ba..b430a23a235 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt @@ -137,7 +137,7 @@ open class AbstractFirIrTextTestBase( ::BlackBoxCodegenSuppressor ) - forTestsMatching("compiler/fir/fir2ir/testData/ir/irText/properties/backingField/*") { + forTestsMatching("compiler/testData/ir/irText/properties/backingField/*") { defaultDirectives { LanguageSettingsDirectives.LANGUAGE with "+ExplicitBackingFields" } 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 8819ca757f6..ba055e128cd 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 @@ -354,18 +354,6 @@ fun generateJUnit5CompilerTests(args: Array) { model("codegen/boxWithStdLib") } - testClass( - suiteTestClassName = "FirLightTreeJvmIrSpecificTextTestGenerated" - ) { - model("ir/irText") - } - - testClass( - suiteTestClassName = "FirPsiJvmIrSpecificTextTestGenerated" - ) { - model("ir/irText") - } - testClass( suiteTestClassName = "FirLightTreeSpecificBytecodeListingTestGenerated" ) { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java index 3a16576cc8f..4622a13648b 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java @@ -2104,6 +2104,52 @@ public class KlibIrTextTestCaseGenerated extends AbstractKlibIrTextTestCase { } } + @TestMetadata("compiler/testData/ir/irText/properties") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Properties extends AbstractKlibTextTestCase { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); + } + + public void testAllFilesPresentInProperties() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/properties"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + + @TestMetadata("compiler/testData/ir/irText/properties/backingField") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class BackingField extends AbstractKlibTextTestCase { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); + } + + public void testAllFilesPresentInBackingField() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/properties/backingField"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + + @TestMetadata("backingFieldVisibility.kt") + public void testBackingFieldVisibility() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/backingFieldVisibility.kt"); + } + + @TestMetadata("explicitBackingFieldType.kt") + public void testExplicitBackingFieldType() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.kt"); + } + + @TestMetadata("independentBackingFieldType.kt") + public void testIndependentBackingFieldType() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.kt"); + } + + @TestMetadata("propertyTypeNarrowing.kt") + public void testPropertyTypeNarrowing() throws Exception { + runTest("compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.kt"); + } + } + } + @TestMetadata("compiler/testData/ir/irText/regressions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)