'idea-frontend-fir' move fir tests into subpackage 'org.jetbrains.kotlin.idea.fir'

In intellij infrastructure we run tests by matching package pattern.
So in order to be able run FIR tests we need to place them into unique package

generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt

@@ -80,6 +80,7 @@ import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesFirTest
 import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesWithDisableComponentSearchFirTest
 import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithLibraryFirTest
 import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithStdlibFirTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.components.*
 import org.jetbrains.kotlin.idea.fir.highlighter.AbstractFirHighlightingTest
 import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLInspectionTest
 import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLLocalInspectionTest
@@ -98,13 +99,13 @@ import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixTest
 import org.jetbrains.kotlin.idea.fir.resolve.AbstractFirReferenceResolveTest
 import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest
 import org.jetbrains.kotlin.idea.frontend.api.components.*
-import org.jetbrains.kotlin.idea.frontend.api.fir.AbstractResolveCallTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.fir.AbstractResolveCallTest
-import org.jetbrains.kotlin.idea.frontend.api.scopes.AbstractFileScopeTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.scopes.AbstractFileScopeTest
-import org.jetbrains.kotlin.idea.frontend.api.scopes.AbstractMemberScopeByFqNameTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.scopes.AbstractMemberScopeByFqNameTest
-import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractMemoryLeakInSymbolsTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractMemoryLeakInSymbolsTest
-import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractSymbolByFqNameTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByFqNameTest
-import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractSymbolByPsiTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByPsiTest
-import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractSymbolByReferenceTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByReferenceTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyWithLibTest
 import org.jetbrains.kotlin.idea.highlighter.*

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.asJava.classes;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirClassLoadingTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.asJava.classes;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirLightClassTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.asJava.classes;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirLightFacadeClassTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/AbstractFirKotlinHighlightingPassTest.kt

@@ -8,9 +8,9 @@ package org.jetbrains.kotlin.idea.fir.checkers
 import com.intellij.rt.execution.junit.FileComparisonFailure
 import org.jetbrains.kotlin.checkers.AbstractKotlinHighlightingPassTest
 import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingTest
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.idea.test.withCustomCompilerOptions
-import org.jetbrains.kotlin.idea.withPossiblyDisabledDuplicatedFirSourceElementsException
+import org.jetbrains.kotlin.idea.fir.withPossiblyDisabledDuplicatedFirSourceElementsException
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.utils.IgnoreTests

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/FirKotlinHighlightingPassTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.checkers;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.checkers.AbstractFirKotlinHighlightingPassTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirJava8OverrideImplementTest.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.codeinsight
 
 import org.jetbrains.kotlin.idea.codeInsight.Java8OverrideImplementTest
 import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.junit.runner.RunWith

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTest.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.codeinsight
 
 import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementTest
 import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.junit.runner.RunWith

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTestMixIn.kt

@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol
 import org.jetbrains.kotlin.idea.frontend.api.tokens.HackToForceAllowRunningAnalyzeOnEDT
 import org.jetbrains.kotlin.idea.frontend.api.tokens.hackyAllowRunningOnEdt
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.name.StandardClassIds
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementWithLibTest.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.codeinsight
 
 import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementWithLibTest
 import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.junit.runner.RunWith

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.completion;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.completion.AbstractFirKeywordCompletionTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.completion;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelJvmBasicCompletionTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.completion;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelMultiFileJvmBasicCompletionTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.completion.test.handlers;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractFirKeywordCompletionHandlerTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.completion.test.handlers;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractHighLevelBasicCompletionHandlerTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.completion.wheigher;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.completion.wheigher.AbstractHighLevelWeigherTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesFirTest.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.findUsages
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.psi.KtFile
 
 abstract class AbstractFindUsagesFirTest : AbstractFindUsagesTest() {

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.findUsages
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.findUsages.AbstractFindUsagesWithDisableComponentSearchTest
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.psi.KtFile
 
 abstract class AbstractFindUsagesWithDisableComponentSearchFirTest : AbstractFindUsagesWithDisableComponentSearchTest() {

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.findUsages
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.psi.KtFile
 
 abstract class AbstractKotlinFindUsagesWithLibraryFirTest : AbstractKotlinFindUsagesWithLibraryTest() {

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.findUsages
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithStdlibTest
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.psi.KtFile
 
 abstract class AbstractKotlinFindUsagesWithStdlibFirTest : AbstractKotlinFindUsagesWithStdlibTest() {

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.findUsages;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesFirTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.findUsages;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesWithDisableComponentSearchFirTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.findUsages;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithLibraryFirTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.findUsages;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithStdlibFirTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/AbstractFirHighlightingTest.kt

@@ -5,11 +5,11 @@
 
 package org.jetbrains.kotlin.idea.fir.highlighter
 
-import org.jetbrains.kotlin.idea.addExternalTestFiles
+import org.jetbrains.kotlin.idea.fir.addExternalTestFiles
 import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingTest
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
-import org.jetbrains.kotlin.idea.withPossiblyDisabledDuplicatedFirSourceElementsException
+import org.jetbrains.kotlin.idea.fir.withPossiblyDisabledDuplicatedFirSourceElementsException
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.utils.IgnoreTests

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.highlighter;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.highlighter.AbstractFirHighlightingTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.inspections;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLInspectionTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.inspections;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLLocalInspectionTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.intentions;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.intentions.AbstractHLIntentionTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.quickfix;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixMultiFileTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.quickfix;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/AbstractFirReferenceResolveTest.kt

@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.idea.fir.resolve
 
 import org.jetbrains.kotlin.idea.completion.test.configureWithExtraFile
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveTest
 import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.resolve;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.resolve.AbstractFirReferenceResolveTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.fir.shortenRefs;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.fir.shortenRefs.AbstractFirShortenRefsTest;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/AbstractSymbolByFqNameTest.kt

@@ -3,9 +3,11 @@
  * 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.idea.frontend.api
+package org.jetbrains.kotlin.idea.fir.frontend.api
 
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
+import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.symbols.DebugSymbolRenderer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/KtAnalysisSessionContractsTest.kt

@@ -3,11 +3,14 @@
  * 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.idea.frontend.api
+package org.jetbrains.kotlin.idea.fir.frontend.api
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.testFramework.LightProjectDescriptor
 import junit.framework.Assert
+import org.jetbrains.kotlin.idea.frontend.api.WriteActionStartInsideAnalysisContextException
+import org.jetbrains.kotlin.idea.frontend.api.analyse
+import org.jetbrains.kotlin.idea.frontend.api.analyseWithCustomToken
 import org.jetbrains.kotlin.idea.frontend.api.tokens.AlwaysAccessibleValidityTokenFactory
 import org.jetbrains.kotlin.idea.frontend.api.tokens.HackToForceAllowRunningAnalyzeOnEDT
 import org.jetbrains.kotlin.idea.frontend.api.tokens.hackyAllowRunningOnEdt

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/SymbolByFqName.kt

@@ -3,9 +3,10 @@
  * 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.idea.frontend.api
+package org.jetbrains.kotlin.idea.fir.frontend.api
 
 import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractExpectedExpressionTypeTest.kt

@@ -3,11 +3,11 @@
  * 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.idea.frontend.api.components
+package org.jetbrains.kotlin.idea.fir.frontend.api.components
 
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.util.parentOfType
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.KtExpression

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractHLExpressionTypeTest.kt

@@ -3,14 +3,14 @@
  * 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.idea.frontend.api.components
+package org.jetbrains.kotlin.idea.fir.frontend.api.components
 
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.frontend.api.analyse
-import org.jetbrains.kotlin.idea.test.framework.AbstractKtIdeaTest
+import org.jetbrains.kotlin.idea.fir.test.framework.AbstractKtIdeaTest
-import org.jetbrains.kotlin.idea.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure
-import org.jetbrains.kotlin.idea.test.framework.TestStructureExpectedDataBlock
+import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureExpectedDataBlock
-import org.jetbrains.kotlin.idea.test.framework.TestStructureRenderer
+import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureRenderer
 import org.jetbrains.kotlin.idea.util.application.executeOnPooledThread
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.test.KotlinTestUtils

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt

@@ -3,20 +3,21 @@
  * 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.idea.frontend.api.components
+package org.jetbrains.kotlin.idea.fir.frontend.api.components
 
 import com.intellij.psi.util.parentOfType
 import com.intellij.psi.util.parentsOfType
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSyntheticJavaPropertySymbol
-import org.jetbrains.kotlin.idea.test.framework.AbstractKtIdeaTest
+import org.jetbrains.kotlin.idea.fir.test.framework.AbstractKtIdeaTest
-import org.jetbrains.kotlin.idea.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure
-import org.jetbrains.kotlin.idea.test.framework.TestStructureExpectedDataBlock
+import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureExpectedDataBlock
-import org.jetbrains.kotlin.idea.test.framework.TestStructureRenderer
+import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureRenderer
+import org.jetbrains.kotlin.idea.frontend.api.components.KtTypeRendererOptions
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.test.KotlinTestUtils
 

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractRendererTest.kt

@@ -3,11 +3,13 @@
  * 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.idea.frontend.api.components
+package org.jetbrains.kotlin.idea.fir.frontend.api.components
 
 import com.intellij.openapi.util.io.FileUtil
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.frontend.api.analyse
+import org.jetbrains.kotlin.idea.frontend.api.components.KtDeclarationRendererOptions
+import org.jetbrains.kotlin.idea.frontend.api.components.KtTypeRendererOptions
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.KotlinTestUtils

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractReturnExpressionTargetTest.kt

@@ -3,13 +3,13 @@
  * 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.idea.frontend.api.components
+package org.jetbrains.kotlin.idea.fir.frontend.api.components
 
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiComment
 import com.intellij.psi.util.parentOfType
 import junit.framework.Assert
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.KtDeclaration

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/ExpectedExpressionTypeTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.components;
+package org.jetbrains.kotlin.idea.fir.frontend.api.components;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/HLExpressionTypeTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.components;
+package org.jetbrains.kotlin.idea.fir.frontend.api.components;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/OverriddenDeclarationProviderTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.components;
+package org.jetbrains.kotlin.idea.fir.frontend.api.components;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/RendererTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.components;
+package org.jetbrains.kotlin.idea.fir.frontend.api.components;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/ReturnExpressionTargetTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.components;
+package org.jetbrains.kotlin.idea.fir.frontend.api.components;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/fir/AbstractResolveCallTest.kt

@@ -3,14 +3,14 @@
  * 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.idea.frontend.api.fir
+package org.jetbrains.kotlin.idea.fir.frontend.api.fir
 
 import com.intellij.openapi.editor.CaretState
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import com.intellij.testFramework.LightCodeInsightTestCase
-import org.jetbrains.kotlin.idea.addExternalTestFiles
+import org.jetbrains.kotlin.idea.fir.addExternalTestFiles
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.calls.KtCall

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/fir/ResolveCallTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.fir;
+package org.jetbrains.kotlin.idea.fir.frontend.api.fir;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractFileScopeTest.kt

@@ -3,10 +3,10 @@
  * 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.idea.frontend.api.scopes
+package org.jetbrains.kotlin.idea.fir.frontend.api.scopes
 
 import com.intellij.openapi.util.io.FileUtil
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.symbols.DebugSymbolRenderer
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractMemberScopeTest.kt

@@ -3,14 +3,14 @@
  * 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.idea.frontend.api.scopes
+package org.jetbrains.kotlin.idea.fir.frontend.api.scopes
 
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
-import org.jetbrains.kotlin.idea.frontend.api.SymbolByFqName
+import org.jetbrains.kotlin.idea.fir.frontend.api.SymbolByFqName
-import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractSymbolByFqNameTest
+import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByFqNameTest
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
-import org.jetbrains.kotlin.idea.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure
 
 abstract class AbstractMemberScopeByFqNameTest : AbstractSymbolByFqNameTest() {
     override fun KtAnalysisSession.collectSymbols(fileStructure: TestFileStructure): List<KtSymbol> {

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/FileScopeTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.scopes;
+package org.jetbrains.kotlin.idea.fir.frontend.api.scopes;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/MemberScopeByFqNameTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.scopes;
+package org.jetbrains.kotlin.idea.fir.frontend.api.scopes;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt

@@ -3,20 +3,21 @@
  * 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.idea.frontend.api.symbols
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.util.io.FileUtil
 import com.sun.management.HotSpotDiagnosticMXBean
 import junit.framework.Assert
 import org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.fir.low.level.api.trackers.KotlinFirOutOfBlockModificationTrackerFactory
 import org.jetbrains.kotlin.idea.frontend.api.InvalidWayOfUsingAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProvider
 import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSessionProvider
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByFqNameTest.kt

@@ -3,11 +3,12 @@
  * 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.idea.frontend.api.symbols
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols
 
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
-import org.jetbrains.kotlin.idea.frontend.api.SymbolByFqName
+import org.jetbrains.kotlin.idea.fir.frontend.api.SymbolByFqName
-import org.jetbrains.kotlin.idea.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 
 abstract class AbstractSymbolByFqNameTest : AbstractSymbolTest() {
     override fun KtAnalysisSession.collectSymbols(fileStructure: TestFileStructure): List<KtSymbol> {

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByPsiTest.kt

@@ -3,10 +3,11 @@
  * 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.idea.frontend.api.symbols
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols
 
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
-import org.jetbrains.kotlin.idea.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
 

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByReferenceTest.kt

@@ -3,11 +3,12 @@
  * 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.idea.frontend.api.symbols
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols
 
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 import org.jetbrains.kotlin.psi.KtNameReferenceExpression
 
 abstract class AbstractSymbolByReferenceTest : AbstractSymbolTest() {

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolTest.kt

@@ -3,16 +3,18 @@
  * 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.idea.frontend.api.symbols
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols
 
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.editor.Document
 import com.intellij.psi.PsiDocumentManager
-import org.jetbrains.kotlin.idea.analyseOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.analyseOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.test.framework.*
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
+import org.jetbrains.kotlin.idea.frontend.api.symbols.DebugSymbolRenderer
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.idea.test.framework.*
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.test.KotlinTestUtils

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/MemoryLeakInSymbolsTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.symbols;
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByFqNameTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.symbols;
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByPsiTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.symbols;
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByReferenceTestGenerated.java

@@ -3,7 +3,7 @@
  * 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.idea.frontend.api.symbols;
+package org.jetbrains.kotlin.idea.fir.frontend.api.symbols;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/types/KtTypeRendererTest.kt

@@ -3,13 +3,13 @@
  * 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.idea.frontend.api.types
+package org.jetbrains.kotlin.idea.fir.frontend.api.types
 
 import com.intellij.testFramework.LightProjectDescriptor
-import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction
 import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.components.KtTypeRendererOptions
-import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.psi.KtFile

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/AbstractKtIdeaTest.kt

@@ -3,12 +3,14 @@
  * 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.idea.test.framework
+package org.jetbrains.kotlin.idea.fir.test.framework
 
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.parentOfType
+import org.jetbrains.kotlin.idea.fir.test.framework.SelectedExpressionProvider
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.fir.test.framework.*
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 import java.io.File

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/KtTest.kt

@@ -3,7 +3,7 @@
  * 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.idea.test.framework
+package org.jetbrains.kotlin.idea.fir.test.framework
 
 object KtTest {
     const val CARET_SYMBOL = "<caret>"

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/SelectedExpressionProvider.kt

@@ -3,7 +3,7 @@
  * 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.idea.test.framework
+package org.jetbrains.kotlin.idea.fir.test.framework
 
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.psi.KtElement

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestFileDirective.kt

@@ -3,7 +3,7 @@
  * 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.idea.test.framework
+package org.jetbrains.kotlin.idea.fir.test.framework
 
 import java.util.*
 

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestFileStructure.kt

@@ -3,10 +3,12 @@
  * 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.idea.test.framework
+package org.jetbrains.kotlin.idea.fir.test.framework
 
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiJavaFile
+import org.jetbrains.kotlin.idea.fir.test.framework.PresenceDirective
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFileDirective
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
 import java.nio.file.Path

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestStructureRenderer.kt

@@ -3,8 +3,13 @@
  * 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.idea.test.framework
+package org.jetbrains.kotlin.idea.fir.test.framework
 
+import org.jetbrains.kotlin.idea.fir.test.framework.SelectedExpressionProvider
+import org.jetbrains.kotlin.idea.fir.test.framework.KtTest
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFile
+import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure
+import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureExpectedDataBlock
 import org.jetbrains.kotlin.psi.psiUtil.getStartOffsetIn
 
 object TestStructureRenderer {

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/testUtils.kt

@@ -3,7 +3,7 @@
  * 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.idea
+package org.jetbrains.kotlin.idea.fir
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runReadAction