From 1ba6845b591269f7dde82912887fb614fcd861a1 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Fri, 28 May 2021 17:38:37 +0200 Subject: [PATCH] 'idea-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/tests/idea/GenerateTests.kt | 27 +++++++++++++++---- .../classes/AbstractFirClassLoadingTest.kt | 5 ++-- .../classes/AbstractFirLightClassTest.kt | 4 +-- .../AbstractFirLightFacadeClassTest.kt | 7 ++--- .../classes/FirClassLoadingTestGenerated.java | 3 ++- .../classes/FirLightClassTestGenerated.java | 3 ++- .../FirLightFacadeClassTestGenerated.java | 3 ++- .../AbstractFirKotlinHighlightingPassTest.kt | 3 ++- ...irKotlinHighlightingPassTestGenerated.java | 3 ++- .../FirJava8OverrideImplementTest.kt | 2 +- .../codeinsight/FirOverrideImplementTest.kt | 2 +- .../FirOverrideImplementTestMixIn.kt | 2 +- .../FirOverrideImplementWithLibTest.kt | 2 +- .../AbstractFirKeywordCompletionTest.kt | 2 +- ...AbstractHighLevelJvmBasicCompletionTest.kt | 2 +- ...ighLevelMultiFileJvmBasicCompletionTest.kt | 2 +- .../FirKeywordCompletionTestGenerated.java | 3 ++- ...hLevelJvmBasicCompletionTestGenerated.java | 3 ++- ...tiFileJvmBasicCompletionTestGenerated.java | 3 ++- ...AbstractFirKeywordCompletionHandlerTest.kt | 3 ++- ...ractHighLevelBasicCompletionHandlerTest.kt | 3 ++- ...KeywordCompletionHandlerTestGenerated.java | 3 ++- ...elBasicCompletionHandlerTestGenerated.java | 3 ++- ...HighLevelCompletionMultifileHandlerTest.kt | 3 ++- .../wheigher/AbstractHighLevelWeigherTest.kt | 2 +- .../HighLevelWeigherTestGenerated.java | 3 ++- .../findUsages/AbstractFindUsagesFirTest.kt | 3 ++- ...UsagesWithDisableComponentSearchFirTest.kt | 3 ++- ...AbstractKotlinFindUsagesWithLibraryTest.kt | 5 ++-- .../AbstractKotlinFindUsagesWithStdlibTest.kt | 4 +-- .../FindUsagesFirTestGenerated.java | 3 ++- .../FindUsagesMultiModuleFirTest.kt | 3 ++- ...isableComponentSearchFirTestGenerated.java | 3 ++- ...FindUsagesWithLibraryFirTestGenerated.java | 3 ++- ...nFindUsagesWithStdlibFirTestGenerated.java | 3 ++- .../fir}/findUsages/findUsagesTestUtils.kt | 2 +- .../AbstractFirHighlightingTest.kt | 3 ++- .../FirHighlightingTestGenerated.java | 3 ++- .../inspections/AbstractHLInspectionTest.kt | 2 +- .../AbstractHLLocalInspectionTest.kt | 4 ++- .../HLInspectionTestGenerated.java | 3 ++- .../HLLocalInspectionTestGenerated.java | 3 ++- .../intentions/AbstractHLIntentionTest.kt | 3 ++- .../intentions/HLIntentionTestGenerated.java | 3 ++- .../AbstractHighLevelQuickFixMultiFileTest.kt | 3 ++- .../quickfix/AbstractHighLevelQuickFixTest.kt | 3 ++- ...ghLevelQuickFixMultiFileTestGenerated.java | 3 ++- .../HighLevelQuickFixTestGenerated.java | 3 ++- .../AbstractFirReferenceResolveTest.kt | 3 ++- .../FirReferenceResolveTestGenerated.java | 3 ++- .../shortenRefs/AbstractFirShortenRefsTest.kt | 2 +- .../FirShortenRefsTestGenerated.java | 3 ++- 52 files changed, 117 insertions(+), 63 deletions(-) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/asJava/classes/AbstractFirClassLoadingTest.kt (88%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/asJava/classes/AbstractFirLightClassTest.kt (95%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/asJava/classes/AbstractFirLightFacadeClassTest.kt (84%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/asJava/classes/FirClassLoadingTestGenerated.java (98%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/asJava/classes/FirLightClassTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/asJava/classes/FirLightFacadeClassTestGenerated.java (96%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/checkers/AbstractFirKotlinHighlightingPassTest.kt (95%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/checkers/FirKotlinHighlightingPassTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/codeinsight/FirJava8OverrideImplementTest.kt (94%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/codeinsight/FirOverrideImplementTest.kt (94%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/codeinsight/FirOverrideImplementTestMixIn.kt (98%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/codeinsight/FirOverrideImplementWithLibTest.kt (94%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/AbstractFirKeywordCompletionTest.kt (93%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/AbstractHighLevelJvmBasicCompletionTest.kt (93%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/AbstractHighLevelMultiFileJvmBasicCompletionTest.kt (97%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/FirKeywordCompletionTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/HighLevelJvmBasicCompletionTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/test/handlers/AbstractFirKeywordCompletionHandlerTest.kt (80%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/test/handlers/AbstractHighLevelBasicCompletionHandlerTest.kt (80%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java (97%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/test/handlers/HighLevelCompletionMultifileHandlerTest.kt (89%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/wheigher/AbstractHighLevelWeigherTest.kt (92%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/completion/wheigher/HighLevelWeigherTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/AbstractFindUsagesFirTest.kt (86%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt (84%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt (81%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt (85%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/FindUsagesFirTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/FindUsagesMultiModuleFirTest.kt (81%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java (97%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java (98%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java (91%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/findUsages/findUsagesTestUtils.kt (93%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/highlighter/AbstractFirHighlightingTest.kt (93%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/highlighter/FirHighlightingTestGenerated.java (98%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/inspections/AbstractHLInspectionTest.kt (90%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/inspections/AbstractHLLocalInspectionTest.kt (81%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/inspections/HLInspectionTestGenerated.java (92%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/inspections/HLLocalInspectionTestGenerated.java (97%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/intentions/AbstractHLIntentionTest.kt (91%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/intentions/HLIntentionTestGenerated.java (98%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt (92%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/quickfix/AbstractHighLevelQuickFixTest.kt (94%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/quickfix/HighLevelQuickFixMultiFileTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/quickfix/HighLevelQuickFixTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/resolve/AbstractFirReferenceResolveTest.kt (91%) rename idea/idea-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/resolve/FirReferenceResolveTestGenerated.java (99%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/shortenRefs/AbstractFirShortenRefsTest.kt (97%) rename idea/idea-fir/tests/org/jetbrains/kotlin/{ => idea/fir}/shortenRefs/FirShortenRefsTestGenerated.java (99%) diff --git a/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt b/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt index dd98645716e..b318db2103b 100644 --- a/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt +++ b/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt @@ -36,14 +36,14 @@ import org.jetbrains.kotlin.idea.codeInsight.moveUpDown.AbstractMoveStatementTes import org.jetbrains.kotlin.idea.codeInsight.postfix.AbstractPostfixTemplateProviderTest import org.jetbrains.kotlin.idea.codeInsight.surroundWith.AbstractSurroundWithTest import org.jetbrains.kotlin.idea.codeInsight.unwrap.AbstractUnwrapRemoveTest -import org.jetbrains.kotlin.idea.completion.AbstractFirKeywordCompletionTest -import org.jetbrains.kotlin.idea.completion.AbstractHighLevelJvmBasicCompletionTest -import org.jetbrains.kotlin.idea.completion.AbstractHighLevelMultiFileJvmBasicCompletionTest +import org.jetbrains.kotlin.idea.fir.completion.AbstractFirKeywordCompletionTest +import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelJvmBasicCompletionTest +import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelMultiFileJvmBasicCompletionTest import org.jetbrains.kotlin.idea.completion.test.* import org.jetbrains.kotlin.idea.completion.test.handlers.* import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletionWeigherTest -import org.jetbrains.kotlin.idea.completion.wheigher.AbstractHighLevelWeigherTest +import org.jetbrains.kotlin.idea.fir.completion.wheigher.AbstractHighLevelWeigherTest import org.jetbrains.kotlin.idea.configuration.AbstractGradleConfigureProjectByChangingFileTest import org.jetbrains.kotlin.idea.conversion.copy.AbstractLiteralKotlinToKotlinCopyPasteTest import org.jetbrains.kotlin.idea.conversion.copy.AbstractLiteralTextToKotlinCopyPasteTest @@ -70,6 +70,20 @@ import org.jetbrains.kotlin.idea.editor.backspaceHandler.AbstractBackspaceHandle import org.jetbrains.kotlin.idea.editor.quickDoc.AbstractQuickDocProviderTest import org.jetbrains.kotlin.idea.filters.AbstractKotlinExceptionFilterTest import org.jetbrains.kotlin.idea.fir.AbstractKtDeclarationAndFirDeclarationEqualityChecker +import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirClassLoadingTest +import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirLightClassTest +import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirLightFacadeClassTest +import org.jetbrains.kotlin.idea.fir.checkers.AbstractFirKotlinHighlightingPassTest +import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractFirKeywordCompletionHandlerTest +import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractHighLevelBasicCompletionHandlerTest +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.highlighter.AbstractFirHighlightingTest +import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLInspectionTest +import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLLocalInspectionTest +import org.jetbrains.kotlin.idea.fir.intentions.AbstractHLIntentionTest import org.jetbrains.kotlin.idea.fir.low.level.api.* import org.jetbrains.kotlin.idea.fir.low.level.api.diagnostic.AbstractDiagnosticTraversalCounterTest import org.jetbrains.kotlin.idea.fir.low.level.api.diagnostic.AbstractFirContextCollectionTest @@ -79,6 +93,9 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.AbstractFileSt import org.jetbrains.kotlin.idea.fir.low.level.api.resolve.AbstractInnerDeclarationsResolvePhaseTest import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.AbstractSessionsInvalidationTest import org.jetbrains.kotlin.idea.fir.low.level.api.trackers.AbstractProjectWideOutOfBlockKotlinModificationTrackerTest +import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixMultiFileTest +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 @@ -149,7 +166,7 @@ import org.jetbrains.kotlin.pacelize.ide.test.AbstractParcelizeQuickFixTest import org.jetbrains.kotlin.psi.patternMatching.AbstractPsiUnifierTest import org.jetbrains.kotlin.search.AbstractAnnotatedMembersSearchTest import org.jetbrains.kotlin.search.AbstractInheritorsSearchTest -import org.jetbrains.kotlin.shortenRefs.AbstractFirShortenRefsTest +import org.jetbrains.kotlin.idea.fir.shortenRefs.AbstractFirShortenRefsTest import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.tools.projectWizard.cli.AbstractProjectTemplateBuildFileGenerationTest diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirClassLoadingTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirClassLoadingTest.kt similarity index 88% rename from idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirClassLoadingTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirClassLoadingTest.kt index 207a50fe5b8..d78e4dd3961 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirClassLoadingTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirClassLoadingTest.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.asJava.classes +package org.jetbrains.kotlin.idea.fir.asJava.classes import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport +import org.jetbrains.kotlin.asJava.classes.AbstractUltraLightClassLoadingTest import org.jetbrains.kotlin.executeOnPooledThreadInReadAction -import org.jetbrains.kotlin.findUsages.doTestWithFIRFlagsByPath +import org.jetbrains.kotlin.idea.fir.findUsages.doTestWithFIRFlagsByPath import org.jetbrains.kotlin.idea.perf.UltraLightChecker import org.jetbrains.kotlin.idea.perf.UltraLightChecker.getJavaFileForTest import org.jetbrains.kotlin.idea.perf.UltraLightChecker.renderLightClasses diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightClassTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirLightClassTest.kt similarity index 95% rename from idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightClassTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirLightClassTest.kt index 574316ee496..6b0aa4b874b 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightClassTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirLightClassTest.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.asJava.classes +package org.jetbrains.kotlin.idea.fir.asJava.classes import org.jetbrains.kotlin.asJava.LightClassTestCommon import org.jetbrains.kotlin.executeOnPooledThreadInReadAction -import org.jetbrains.kotlin.findUsages.doTestWithFIRFlagsByPath +import org.jetbrains.kotlin.idea.fir.findUsages.doTestWithFIRFlagsByPath import org.jetbrains.kotlin.idea.caches.resolve.PsiElementChecker import org.jetbrains.kotlin.idea.caches.resolve.findClass import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightFacadeClassTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirLightFacadeClassTest.kt similarity index 84% rename from idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightFacadeClassTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirLightFacadeClassTest.kt index 12920cc8a04..f0b3d6bf6f5 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/AbstractFirLightFacadeClassTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/AbstractFirLightFacadeClassTest.kt @@ -3,14 +3,15 @@ * 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.asJava.classes +package org.jetbrains.kotlin.idea.fir.asJava.classes import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport +import org.jetbrains.kotlin.asJava.classes.AbstractUltraLightFacadeClassTest +import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.executeOnPooledThreadInReadAction -import org.jetbrains.kotlin.findUsages.doTestWithFIRFlagsByPath +import org.jetbrains.kotlin.idea.fir.findUsages.doTestWithFIRFlagsByPath import org.jetbrains.kotlin.idea.perf.UltraLightChecker -import org.jetbrains.kotlin.idea.perf.UltraLightChecker.checkByJavaFile import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirClassLoadingTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java similarity index 98% rename from idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirClassLoadingTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java index 15e5a840c9e..dac51fbc72d 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirClassLoadingTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java @@ -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.asJava.classes; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightClassTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightClassTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java index ae75c171ff4..34111b0db11 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightClassTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java @@ -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.asJava.classes; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightFacadeClassTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java similarity index 96% rename from idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightFacadeClassTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java index 6e0ef4527b1..f740adef1f1 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/asJava/classes/FirLightFacadeClassTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java @@ -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.asJava.classes; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/checkers/AbstractFirKotlinHighlightingPassTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/AbstractFirKotlinHighlightingPassTest.kt similarity index 95% rename from idea/idea-fir/tests/org/jetbrains/kotlin/checkers/AbstractFirKotlinHighlightingPassTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/AbstractFirKotlinHighlightingPassTest.kt index 408eb4a5449..28bdf267f5b 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/checkers/AbstractFirKotlinHighlightingPassTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/AbstractFirKotlinHighlightingPassTest.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.checkers +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.test.withCustomCompilerOptions diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/checkers/FirKotlinHighlightingPassTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/FirKotlinHighlightingPassTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/checkers/FirKotlinHighlightingPassTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/FirKotlinHighlightingPassTestGenerated.java index a4fee864c51..8b3ad686b67 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/checkers/FirKotlinHighlightingPassTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/FirKotlinHighlightingPassTestGenerated.java @@ -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.checkers; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirJava8OverrideImplementTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirJava8OverrideImplementTest.kt similarity index 94% rename from idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirJava8OverrideImplementTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirJava8OverrideImplementTest.kt index 1ac32cdbaeb..ceadbd1885f 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirJava8OverrideImplementTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirJava8OverrideImplementTest.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.codeinsight +package org.jetbrains.kotlin.idea.fir.codeinsight import org.jetbrains.kotlin.idea.codeInsight.Java8OverrideImplementTest import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTest.kt similarity index 94% rename from idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTest.kt index 8d330f0b79a..fb89a0dc611 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTest.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.codeinsight +package org.jetbrains.kotlin.idea.fir.codeinsight import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementTest import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementTestMixIn.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTestMixIn.kt similarity index 98% rename from idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementTestMixIn.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTestMixIn.kt index 5179be2c5b0..40be9c108b5 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementTestMixIn.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTestMixIn.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.codeinsight +package org.jetbrains.kotlin.idea.fir.codeinsight import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementTestMixIn import org.jetbrains.kotlin.idea.core.overrideImplement.AbstractGenerateMembersHandler diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementWithLibTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementWithLibTest.kt similarity index 94% rename from idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementWithLibTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementWithLibTest.kt index 26855613027..d83ae85d7ba 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementWithLibTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementWithLibTest.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.codeinsight +package org.jetbrains.kotlin.idea.fir.codeinsight import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementWithLibTest import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractFirKeywordCompletionTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractFirKeywordCompletionTest.kt similarity index 93% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractFirKeywordCompletionTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractFirKeywordCompletionTest.kt index 5150a80453b..dfc1eb41921 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractFirKeywordCompletionTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractFirKeywordCompletionTest.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.completion +package org.jetbrains.kotlin.idea.fir.completion import org.jetbrains.kotlin.idea.completion.test.AbstractKeywordCompletionTest import org.jetbrains.kotlin.test.utils.IgnoreTests diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractHighLevelJvmBasicCompletionTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractHighLevelJvmBasicCompletionTest.kt similarity index 93% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractHighLevelJvmBasicCompletionTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractHighLevelJvmBasicCompletionTest.kt index d03ac3c2dd8..6d37bbe4802 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractHighLevelJvmBasicCompletionTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractHighLevelJvmBasicCompletionTest.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.completion +package org.jetbrains.kotlin.idea.fir.completion import org.jetbrains.kotlin.idea.completion.test.AbstractJvmBasicCompletionTest import org.jetbrains.kotlin.test.utils.IgnoreTests diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractHighLevelMultiFileJvmBasicCompletionTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractHighLevelMultiFileJvmBasicCompletionTest.kt similarity index 97% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractHighLevelMultiFileJvmBasicCompletionTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractHighLevelMultiFileJvmBasicCompletionTest.kt index ebd6f5bbae4..5343f8dc5b1 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/AbstractHighLevelMultiFileJvmBasicCompletionTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/AbstractHighLevelMultiFileJvmBasicCompletionTest.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.completion +package org.jetbrains.kotlin.idea.fir.completion import com.intellij.codeInsight.completion.CompletionType import com.intellij.testFramework.LightProjectDescriptor diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/FirKeywordCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/FirKeywordCompletionTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java index fa02a2503c3..ac87f6a3ae7 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/FirKeywordCompletionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java @@ -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.completion; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java index b5a804313ef..b784990a0e0 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java @@ -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.completion; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java index 92628e49d61..8060d98d41b 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java @@ -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.completion; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractFirKeywordCompletionHandlerTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/AbstractFirKeywordCompletionHandlerTest.kt similarity index 80% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractFirKeywordCompletionHandlerTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/AbstractFirKeywordCompletionHandlerTest.kt index 4693dcf6fd6..b51af6130ab 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractFirKeywordCompletionHandlerTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/AbstractFirKeywordCompletionHandlerTest.kt @@ -3,8 +3,9 @@ * 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.completion.test.handlers +package org.jetbrains.kotlin.idea.fir.completion.test.handlers +import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractKeywordCompletionHandlerTest import org.jetbrains.kotlin.test.utils.IgnoreTests abstract class AbstractFirKeywordCompletionHandlerTest : AbstractKeywordCompletionHandlerTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractHighLevelBasicCompletionHandlerTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/AbstractHighLevelBasicCompletionHandlerTest.kt similarity index 80% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractHighLevelBasicCompletionHandlerTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/AbstractHighLevelBasicCompletionHandlerTest.kt index e6d0be98690..3e4286d7760 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractHighLevelBasicCompletionHandlerTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/AbstractHighLevelBasicCompletionHandlerTest.kt @@ -3,8 +3,9 @@ * 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.completion.test.handlers +package org.jetbrains.kotlin.idea.fir.completion.test.handlers +import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractBasicCompletionHandlerTest import org.jetbrains.kotlin.test.utils.IgnoreTests abstract class AbstractHighLevelBasicCompletionHandlerTest : AbstractBasicCompletionHandlerTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java similarity index 97% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java index 4e696ef82a3..34e580e36ba 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java @@ -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.completion.test.handlers; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java index d4482d069b6..1813ad21b28 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java @@ -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.completion.test.handlers; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/HighLevelCompletionMultifileHandlerTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelCompletionMultifileHandlerTest.kt similarity index 89% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/HighLevelCompletionMultifileHandlerTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelCompletionMultifileHandlerTest.kt index 8ec448cf722..459b304a8d5 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/HighLevelCompletionMultifileHandlerTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelCompletionMultifileHandlerTest.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.completion.test.handlers +package org.jetbrains.kotlin.idea.fir.completion.test.handlers import com.intellij.testFramework.LightProjectDescriptor +import org.jetbrains.kotlin.idea.completion.test.handlers.CompletionMultiFileHandlerTest import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.utils.IgnoreTests diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/wheigher/AbstractHighLevelWeigherTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/AbstractHighLevelWeigherTest.kt similarity index 92% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/wheigher/AbstractHighLevelWeigherTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/AbstractHighLevelWeigherTest.kt index 51f4d5b0f0b..c8fcc0c4055 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/wheigher/AbstractHighLevelWeigherTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/AbstractHighLevelWeigherTest.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.completion.wheigher +package org.jetbrains.kotlin.idea.fir.completion.wheigher import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest import org.jetbrains.kotlin.test.utils.IgnoreTests diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/wheigher/HighLevelWeigherTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/wheigher/HighLevelWeigherTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java index 4d90bb0d204..fcea687810c 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/wheigher/HighLevelWeigherTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java @@ -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.completion.wheigher; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesFirTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesFirTest.kt similarity index 86% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesFirTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesFirTest.kt index 894344be41b..d33b529d5c9 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesFirTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesFirTest.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.findUsages +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.psi.KtFile diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt similarity index 84% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt index 0dbad9f96de..aea8a8f14a1 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.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.findUsages +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.psi.KtFile diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt similarity index 81% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt index d0d5ab723f8..07a14ba8018 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt @@ -3,12 +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.findUsages +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.test.PluginTestCaseBase -import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.psi.KtFile abstract class AbstractKotlinFindUsagesWithLibraryFirTest : AbstractKotlinFindUsagesWithLibraryTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt similarity index 85% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt index 26f17b8e69c..ba88f194274 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithStdlibTest.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.findUsages +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.test.KotlinJdkAndMultiplatformStdlibDescriptor import org.jetbrains.kotlin.psi.KtFile abstract class AbstractKotlinFindUsagesWithStdlibFirTest : AbstractKotlinFindUsagesWithStdlibTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesFirTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesFirTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java index 47f3d8a4fab..b71154e3760 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesFirTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java @@ -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.findUsages; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleFirTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesMultiModuleFirTest.kt similarity index 81% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleFirTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesMultiModuleFirTest.kt index 13dca27b257..7c9fbd0ab7f 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleFirTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesMultiModuleFirTest.kt @@ -3,8 +3,9 @@ * 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.findUsages +package org.jetbrains.kotlin.idea.fir.findUsages +import org.jetbrains.kotlin.findUsages.FindUsagesMultiModuleTest import java.nio.file.Paths class FindUsagesMultiModuleFirTest : FindUsagesMultiModuleTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java similarity index 97% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java index 48705919aae..06525719dcb 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java @@ -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.findUsages; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java similarity index 98% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java index 0042979202d..e4e31abc7ae 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java @@ -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.findUsages; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java similarity index 91% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java index af2f52a8dd5..d2d54ba747d 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java @@ -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.findUsages; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/findUsagesTestUtils.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/findUsagesTestUtils.kt similarity index 93% rename from idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/findUsagesTestUtils.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/findUsagesTestUtils.kt index a72bc9645b7..fb848eb36c4 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/findUsages/findUsagesTestUtils.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/findUsagesTestUtils.kt @@ -2,7 +2,7 @@ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.findUsages +package org.jetbrains.kotlin.idea.fir.findUsages import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.utils.IgnoreTests diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/highlighter/AbstractFirHighlightingTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/AbstractFirHighlightingTest.kt similarity index 93% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/highlighter/AbstractFirHighlightingTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/AbstractFirHighlightingTest.kt index 1cec3b96073..7ab4cce8f89 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/highlighter/AbstractFirHighlightingTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/AbstractFirHighlightingTest.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.highlighter +package org.jetbrains.kotlin.idea.fir.highlighter import org.jetbrains.kotlin.idea.addExternalTestFiles +import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingTest import org.jetbrains.kotlin.idea.invalidateCaches import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources import org.jetbrains.kotlin.idea.withPossiblyDisabledDuplicatedFirSourceElementsException diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/highlighter/FirHighlightingTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingTestGenerated.java similarity index 98% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/highlighter/FirHighlightingTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingTestGenerated.java index bfaf18e579e..43803222abc 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/highlighter/FirHighlightingTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingTestGenerated.java @@ -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.highlighter; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/AbstractHLInspectionTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/AbstractHLInspectionTest.kt similarity index 90% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/AbstractHLInspectionTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/AbstractHLInspectionTest.kt index c3dfb4fab71..c60e9f549d4 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/AbstractHLInspectionTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/AbstractHLInspectionTest.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.inspections +package org.jetbrains.kotlin.idea.fir.inspections import org.jetbrains.kotlin.idea.codeInsight.AbstractInspectionTest diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/AbstractHLLocalInspectionTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/AbstractHLLocalInspectionTest.kt similarity index 81% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/AbstractHLLocalInspectionTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/AbstractHLLocalInspectionTest.kt index 053e1047e05..54f4434230c 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/AbstractHLLocalInspectionTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/AbstractHLLocalInspectionTest.kt @@ -3,8 +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.inspections +package org.jetbrains.kotlin.idea.fir.inspections +import org.jetbrains.kotlin.idea.inspections.AbstractKotlinInspection +import org.jetbrains.kotlin.idea.inspections.AbstractLocalInspectionTest import org.jetbrains.kotlin.test.utils.IgnoreTests import java.io.File diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/HLInspectionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java similarity index 92% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/HLInspectionTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java index b23d6f9adc3..8225ef1f13f 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/HLInspectionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java @@ -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.inspections; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/HLLocalInspectionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java similarity index 97% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/HLLocalInspectionTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java index 1c35c86ccb2..a01ea45da09 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/inspections/HLLocalInspectionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java @@ -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.inspections; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/intentions/AbstractHLIntentionTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/AbstractHLIntentionTest.kt similarity index 91% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/intentions/AbstractHLIntentionTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/AbstractHLIntentionTest.kt index 6ee13bf6423..5f5e8fe1166 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/intentions/AbstractHLIntentionTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/AbstractHLIntentionTest.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.intentions +package org.jetbrains.kotlin.idea.fir.intentions import com.intellij.codeInsight.intention.IntentionAction import com.intellij.psi.PsiFile +import org.jetbrains.kotlin.idea.intentions.AbstractIntentionTest import org.jetbrains.kotlin.test.utils.IgnoreTests import java.io.File diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/intentions/HLIntentionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java similarity index 98% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/intentions/HLIntentionTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java index 9ffd85ce8f3..23464471561 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/intentions/HLIntentionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java @@ -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.intentions; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt similarity index 92% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt index 68758a40b40..a09fb970583 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixMultiFileTest.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.quickfix +package org.jetbrains.kotlin.idea.fir.quickfix import com.intellij.codeInsight.intention.IntentionAction import com.intellij.psi.PsiFile +import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixMultiFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.utils.IgnoreTests import java.nio.file.Files diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt similarity index 94% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt index 6d24d7ead67..7b9fa3b9ef4 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.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.quickfix +package org.jetbrains.kotlin.idea.fir.quickfix import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInspection.InspectionProfileEntry +import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest import org.jetbrains.kotlin.test.utils.IgnoreTests import java.io.File import java.nio.file.Paths diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/HighLevelQuickFixMultiFileTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/HighLevelQuickFixMultiFileTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java index befaddc8cdf..4b8cb36df3a 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/HighLevelQuickFixMultiFileTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java @@ -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.quickfix; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/HighLevelQuickFixTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/HighLevelQuickFixTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java index 206dc2ce950..784d3af43c6 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/HighLevelQuickFixTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java @@ -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.quickfix; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/resolve/AbstractFirReferenceResolveTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/AbstractFirReferenceResolveTest.kt similarity index 91% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/resolve/AbstractFirReferenceResolveTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/AbstractFirReferenceResolveTest.kt index 84233a0e43d..1aa63e007cb 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/resolve/AbstractFirReferenceResolveTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/AbstractFirReferenceResolveTest.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.resolve +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.resolve.AbstractReferenceResolveTest import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/resolve/FirReferenceResolveTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/idea/resolve/FirReferenceResolveTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java index eecb78db278..a279d319410 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/resolve/FirReferenceResolveTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java @@ -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.resolve; +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; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/AbstractFirShortenRefsTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/AbstractFirShortenRefsTest.kt similarity index 97% rename from idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/AbstractFirShortenRefsTest.kt rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/AbstractFirShortenRefsTest.kt index 689d2b00cca..39720789610 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/AbstractFirShortenRefsTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/AbstractFirShortenRefsTest.kt @@ -2,7 +2,7 @@ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.shortenRefs +package org.jetbrains.kotlin.idea.fir.shortenRefs import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.util.TextRange diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/FirShortenRefsTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java similarity index 99% rename from idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/FirShortenRefsTestGenerated.java rename to idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java index e6cfd7cab8a..ee8153640c8 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/FirShortenRefsTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java @@ -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.shortenRefs; +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;