From cfb446df9eb9e3d81d8c57e647a4415a1116eaef Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 27 Dec 2018 20:34:20 +0300 Subject: [PATCH] Move FIR tests to fir modules --- compiler/build.gradle.kts | 2 + compiler/fir/psi2fir/build.gradle.kts | 22 ++++- .../testData}/rawBuilder/declarations/F.kt | 0 .../testData}/rawBuilder/declarations/F.txt | 0 .../declarations/NestedOfAliasedType.kt | 0 .../declarations/NestedOfAliasedType.txt | 0 .../declarations/NestedSuperType.kt | 0 .../declarations/NestedSuperType.txt | 0 .../rawBuilder/declarations/complexTypes.kt | 0 .../rawBuilder/declarations/complexTypes.txt | 0 .../rawBuilder/declarations/derivedClass.kt | 0 .../rawBuilder/declarations/derivedClass.txt | 0 .../rawBuilder/declarations/enums.kt | 0 .../rawBuilder/declarations/enums.txt | 0 .../rawBuilder/declarations/enums2.kt | 0 .../rawBuilder/declarations/enums2.txt | 0 .../rawBuilder/declarations/expectActual.kt | 0 .../rawBuilder/declarations/expectActual.txt | 0 .../rawBuilder/declarations/functionTypes.kt | 0 .../rawBuilder/declarations/functionTypes.txt | 0 .../declarations/genericFunctions.kt | 0 .../declarations/genericFunctions.txt | 0 .../rawBuilder/declarations/nestedClass.kt | 0 .../rawBuilder/declarations/nestedClass.txt | 0 .../declarations/noPrimaryConstructor.kt | 0 .../declarations/noPrimaryConstructor.txt | 0 .../rawBuilder/declarations/simpleClass.kt | 0 .../rawBuilder/declarations/simpleClass.txt | 0 .../rawBuilder/declarations/simpleFun.kt | 0 .../rawBuilder/declarations/simpleFun.txt | 0 .../declarations/simpleTypeAlias.kt | 0 .../declarations/simpleTypeAlias.txt | 0 .../declarations/typeAliasWithGeneric.kt | 0 .../declarations/typeAliasWithGeneric.txt | 0 .../declarations/typeParameterVsNested.kt | 0 .../declarations/typeParameterVsNested.txt | 0 .../rawBuilder/declarations/typeParameters.kt | 0 .../declarations/typeParameters.txt | 0 .../builder/AbstractRawFirBuilderTestCase.kt | 4 +- .../RawFirBuilderTestCaseGenerated.java | 44 +++++----- .../RawFirBuilderTotalKotlinTestCase.kt | 0 compiler/fir/resolve/build.gradle.kts | 24 +++++- .../fir => fir/resolve/testData}/resolve/F.kt | 0 .../resolve/testData}/resolve/F.txt | 0 .../testData}/resolve/NestedOfAliasedType.kt | 0 .../testData}/resolve/NestedOfAliasedType.txt | 0 .../testData}/resolve/NestedSuperType.kt | 0 .../testData}/resolve/NestedSuperType.txt | 0 .../resolve/TwoDeclarationsInSameFile.kt | 0 .../resolve/TwoDeclarationsInSameFile.txt | 0 .../testData}/resolve/builtins/lists.kt | 0 .../testData}/resolve/builtins/lists.txt | 0 .../resolve/testData}/resolve/companion.kt | 0 .../resolve/testData}/resolve/companion.txt | 0 .../resolve/testData}/resolve/derivedClass.kt | 0 .../testData}/resolve/derivedClass.txt | 0 .../resolve/testData}/resolve/enum.kt | 0 .../resolve/testData}/resolve/enum.txt | 0 .../resolve/fromBuilder/complexTypes.kt | 0 .../resolve/fromBuilder/complexTypes.txt | 0 .../testData}/resolve/fromBuilder/enums.kt | 0 .../testData}/resolve/fromBuilder/enums.txt | 0 .../fromBuilder/noPrimaryConstructor.kt | 0 .../fromBuilder/noPrimaryConstructor.txt | 0 .../resolve/fromBuilder/simpleClass.kt | 0 .../resolve/fromBuilder/simpleClass.txt | 0 .../resolve/fromBuilder/typeParameters.kt | 0 .../resolve/fromBuilder/typeParameters.txt | 0 .../resolve/testData}/resolve/ft.kt | 0 .../resolve/testData}/resolve/ft.txt | 0 .../testData}/resolve/functionTypes.kt | 0 .../testData}/resolve/functionTypes.txt | 0 .../testData}/resolve/genericFunctions.kt | 0 .../testData}/resolve/genericFunctions.txt | 0 .../resolve/multifile/Annotations.1.kt | 0 .../resolve/multifile/Annotations.kt | 0 .../resolve/multifile/Annotations.txt | 0 .../resolve/multifile/NestedSuperType.1.kt | 0 .../resolve/multifile/NestedSuperType.2.kt | 0 .../resolve/multifile/NestedSuperType.kt | 0 .../resolve/multifile/NestedSuperType.txt | 0 .../resolve/multifile/TypeAliasExpansion.1.kt | 0 .../resolve/multifile/TypeAliasExpansion.kt | 0 .../resolve/multifile/TypeAliasExpansion.txt | 0 .../resolve/multifile/sealedStarImport.1.kt | 0 .../resolve/multifile/sealedStarImport.kt | 0 .../resolve/multifile/sealedStarImport.txt | 0 .../multifile/simpleAliasedImport.1.kt | 0 .../resolve/multifile/simpleAliasedImport.kt | 0 .../resolve/multifile/simpleAliasedImport.txt | 0 .../resolve/multifile/simpleImport.1.kt | 0 .../resolve/multifile/simpleImport.kt | 0 .../resolve/multifile/simpleImport.txt | 0 .../resolve/multifile/simpleImportNested.1.kt | 0 .../resolve/multifile/simpleImportNested.kt | 0 .../resolve/multifile/simpleImportNested.txt | 0 .../resolve/multifile/simpleImportOuter.1.kt | 0 .../resolve/multifile/simpleImportOuter.kt | 0 .../resolve/multifile/simpleImportOuter.txt | 0 .../resolve/multifile/simpleStarImport.1.kt | 0 .../resolve/multifile/simpleStarImport.kt | 0 .../resolve/multifile/simpleStarImport.txt | 0 .../resolve/testData}/resolve/nestedClass.kt | 0 .../resolve/testData}/resolve/nestedClass.txt | 0 .../resolve/testData}/resolve/simpleClass.kt | 0 .../resolve/testData}/resolve/simpleClass.txt | 0 .../testData}/resolve/simpleTypeAlias.kt | 0 .../testData}/resolve/simpleTypeAlias.txt | 0 .../testData}/resolve/stdlib/concurrent.kt | 0 .../testData}/resolve/stdlib/concurrent.txt | 0 .../testData}/resolve/stdlib/functionX.kt | 0 .../testData}/resolve/stdlib/functionX.txt | 0 .../resolve/stdlib/reflectionClass.kt | 0 .../resolve/stdlib/reflectionClass.txt | 0 .../resolve/testData}/resolve/treeSet.kt | 0 .../resolve/testData}/resolve/treeSet.txt | 0 .../testData}/resolve/typeAliasWithGeneric.kt | 0 .../resolve/typeAliasWithGeneric.txt | 0 .../typeParameterInPropertyReceiver.kt | 0 .../typeParameterInPropertyReceiver.txt | 0 .../resolve/typeParameterVsNested.kt | 0 .../resolve/typeParameterVsNested.txt | 0 .../kotlin/fir/AbstractFirResolveTestCase.kt | 0 .../AbstractFirResolveTestCaseWithStdlib.kt | 0 .../AbstractFirResolveWithSessionTestCase.kt | 0 .../fir/FirResolveTestCaseGenerated.java | 80 +++++++++---------- ...FirResolveTestCaseWithStdlibGenerated.java | 10 +-- compiler/fir/tree/build.gradle.kts | 1 - .../generators/tests/GenerateCompilerTests.kt | 26 +++--- 129 files changed, 129 insertions(+), 84 deletions(-) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/F.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/F.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/NestedOfAliasedType.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/NestedOfAliasedType.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/NestedSuperType.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/NestedSuperType.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/complexTypes.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/complexTypes.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/derivedClass.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/derivedClass.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/enums.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/enums.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/enums2.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/enums2.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/expectActual.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/expectActual.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/functionTypes.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/functionTypes.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/genericFunctions.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/genericFunctions.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/nestedClass.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/nestedClass.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/noPrimaryConstructor.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/noPrimaryConstructor.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/simpleClass.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/simpleClass.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/simpleFun.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/simpleFun.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/simpleTypeAlias.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/simpleTypeAlias.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/typeAliasWithGeneric.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/typeAliasWithGeneric.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/typeParameterVsNested.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/typeParameterVsNested.txt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/typeParameters.kt (100%) rename compiler/{testData/fir => fir/psi2fir/testData}/rawBuilder/declarations/typeParameters.txt (100%) rename compiler/{tests-common => fir/psi2fir}/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt (98%) rename compiler/{ => fir/psi2fir}/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java (63%) rename compiler/{ => fir/psi2fir}/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/F.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/F.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/NestedOfAliasedType.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/NestedOfAliasedType.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/NestedSuperType.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/NestedSuperType.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/TwoDeclarationsInSameFile.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/TwoDeclarationsInSameFile.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/builtins/lists.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/builtins/lists.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/companion.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/companion.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/derivedClass.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/derivedClass.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/enum.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/enum.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/complexTypes.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/complexTypes.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/enums.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/enums.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/noPrimaryConstructor.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/noPrimaryConstructor.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/simpleClass.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/simpleClass.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/typeParameters.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/fromBuilder/typeParameters.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/ft.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/ft.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/functionTypes.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/functionTypes.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/genericFunctions.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/genericFunctions.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/Annotations.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/Annotations.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/Annotations.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/NestedSuperType.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/NestedSuperType.2.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/NestedSuperType.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/NestedSuperType.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/TypeAliasExpansion.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/TypeAliasExpansion.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/TypeAliasExpansion.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/sealedStarImport.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/sealedStarImport.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/sealedStarImport.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleAliasedImport.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleAliasedImport.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleAliasedImport.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImport.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImport.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImport.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImportNested.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImportNested.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImportNested.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImportOuter.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImportOuter.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleImportOuter.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleStarImport.1.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleStarImport.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/multifile/simpleStarImport.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/nestedClass.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/nestedClass.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/simpleClass.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/simpleClass.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/simpleTypeAlias.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/simpleTypeAlias.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/stdlib/concurrent.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/stdlib/concurrent.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/stdlib/functionX.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/stdlib/functionX.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/stdlib/reflectionClass.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/stdlib/reflectionClass.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/treeSet.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/treeSet.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/typeAliasWithGeneric.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/typeAliasWithGeneric.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/typeParameterInPropertyReceiver.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/typeParameterInPropertyReceiver.txt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/typeParameterVsNested.kt (100%) rename compiler/{testData/fir => fir/resolve/testData}/resolve/typeParameterVsNested.txt (100%) rename compiler/{ => fir/resolve}/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt (100%) rename compiler/{ => fir/resolve}/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCaseWithStdlib.kt (100%) rename compiler/{ => fir/resolve}/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt (100%) rename compiler/{ => fir/resolve}/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java (63%) rename compiler/{ => fir/resolve}/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java (76%) diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index bf5c8bb5fbf..b36780fd71e 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -54,6 +54,8 @@ dependencies { testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) testCompile(projectTests(":compiler:tests-common")) + testCompile(projectTests(":compiler:fir:psi2fir")) + testCompile(projectTests(":compiler:fir:resolve")) testCompile(projectTests(":generators:test-generator")) testCompile(project(":compiler:ir.ir2cfg")) testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward diff --git a/compiler/fir/psi2fir/build.gradle.kts b/compiler/fir/psi2fir/build.gradle.kts index f4382c8d9d9..a64c74afb00 100644 --- a/compiler/fir/psi2fir/build.gradle.kts +++ b/compiler/fir/psi2fir/build.gradle.kts @@ -16,9 +16,27 @@ dependencies { compile(project(":compiler:fir:tree")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + + testRuntime(intellijDep()) + + testCompile(commonDep("junit:junit")) + testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) + testCompileOnly(project(":kotlin-test:kotlin-test-junit")) + testCompile(projectTests(":compiler:tests-common")) + + testCompileOnly(project(":kotlin-reflect-api")) + testRuntime(project(":kotlin-reflect")) + + } sourceSets { "main" { projectDefault() } - "test" {} -} \ No newline at end of file + "test" { projectDefault() } +} + +projectTest { + workingDir = rootDir +} + +testsJar() \ No newline at end of file diff --git a/compiler/testData/fir/rawBuilder/declarations/F.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/F.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/F.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/F.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/F.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/NestedSuperType.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/complexTypes.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/complexTypes.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/complexTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/complexTypes.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/derivedClass.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/derivedClass.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/derivedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/derivedClass.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/enums.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/enums.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/enums.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/enums.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/enums2.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/enums2.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/enums2.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/enums2.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/expectActual.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/expectActual.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/expectActual.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/expectActual.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/functionTypes.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/functionTypes.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/functionTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/functionTypes.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/genericFunctions.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/genericFunctions.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/nestedClass.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/nestedClass.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/nestedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/nestedClass.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleClass.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/simpleClass.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/simpleClass.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleFun.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/simpleFun.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleFun.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/simpleFun.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt diff --git a/compiler/testData/fir/rawBuilder/declarations/typeParameters.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.kt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/typeParameters.kt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.kt diff --git a/compiler/testData/fir/rawBuilder/declarations/typeParameters.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt similarity index 100% rename from compiler/testData/fir/rawBuilder/declarations/typeParameters.txt rename to compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt similarity index 98% rename from compiler/tests-common/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt rename to compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt index 6d4933288f7..185fe334311 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt +++ b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ @@ -33,7 +33,7 @@ import java.io.File import kotlin.reflect.full.memberProperties abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase( - ".", + "", "kt", KotlinParserDefinition() ) { diff --git a/compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java similarity index 63% rename from compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java rename to compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java index ab14f36039e..135741df33f 100644 --- a/compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java +++ b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/fir/rawBuilder") +@TestMetadata("compiler/fir/psi2fir/testData/rawBuilder") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class RawFirBuilderTestCaseGenerated extends AbstractRawFirBuilderTestCase { @@ -26,10 +26,10 @@ public class RawFirBuilderTestCaseGenerated extends AbstractRawFirBuilderTestCas } public void testAllFilesPresentInRawBuilder() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/fir/rawBuilder"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/fir/psi2fir/testData/rawBuilder"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("compiler/testData/fir/rawBuilder/declarations") + @TestMetadata("compiler/fir/psi2fir/testData/rawBuilder/declarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Declarations extends AbstractRawFirBuilderTestCase { @@ -38,97 +38,97 @@ public class RawFirBuilderTestCaseGenerated extends AbstractRawFirBuilderTestCas } public void testAllFilesPresentInDeclarations() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/fir/rawBuilder/declarations"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/fir/psi2fir/testData/rawBuilder/declarations"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } @TestMetadata("complexTypes.kt") public void testComplexTypes() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/complexTypes.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.kt"); } @TestMetadata("derivedClass.kt") public void testDerivedClass() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/derivedClass.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.kt"); } @TestMetadata("enums.kt") public void testEnums() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/enums.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.kt"); } @TestMetadata("enums2.kt") public void testEnums2() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/enums2.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.kt"); } @TestMetadata("expectActual.kt") public void testExpectActual() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/expectActual.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt"); } @TestMetadata("F.kt") public void testF() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/F.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/F.kt"); } @TestMetadata("functionTypes.kt") public void testFunctionTypes() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/functionTypes.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.kt"); } @TestMetadata("genericFunctions.kt") public void testGenericFunctions() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/genericFunctions.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.kt"); } @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/nestedClass.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.kt"); } @TestMetadata("NestedOfAliasedType.kt") public void testNestedOfAliasedType() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.kt"); } @TestMetadata("NestedSuperType.kt") public void testNestedSuperType() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/NestedSuperType.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.kt"); } @TestMetadata("noPrimaryConstructor.kt") public void testNoPrimaryConstructor() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.kt"); } @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/simpleClass.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.kt"); } @TestMetadata("simpleFun.kt") public void testSimpleFun() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/simpleFun.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.kt"); } @TestMetadata("simpleTypeAlias.kt") public void testSimpleTypeAlias() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.kt"); } @TestMetadata("typeAliasWithGeneric.kt") public void testTypeAliasWithGeneric() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.kt"); } @TestMetadata("typeParameterVsNested.kt") public void testTypeParameterVsNested() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.kt"); } @TestMetadata("typeParameters.kt") public void testTypeParameters() throws Exception { - runTest("compiler/testData/fir/rawBuilder/declarations/typeParameters.kt"); + runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.kt"); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt rename to compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt diff --git a/compiler/fir/resolve/build.gradle.kts b/compiler/fir/resolve/build.gradle.kts index 1bb40798e00..4152af1c0e5 100644 --- a/compiler/fir/resolve/build.gradle.kts +++ b/compiler/fir/resolve/build.gradle.kts @@ -17,9 +17,29 @@ dependencies { compile(project(":compiler:fir:tree")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + + testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) } + + + testRuntime(intellijDep()) + + testCompile(commonDep("junit:junit")) + testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) + testCompileOnly(project(":kotlin-test:kotlin-test-junit")) + testCompile(projectTests(":compiler:tests-common")) + + testCompileOnly(project(":kotlin-reflect-api")) + testRuntime(project(":kotlin-reflect")) + } sourceSets { "main" { projectDefault() } - "test" {} -} \ No newline at end of file + "test" { projectDefault() } +} + +projectTest { + workingDir = rootDir +} + +testsJar() \ No newline at end of file diff --git a/compiler/testData/fir/resolve/F.kt b/compiler/fir/resolve/testData/resolve/F.kt similarity index 100% rename from compiler/testData/fir/resolve/F.kt rename to compiler/fir/resolve/testData/resolve/F.kt diff --git a/compiler/testData/fir/resolve/F.txt b/compiler/fir/resolve/testData/resolve/F.txt similarity index 100% rename from compiler/testData/fir/resolve/F.txt rename to compiler/fir/resolve/testData/resolve/F.txt diff --git a/compiler/testData/fir/resolve/NestedOfAliasedType.kt b/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.kt similarity index 100% rename from compiler/testData/fir/resolve/NestedOfAliasedType.kt rename to compiler/fir/resolve/testData/resolve/NestedOfAliasedType.kt diff --git a/compiler/testData/fir/resolve/NestedOfAliasedType.txt b/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt similarity index 100% rename from compiler/testData/fir/resolve/NestedOfAliasedType.txt rename to compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt diff --git a/compiler/testData/fir/resolve/NestedSuperType.kt b/compiler/fir/resolve/testData/resolve/NestedSuperType.kt similarity index 100% rename from compiler/testData/fir/resolve/NestedSuperType.kt rename to compiler/fir/resolve/testData/resolve/NestedSuperType.kt diff --git a/compiler/testData/fir/resolve/NestedSuperType.txt b/compiler/fir/resolve/testData/resolve/NestedSuperType.txt similarity index 100% rename from compiler/testData/fir/resolve/NestedSuperType.txt rename to compiler/fir/resolve/testData/resolve/NestedSuperType.txt diff --git a/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.kt b/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.kt similarity index 100% rename from compiler/testData/fir/resolve/TwoDeclarationsInSameFile.kt rename to compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.kt diff --git a/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt b/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt similarity index 100% rename from compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt rename to compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt diff --git a/compiler/testData/fir/resolve/builtins/lists.kt b/compiler/fir/resolve/testData/resolve/builtins/lists.kt similarity index 100% rename from compiler/testData/fir/resolve/builtins/lists.kt rename to compiler/fir/resolve/testData/resolve/builtins/lists.kt diff --git a/compiler/testData/fir/resolve/builtins/lists.txt b/compiler/fir/resolve/testData/resolve/builtins/lists.txt similarity index 100% rename from compiler/testData/fir/resolve/builtins/lists.txt rename to compiler/fir/resolve/testData/resolve/builtins/lists.txt diff --git a/compiler/testData/fir/resolve/companion.kt b/compiler/fir/resolve/testData/resolve/companion.kt similarity index 100% rename from compiler/testData/fir/resolve/companion.kt rename to compiler/fir/resolve/testData/resolve/companion.kt diff --git a/compiler/testData/fir/resolve/companion.txt b/compiler/fir/resolve/testData/resolve/companion.txt similarity index 100% rename from compiler/testData/fir/resolve/companion.txt rename to compiler/fir/resolve/testData/resolve/companion.txt diff --git a/compiler/testData/fir/resolve/derivedClass.kt b/compiler/fir/resolve/testData/resolve/derivedClass.kt similarity index 100% rename from compiler/testData/fir/resolve/derivedClass.kt rename to compiler/fir/resolve/testData/resolve/derivedClass.kt diff --git a/compiler/testData/fir/resolve/derivedClass.txt b/compiler/fir/resolve/testData/resolve/derivedClass.txt similarity index 100% rename from compiler/testData/fir/resolve/derivedClass.txt rename to compiler/fir/resolve/testData/resolve/derivedClass.txt diff --git a/compiler/testData/fir/resolve/enum.kt b/compiler/fir/resolve/testData/resolve/enum.kt similarity index 100% rename from compiler/testData/fir/resolve/enum.kt rename to compiler/fir/resolve/testData/resolve/enum.kt diff --git a/compiler/testData/fir/resolve/enum.txt b/compiler/fir/resolve/testData/resolve/enum.txt similarity index 100% rename from compiler/testData/fir/resolve/enum.txt rename to compiler/fir/resolve/testData/resolve/enum.txt diff --git a/compiler/testData/fir/resolve/fromBuilder/complexTypes.kt b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.kt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/complexTypes.kt rename to compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.kt diff --git a/compiler/testData/fir/resolve/fromBuilder/complexTypes.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/complexTypes.txt rename to compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt diff --git a/compiler/testData/fir/resolve/fromBuilder/enums.kt b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.kt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/enums.kt rename to compiler/fir/resolve/testData/resolve/fromBuilder/enums.kt diff --git a/compiler/testData/fir/resolve/fromBuilder/enums.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/enums.txt rename to compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt diff --git a/compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt b/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.kt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt rename to compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.kt diff --git a/compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.txt rename to compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt diff --git a/compiler/testData/fir/resolve/fromBuilder/simpleClass.kt b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.kt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/simpleClass.kt rename to compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.kt diff --git a/compiler/testData/fir/resolve/fromBuilder/simpleClass.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/simpleClass.txt rename to compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt diff --git a/compiler/testData/fir/resolve/fromBuilder/typeParameters.kt b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.kt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/typeParameters.kt rename to compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.kt diff --git a/compiler/testData/fir/resolve/fromBuilder/typeParameters.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt similarity index 100% rename from compiler/testData/fir/resolve/fromBuilder/typeParameters.txt rename to compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt diff --git a/compiler/testData/fir/resolve/ft.kt b/compiler/fir/resolve/testData/resolve/ft.kt similarity index 100% rename from compiler/testData/fir/resolve/ft.kt rename to compiler/fir/resolve/testData/resolve/ft.kt diff --git a/compiler/testData/fir/resolve/ft.txt b/compiler/fir/resolve/testData/resolve/ft.txt similarity index 100% rename from compiler/testData/fir/resolve/ft.txt rename to compiler/fir/resolve/testData/resolve/ft.txt diff --git a/compiler/testData/fir/resolve/functionTypes.kt b/compiler/fir/resolve/testData/resolve/functionTypes.kt similarity index 100% rename from compiler/testData/fir/resolve/functionTypes.kt rename to compiler/fir/resolve/testData/resolve/functionTypes.kt diff --git a/compiler/testData/fir/resolve/functionTypes.txt b/compiler/fir/resolve/testData/resolve/functionTypes.txt similarity index 100% rename from compiler/testData/fir/resolve/functionTypes.txt rename to compiler/fir/resolve/testData/resolve/functionTypes.txt diff --git a/compiler/testData/fir/resolve/genericFunctions.kt b/compiler/fir/resolve/testData/resolve/genericFunctions.kt similarity index 100% rename from compiler/testData/fir/resolve/genericFunctions.kt rename to compiler/fir/resolve/testData/resolve/genericFunctions.kt diff --git a/compiler/testData/fir/resolve/genericFunctions.txt b/compiler/fir/resolve/testData/resolve/genericFunctions.txt similarity index 100% rename from compiler/testData/fir/resolve/genericFunctions.txt rename to compiler/fir/resolve/testData/resolve/genericFunctions.txt diff --git a/compiler/testData/fir/resolve/multifile/Annotations.1.kt b/compiler/fir/resolve/testData/resolve/multifile/Annotations.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/Annotations.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/Annotations.1.kt diff --git a/compiler/testData/fir/resolve/multifile/Annotations.kt b/compiler/fir/resolve/testData/resolve/multifile/Annotations.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/Annotations.kt rename to compiler/fir/resolve/testData/resolve/multifile/Annotations.kt diff --git a/compiler/testData/fir/resolve/multifile/Annotations.txt b/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/Annotations.txt rename to compiler/fir/resolve/testData/resolve/multifile/Annotations.txt diff --git a/compiler/testData/fir/resolve/multifile/NestedSuperType.1.kt b/compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/NestedSuperType.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.1.kt diff --git a/compiler/testData/fir/resolve/multifile/NestedSuperType.2.kt b/compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.2.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/NestedSuperType.2.kt rename to compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.2.kt diff --git a/compiler/testData/fir/resolve/multifile/NestedSuperType.kt b/compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/NestedSuperType.kt rename to compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.kt diff --git a/compiler/testData/fir/resolve/multifile/NestedSuperType.txt b/compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/NestedSuperType.txt rename to compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.txt diff --git a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.1.kt b/compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/TypeAliasExpansion.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.1.kt diff --git a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.kt b/compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/TypeAliasExpansion.kt rename to compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.kt diff --git a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt b/compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt rename to compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.txt diff --git a/compiler/testData/fir/resolve/multifile/sealedStarImport.1.kt b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/sealedStarImport.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.1.kt diff --git a/compiler/testData/fir/resolve/multifile/sealedStarImport.kt b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/sealedStarImport.kt rename to compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.kt diff --git a/compiler/testData/fir/resolve/multifile/sealedStarImport.txt b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/sealedStarImport.txt rename to compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt diff --git a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.1.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleAliasedImport.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.1.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleAliasedImport.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt rename to compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.txt diff --git a/compiler/testData/fir/resolve/multifile/simpleImport.1.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImport.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImport.1.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleImport.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImport.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImport.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleImport.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImport.txt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt diff --git a/compiler/testData/fir/resolve/multifile/simpleImportNested.1.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImportNested.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.1.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleImportNested.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImportNested.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleImportNested.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImportNested.txt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.txt diff --git a/compiler/testData/fir/resolve/multifile/simpleImportOuter.1.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImportOuter.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.1.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleImportOuter.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImportOuter.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleImportOuter.txt rename to compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.txt diff --git a/compiler/testData/fir/resolve/multifile/simpleStarImport.1.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.1.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleStarImport.1.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.1.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleStarImport.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.kt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleStarImport.kt rename to compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.kt diff --git a/compiler/testData/fir/resolve/multifile/simpleStarImport.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.txt similarity index 100% rename from compiler/testData/fir/resolve/multifile/simpleStarImport.txt rename to compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.txt diff --git a/compiler/testData/fir/resolve/nestedClass.kt b/compiler/fir/resolve/testData/resolve/nestedClass.kt similarity index 100% rename from compiler/testData/fir/resolve/nestedClass.kt rename to compiler/fir/resolve/testData/resolve/nestedClass.kt diff --git a/compiler/testData/fir/resolve/nestedClass.txt b/compiler/fir/resolve/testData/resolve/nestedClass.txt similarity index 100% rename from compiler/testData/fir/resolve/nestedClass.txt rename to compiler/fir/resolve/testData/resolve/nestedClass.txt diff --git a/compiler/testData/fir/resolve/simpleClass.kt b/compiler/fir/resolve/testData/resolve/simpleClass.kt similarity index 100% rename from compiler/testData/fir/resolve/simpleClass.kt rename to compiler/fir/resolve/testData/resolve/simpleClass.kt diff --git a/compiler/testData/fir/resolve/simpleClass.txt b/compiler/fir/resolve/testData/resolve/simpleClass.txt similarity index 100% rename from compiler/testData/fir/resolve/simpleClass.txt rename to compiler/fir/resolve/testData/resolve/simpleClass.txt diff --git a/compiler/testData/fir/resolve/simpleTypeAlias.kt b/compiler/fir/resolve/testData/resolve/simpleTypeAlias.kt similarity index 100% rename from compiler/testData/fir/resolve/simpleTypeAlias.kt rename to compiler/fir/resolve/testData/resolve/simpleTypeAlias.kt diff --git a/compiler/testData/fir/resolve/simpleTypeAlias.txt b/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt similarity index 100% rename from compiler/testData/fir/resolve/simpleTypeAlias.txt rename to compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt diff --git a/compiler/testData/fir/resolve/stdlib/concurrent.kt b/compiler/fir/resolve/testData/resolve/stdlib/concurrent.kt similarity index 100% rename from compiler/testData/fir/resolve/stdlib/concurrent.kt rename to compiler/fir/resolve/testData/resolve/stdlib/concurrent.kt diff --git a/compiler/testData/fir/resolve/stdlib/concurrent.txt b/compiler/fir/resolve/testData/resolve/stdlib/concurrent.txt similarity index 100% rename from compiler/testData/fir/resolve/stdlib/concurrent.txt rename to compiler/fir/resolve/testData/resolve/stdlib/concurrent.txt diff --git a/compiler/testData/fir/resolve/stdlib/functionX.kt b/compiler/fir/resolve/testData/resolve/stdlib/functionX.kt similarity index 100% rename from compiler/testData/fir/resolve/stdlib/functionX.kt rename to compiler/fir/resolve/testData/resolve/stdlib/functionX.kt diff --git a/compiler/testData/fir/resolve/stdlib/functionX.txt b/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt similarity index 100% rename from compiler/testData/fir/resolve/stdlib/functionX.txt rename to compiler/fir/resolve/testData/resolve/stdlib/functionX.txt diff --git a/compiler/testData/fir/resolve/stdlib/reflectionClass.kt b/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.kt similarity index 100% rename from compiler/testData/fir/resolve/stdlib/reflectionClass.kt rename to compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.kt diff --git a/compiler/testData/fir/resolve/stdlib/reflectionClass.txt b/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt similarity index 100% rename from compiler/testData/fir/resolve/stdlib/reflectionClass.txt rename to compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt diff --git a/compiler/testData/fir/resolve/treeSet.kt b/compiler/fir/resolve/testData/resolve/treeSet.kt similarity index 100% rename from compiler/testData/fir/resolve/treeSet.kt rename to compiler/fir/resolve/testData/resolve/treeSet.kt diff --git a/compiler/testData/fir/resolve/treeSet.txt b/compiler/fir/resolve/testData/resolve/treeSet.txt similarity index 100% rename from compiler/testData/fir/resolve/treeSet.txt rename to compiler/fir/resolve/testData/resolve/treeSet.txt diff --git a/compiler/testData/fir/resolve/typeAliasWithGeneric.kt b/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.kt similarity index 100% rename from compiler/testData/fir/resolve/typeAliasWithGeneric.kt rename to compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.kt diff --git a/compiler/testData/fir/resolve/typeAliasWithGeneric.txt b/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt similarity index 100% rename from compiler/testData/fir/resolve/typeAliasWithGeneric.txt rename to compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt diff --git a/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.kt b/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.kt similarity index 100% rename from compiler/testData/fir/resolve/typeParameterInPropertyReceiver.kt rename to compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.kt diff --git a/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt b/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt similarity index 100% rename from compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt rename to compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt diff --git a/compiler/testData/fir/resolve/typeParameterVsNested.kt b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.kt similarity index 100% rename from compiler/testData/fir/resolve/typeParameterVsNested.kt rename to compiler/fir/resolve/testData/resolve/typeParameterVsNested.kt diff --git a/compiler/testData/fir/resolve/typeParameterVsNested.txt b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt similarity index 100% rename from compiler/testData/fir/resolve/typeParameterVsNested.txt rename to compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt diff --git a/compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt rename to compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCase.kt diff --git a/compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCaseWithStdlib.kt b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCaseWithStdlib.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCaseWithStdlib.kt rename to compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCaseWithStdlib.kt diff --git a/compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt rename to compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt diff --git a/compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java similarity index 63% rename from compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java rename to compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java index 5a58002d27a..8f8abed51c4 100644 --- a/compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/fir/resolve") +@TestMetadata("compiler/fir/resolve/testData/resolve") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class FirResolveTestCaseGenerated extends AbstractFirResolveTestCase { @@ -26,95 +26,95 @@ public class FirResolveTestCaseGenerated extends AbstractFirResolveTestCase { } public void testAllFilesPresentInResolve() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/fir/resolve"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true, "stdlib"); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/fir/resolve/testData/resolve"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true, "stdlib"); } @TestMetadata("companion.kt") public void testCompanion() throws Exception { - runTest("compiler/testData/fir/resolve/companion.kt"); + runTest("compiler/fir/resolve/testData/resolve/companion.kt"); } @TestMetadata("derivedClass.kt") public void testDerivedClass() throws Exception { - runTest("compiler/testData/fir/resolve/derivedClass.kt"); + runTest("compiler/fir/resolve/testData/resolve/derivedClass.kt"); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - runTest("compiler/testData/fir/resolve/enum.kt"); + runTest("compiler/fir/resolve/testData/resolve/enum.kt"); } @TestMetadata("F.kt") public void testF() throws Exception { - runTest("compiler/testData/fir/resolve/F.kt"); + runTest("compiler/fir/resolve/testData/resolve/F.kt"); } @TestMetadata("ft.kt") public void testFt() throws Exception { - runTest("compiler/testData/fir/resolve/ft.kt"); + runTest("compiler/fir/resolve/testData/resolve/ft.kt"); } @TestMetadata("functionTypes.kt") public void testFunctionTypes() throws Exception { - runTest("compiler/testData/fir/resolve/functionTypes.kt"); + runTest("compiler/fir/resolve/testData/resolve/functionTypes.kt"); } @TestMetadata("genericFunctions.kt") public void testGenericFunctions() throws Exception { - runTest("compiler/testData/fir/resolve/genericFunctions.kt"); + runTest("compiler/fir/resolve/testData/resolve/genericFunctions.kt"); } @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - runTest("compiler/testData/fir/resolve/nestedClass.kt"); + runTest("compiler/fir/resolve/testData/resolve/nestedClass.kt"); } @TestMetadata("NestedOfAliasedType.kt") public void testNestedOfAliasedType() throws Exception { - runTest("compiler/testData/fir/resolve/NestedOfAliasedType.kt"); + runTest("compiler/fir/resolve/testData/resolve/NestedOfAliasedType.kt"); } @TestMetadata("NestedSuperType.kt") public void testNestedSuperType() throws Exception { - runTest("compiler/testData/fir/resolve/NestedSuperType.kt"); + runTest("compiler/fir/resolve/testData/resolve/NestedSuperType.kt"); } @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - runTest("compiler/testData/fir/resolve/simpleClass.kt"); + runTest("compiler/fir/resolve/testData/resolve/simpleClass.kt"); } @TestMetadata("simpleTypeAlias.kt") public void testSimpleTypeAlias() throws Exception { - runTest("compiler/testData/fir/resolve/simpleTypeAlias.kt"); + runTest("compiler/fir/resolve/testData/resolve/simpleTypeAlias.kt"); } @TestMetadata("treeSet.kt") public void testTreeSet() throws Exception { - runTest("compiler/testData/fir/resolve/treeSet.kt"); + runTest("compiler/fir/resolve/testData/resolve/treeSet.kt"); } @TestMetadata("TwoDeclarationsInSameFile.kt") public void testTwoDeclarationsInSameFile() throws Exception { - runTest("compiler/testData/fir/resolve/TwoDeclarationsInSameFile.kt"); + runTest("compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.kt"); } @TestMetadata("typeAliasWithGeneric.kt") public void testTypeAliasWithGeneric() throws Exception { - runTest("compiler/testData/fir/resolve/typeAliasWithGeneric.kt"); + runTest("compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.kt"); } @TestMetadata("typeParameterInPropertyReceiver.kt") public void testTypeParameterInPropertyReceiver() throws Exception { - runTest("compiler/testData/fir/resolve/typeParameterInPropertyReceiver.kt"); + runTest("compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.kt"); } @TestMetadata("typeParameterVsNested.kt") public void testTypeParameterVsNested() throws Exception { - runTest("compiler/testData/fir/resolve/typeParameterVsNested.kt"); + runTest("compiler/fir/resolve/testData/resolve/typeParameterVsNested.kt"); } - @TestMetadata("compiler/testData/fir/resolve/builtins") + @TestMetadata("compiler/fir/resolve/testData/resolve/builtins") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Builtins extends AbstractFirResolveTestCase { @@ -123,16 +123,16 @@ public class FirResolveTestCaseGenerated extends AbstractFirResolveTestCase { } public void testAllFilesPresentInBuiltins() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/fir/resolve/builtins"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/fir/resolve/testData/resolve/builtins"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); } @TestMetadata("lists.kt") public void testLists() throws Exception { - runTest("compiler/testData/fir/resolve/builtins/lists.kt"); + runTest("compiler/fir/resolve/testData/resolve/builtins/lists.kt"); } } - @TestMetadata("compiler/testData/fir/resolve/fromBuilder") + @TestMetadata("compiler/fir/resolve/testData/resolve/fromBuilder") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class FromBuilder extends AbstractFirResolveTestCase { @@ -141,36 +141,36 @@ public class FirResolveTestCaseGenerated extends AbstractFirResolveTestCase { } public void testAllFilesPresentInFromBuilder() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/fir/resolve/fromBuilder"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/fir/resolve/testData/resolve/fromBuilder"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); } @TestMetadata("complexTypes.kt") public void testComplexTypes() throws Exception { - runTest("compiler/testData/fir/resolve/fromBuilder/complexTypes.kt"); + runTest("compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.kt"); } @TestMetadata("enums.kt") public void testEnums() throws Exception { - runTest("compiler/testData/fir/resolve/fromBuilder/enums.kt"); + runTest("compiler/fir/resolve/testData/resolve/fromBuilder/enums.kt"); } @TestMetadata("noPrimaryConstructor.kt") public void testNoPrimaryConstructor() throws Exception { - runTest("compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt"); + runTest("compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.kt"); } @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - runTest("compiler/testData/fir/resolve/fromBuilder/simpleClass.kt"); + runTest("compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.kt"); } @TestMetadata("typeParameters.kt") public void testTypeParameters() throws Exception { - runTest("compiler/testData/fir/resolve/fromBuilder/typeParameters.kt"); + runTest("compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.kt"); } } - @TestMetadata("compiler/testData/fir/resolve/multifile") + @TestMetadata("compiler/fir/resolve/testData/resolve/multifile") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Multifile extends AbstractFirResolveTestCase { @@ -179,52 +179,52 @@ public class FirResolveTestCaseGenerated extends AbstractFirResolveTestCase { } public void testAllFilesPresentInMultifile() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/fir/resolve/multifile"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/fir/resolve/testData/resolve/multifile"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); } @TestMetadata("Annotations.kt") public void testAnnotations() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/Annotations.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/Annotations.kt"); } @TestMetadata("NestedSuperType.kt") public void testNestedSuperType() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/NestedSuperType.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.kt"); } @TestMetadata("sealedStarImport.kt") public void testSealedStarImport() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/sealedStarImport.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.kt"); } @TestMetadata("simpleAliasedImport.kt") public void testSimpleAliasedImport() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/simpleAliasedImport.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.kt"); } @TestMetadata("simpleImport.kt") public void testSimpleImport() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/simpleImport.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/simpleImport.kt"); } @TestMetadata("simpleImportNested.kt") public void testSimpleImportNested() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/simpleImportNested.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.kt"); } @TestMetadata("simpleImportOuter.kt") public void testSimpleImportOuter() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/simpleImportOuter.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.kt"); } @TestMetadata("simpleStarImport.kt") public void testSimpleStarImport() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/simpleStarImport.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.kt"); } @TestMetadata("TypeAliasExpansion.kt") public void testTypeAliasExpansion() throws Exception { - runTest("compiler/testData/fir/resolve/multifile/TypeAliasExpansion.kt"); + runTest("compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.kt"); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java similarity index 76% rename from compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java rename to compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java index fc9b582d667..a95c80b282d 100644 --- a/compiler/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/fir/resolve/stdlib") +@TestMetadata("compiler/fir/resolve/testData/resolve/stdlib") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class FirResolveTestCaseWithStdlibGenerated extends AbstractFirResolveTestCaseWithStdlib { @@ -26,21 +26,21 @@ public class FirResolveTestCaseWithStdlibGenerated extends AbstractFirResolveTes } public void testAllFilesPresentInStdlib() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/fir/resolve/stdlib"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib"), Pattern.compile("^([^.]+)\\.kt$"), TargetBackend.ANY, true); } @TestMetadata("concurrent.kt") public void testConcurrent() throws Exception { - runTest("compiler/testData/fir/resolve/stdlib/concurrent.kt"); + runTest("compiler/fir/resolve/testData/resolve/stdlib/concurrent.kt"); } @TestMetadata("functionX.kt") public void testFunctionX() throws Exception { - runTest("compiler/testData/fir/resolve/stdlib/functionX.kt"); + runTest("compiler/fir/resolve/testData/resolve/stdlib/functionX.kt"); } @TestMetadata("reflectionClass.kt") public void testReflectionClass() throws Exception { - runTest("compiler/testData/fir/resolve/stdlib/reflectionClass.kt"); + runTest("compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.kt"); } } diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts index bde040f9ca6..22d92a00f15 100644 --- a/compiler/fir/tree/build.gradle.kts +++ b/compiler/fir/tree/build.gradle.kts @@ -22,7 +22,6 @@ sourceSets { projectDefault() java.srcDir("visitors") } - "test" {} } val generatorClasspath by configurations.creating diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index 652750d32d0..25d7448785e 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -202,17 +202,7 @@ fun main(args: Array) { model("ir/sourceRanges") } - testClass { - model("fir/rawBuilder", testMethod = "doRawFirTest") - } - testClass { - model("fir/resolve", pattern = KT_WITHOUT_DOTS_IN_NAME, excludeDirs = listOf("stdlib")) - } - - testClass { - model("fir/resolve/stdlib", pattern = KT_WITHOUT_DOTS_IN_NAME) - } testClass { model("codegen/bytecodeListing") @@ -387,4 +377,20 @@ fun main(args: Array) { model("codegen/bytecodeText", targetBackend = TargetBackend.JVM_IR) } } + + testGroup("compiler/fir/psi2fir/tests", "compiler/fir/psi2fir/testData") { + testClass { + model("rawBuilder", testMethod = "doRawFirTest") + } + } + + testGroup("compiler/fir/resolve/tests", "compiler/fir/resolve/testData") { + testClass { + model("resolve", pattern = KT_WITHOUT_DOTS_IN_NAME, excludeDirs = listOf("stdlib")) + } + + testClass { + model("resolve/stdlib", pattern = KT_WITHOUT_DOTS_IN_NAME) + } + } }