From 63825c45dd8d54d504dfea55017a7171c9f90a31 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 13 Apr 2015 14:51:40 +0300 Subject: [PATCH] First step: moved classes of test framework to another package --- idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt | 4 ++-- .../kotlin/asJava/FakeLightClassForPackageTest.java | 4 ++-- .../kotlin/checkers/AbstractJetJsCheckerTest.java | 4 ++-- .../kotlin/checkers/AbstractJetPsiCheckerTest.java | 2 +- .../kotlin/checkers/KotlinAndJavaCheckerTest.java | 2 +- .../AbstractCompiledKotlinInJavaCompletionTest.java | 4 ++-- .../kotlin/completion/AbstractJSBasicCompletionTest.java | 2 +- .../kotlin/completion/AbstractJvmBasicCompletionTest.java | 2 +- .../kotlin/completion/AbstractJvmSmartCompletionTest.java | 2 +- .../completion/AbstractJvmWithLibBasicCompletionTest.java | 4 ++-- .../kotlin/completion/AbstractKeywordCompletionTest.kt | 2 +- .../AbstractKotlinSourceInJavaCompletionTest.java | 2 +- .../completion/AbstractMultiFileJvmBasicCompletionTest.kt | 2 +- .../completion/AbstractMultiFileSmartCompletionTest.kt | 2 +- .../kotlin/completion/DataFlowValueRenderingTest.kt | 4 ++-- .../completion/JetFixtureCompletionBaseTestCase.java | 2 +- .../kotlin/completion/confidence/JetConfidenceTest.java | 2 +- .../completion/handlers/AbstractCompletionHandlerTests.kt | 2 +- .../completion/handlers/BasicCompletionHandlerTest.kt | 2 +- .../completion/handlers/CompletionHandlerTestBase.kt | 2 +- .../handlers/CompletionMultifileHandlerTest.java | 2 +- .../completion/handlers/JavaCompletionHandlerTest.java | 2 +- .../handlers/SmartCompletionMultifileHandlerTest.java | 2 +- .../completion/weighers/AbstractCompletionWeigherTest.kt | 6 +++--- .../kotlin/findUsages/AbstractJetFindUsagesTest.java | 6 +++--- .../kotlin/formatter/AbstractJetFormatterTest.java | 2 +- .../org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt | 1 + .../org/jetbrains/kotlin/idea/WordSelectionTest.java | 2 ++ .../resolve/HighlightingWithDependentLibrariesTest.kt | 6 +++--- .../idea/caches/resolve/MultiModuleHighlightingTest.kt | 2 +- .../idea/codeInsight/AbstractInsertImportOnPasteTest.kt | 2 +- .../kotlin/idea/codeInsight/AbstractJetInspectionTest.kt | 4 ++-- .../kotlin/idea/codeInsight/AbstractLineMarkersTest.java | 6 +++--- .../codeInsight/AbstractOutOfBlockModificationTest.java | 4 ++-- .../idea/codeInsight/AbstractOverrideImplementTest.java | 4 ++-- .../kotlin/idea/codeInsight/LiveTemplatesContextTest.kt | 4 ++-- .../kotlin/idea/codeInsight/LiveTemplatesTest.java | 6 +++--- .../kotlin/idea/codeInsight/OverrideImplementTest.java | 2 +- .../idea/codeInsight/OverrideImplementWithLibTest.java | 4 ++-- .../kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt | 2 +- .../copy/AbstractJavaToKotlinCopyPasteConversionTest.kt | 4 ++-- .../coverage/AbstractKotlinCoverageOutputFilesTest.kt | 4 ++-- .../idea/debugger/AbstractJetPositionManagerTest.java | 4 ++-- .../kotlin/idea/debugger/AbstractSmartStepIntoTest.kt | 4 ++-- .../kotlin/idea/debugger/KotlinDebuggerTestBase.kt | 2 +- .../kotlin/idea/debugger/KotlinDebuggerTestCase.java | 4 ++-- .../evaluate/AbstractSelectExpressionForDebuggerTest.kt | 2 +- .../evaluate/CodeFragmentCompletionInLibraryTest.kt | 4 ++-- .../decompiler/AbstractInternalCompiledClassesTest.kt | 2 +- .../kotlin/idea/decompiler/InternalCompiledClassesTest.kt | 4 ++-- .../navigation/AbstractNavigateToLibrarySourceTest.kt | 6 +++--- .../navigation/NavigateFromLibrarySourcesTest.kt | 4 ++-- .../navigation/NavigateToDecompiledLibraryTest.java | 4 ++-- .../navigation/NavigateToLibraryRegressionTest.java | 2 +- .../navigation/NavigateToStdlibSourceRegressionTest.java | 2 +- .../decompiler/navigation/NavigateToStdlibSourceTest.kt | 2 +- .../idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt | 4 ++-- .../stubBuilder/ClsStubForWrongAbiVersionTest.kt | 2 +- .../decompiler/textBuilder/AbstractDecompiledTextTest.kt | 8 ++++---- .../textBuilder/DecompiledTextConsistencyTest.kt | 6 +++--- .../textBuilder/DecompiledTextForWrongAbiVersionTest.kt | 2 +- .../jetbrains/kotlin/idea/editor/JetCommenterTest.java | 2 +- .../editor/quickDoc/AbstractJetQuickDocProviderTest.java | 4 ++-- .../kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt | 2 +- .../kotlin/idea/filters/JetExceptionFilterTest.java | 2 +- .../kotlin/idea/folding/AbstractKotlinFoldingTest.java | 2 +- .../idea/folding/FoldingAfterOptimizeImportsTest.kt | 2 +- .../kotlin/idea/hierarchy/AbstractHierarchyTest.java | 2 +- .../idea/highlighter/AbstractDiagnosticMessageJsTest.java | 3 +-- .../idea/highlighter/AbstractDiagnosticMessageTest.java | 2 +- .../kotlin/idea/highlighter/AbstractHighlightingTest.java | 4 ++-- .../kotlin/idea/highlighter/NoErrorsInStdlibTest.kt | 6 +++--- .../kotlin/idea/imports/AbstractOptimizeImportsTest.kt | 2 +- .../kotlin/idea/intentions/AbstractIntentionTest.java | 6 +++--- .../kotlin/idea/javaFacade/JetJavaFacadeTest.java | 6 +++--- .../org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt | 2 +- .../org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java | 2 +- .../navigation/AbstractKotlinGotoImplementationTest.kt | 2 +- .../kotlin/idea/navigation/AbstractKotlinGotoTest.java | 2 +- .../navigation/JetGotoImplementationMultifileTest.java | 4 ++-- .../parameterInfo/AbstractFunctionParameterInfoTest.java | 2 +- .../idea/quickfix/AbstractQuickFixMultiFileTest.java | 4 ++-- .../kotlin/idea/quickfix/AbstractQuickFixTest.java | 4 ++-- .../idea/quickfix/AddOpenToClassDeclarationTest.java | 2 +- .../kotlin/idea/refactoring/InplaceRenameTest.kt | 2 +- .../changeSignature/JetChangeSignatureTest.java | 4 ++-- .../idea/refactoring/inline/AbstractInlineTest.java | 4 ++-- .../refactoring/introduce/AbstractJetExtractionTest.kt | 4 ++-- .../kotlin/idea/refactoring/move/AbstractJetMoveTest.kt | 4 ++-- .../refactoring/nameSuggester/JetNameSuggesterTest.java | 2 +- .../kotlin/idea/refactoring/rename/AbstractRenameTest.kt | 4 ++-- .../refactoring/rename/SimpleNameReferenceRenameTest.java | 2 +- .../idea/references/BuiltInsReferenceResolverTest.java | 2 +- .../kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt | 4 ++-- .../idea/resolve/AbstractReferenceResolveInJavaTest.kt | 2 +- .../AbstractReferenceResolveInLibrarySourcesTest.kt | 4 ++-- .../kotlin/idea/resolve/AbstractReferenceResolveTest.java | 2 +- .../idea/resolve/AbstractReferenceResolveWithLibTest.java | 4 ++-- .../org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt | 2 +- .../idea/structureView/AbstractKotlinFileStructureTest.kt | 4 ++-- .../idea/stubs/AbstractMultiFileHighlightingTest.java | 2 +- .../kotlin/idea/stubs/AbstractResolveByStubTest.java | 4 ++-- .../org/jetbrains/kotlin/idea/stubs/JetStubsTest.java | 2 +- .../kotlin/idea/{ => test}/DirectiveBasedActionUtils.java | 2 +- .../{ => test}/JdkAndMockLibraryProjectDescriptor.java | 2 +- .../{ => test}/JetJdkAndLibraryProjectDescriptor.java | 2 +- .../{ => test}/JetLightCodeInsightFixtureTestCase.java | 2 +- .../kotlin/idea/{ => test}/JetLightProjectDescriptor.java | 2 +- .../kotlin/idea/{ => test}/JetStdJSProjectDescriptor.java | 2 +- .../JetWithJdkAndRuntimeLightProjectDescriptor.java | 2 +- .../kotlin/idea/{ => test}/KotlinCodeInsightTestCase.java | 2 +- .../kotlin/idea/{ => test}/KotlinMultiFileTestCase.kt | 6 +++--- .../kotlin/idea/{ => test}/PluginTestCaseBase.java | 2 +- .../{ => test}/ProjectDescriptorWithStdlibSources.java | 2 +- .../org/jetbrains/kotlin/idea/{ => test}/testUtils.kt | 4 ++-- .../kotlin/load/java/AbstractJavaTypeSubstitutorTest.java | 4 ++-- .../kotlin/psi/StringTemplateExpressionManipulatorTest.kt | 4 ++-- .../psi/patternMatching/AbstractJetPsiUnifierTest.kt | 4 ++-- .../kotlin/safeDelete/AbstractJetSafeDeleteTest.java | 6 +++--- .../org/jetbrains/kotlin/search/AbstractSearcherTest.java | 2 +- .../kotlin/search/AnnotatedMembersSearchTest.java | 2 +- .../kotlin/search/ClassInheritorsSearchTest.java | 2 +- .../jetbrains/kotlin/search/JUnitMembersSearcherTest.java | 4 ++-- idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java | 2 +- .../j2k/AbstractJavaToKotlinConverterMultiFileTest.kt | 2 +- .../j2k/AbstractJavaToKotlinConverterSingleFileTest.kt | 2 +- 126 files changed, 195 insertions(+), 193 deletions(-) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/DirectiveBasedActionUtils.java (99%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/JdkAndMockLibraryProjectDescriptor.java (98%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/JetJdkAndLibraryProjectDescriptor.java (98%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/JetLightCodeInsightFixtureTestCase.java (99%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/JetLightProjectDescriptor.java (97%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/JetStdJSProjectDescriptor.java (98%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/JetWithJdkAndRuntimeLightProjectDescriptor.java (96%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/KotlinCodeInsightTestCase.java (96%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/KotlinMultiFileTestCase.kt (96%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/PluginTestCaseBase.java (98%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/ProjectDescriptorWithStdlibSources.java (97%) rename idea/tests/org/jetbrains/kotlin/idea/{ => test}/testUtils.kt (94%) diff --git a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt index ef86bb5db85..91da088ac6a 100644 --- a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt @@ -20,8 +20,8 @@ import com.intellij.codeInsight.CodeInsightSettings import com.intellij.psi.codeStyle.CodeStyleSettingsManager import com.intellij.psi.codeStyle.PackageEntry import org.jdom.Element -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java index e28ef8ab5f6..822bb94d978 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java +++ b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java @@ -22,8 +22,8 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java index aa0697de753..3fbe5311a6f 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetStdJSProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetStdJSProjectDescriptor; public abstract class AbstractJetJsCheckerTest extends JetLightCodeInsightFixtureTestCase { @NotNull diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java index eacdd643761..8976a0a57a0 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java @@ -20,7 +20,7 @@ import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.spellchecker.inspections.SpellCheckingInspection; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.highlighter.JetPsiChecker; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java index ae9b50f4075..2b050057c1c 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java @@ -27,7 +27,7 @@ import com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java index 1e000d16239..5c6d9eac6fa 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java @@ -20,8 +20,8 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractCompiledKotlinInJavaCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java index 26056cc4c1d..2a99c0bb0de 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetStdJSProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetStdJSProjectDescriptor; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractJSBasicCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java index 4f264251432..8d7de3b5dde 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java index cb3d359c2a2..11bab47d7f5 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java index 6672663ba6a..d898dc52443 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java @@ -20,8 +20,8 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractJvmWithLibBasicCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt index 63b45a72193..c115aa54039 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.completion import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.lookup.LookupElement -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor import org.jetbrains.kotlin.idea.completion.KeywordLookupObject import org.jetbrains.kotlin.idea.project.TargetPlatform diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java index 7ff835d5ec8..a7e79438bbc 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java @@ -24,7 +24,7 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.project.TargetPlatform; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt index 7f861d29772..a5266271f28 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.completion import org.jetbrains.kotlin.completion.util.* import org.jetbrains.kotlin.idea.KotlinCompletionTestCase -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.project.TargetPlatform import org.jetbrains.kotlin.idea.stubs.AstAccessControl diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt index 6e9cb92bb67..54a930fda71 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.completion import org.jetbrains.kotlin.completion.util.* import org.jetbrains.kotlin.idea.KotlinCompletionTestCase -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.project.TargetPlatform import org.jetbrains.kotlin.idea.stubs.AstAccessControl import com.intellij.codeInsight.completion.CompletionType diff --git a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt index d8e7d26aac0..a23ec24db14 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt @@ -16,14 +16,14 @@ package org.jetbrains.kotlin.completion -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.idea.completion.renderDataFlowValue import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.openapi.util.io.FileUtil import java.io.File -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo diff --git a/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java index b3a541a49f2..0a6d600fb4d 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java @@ -22,7 +22,7 @@ import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.completion.util.UtilPackage; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker; import org.jetbrains.kotlin.idea.project.TargetPlatform; diff --git a/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java b/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java index 03ba1258f21..5e024b14986 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java @@ -25,7 +25,7 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.text.StringUtil; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/AbstractCompletionHandlerTests.kt b/idea/tests/org/jetbrains/kotlin/completion/handlers/AbstractCompletionHandlerTests.kt index aeb568153b2..f76aa5a37a8 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/AbstractCompletionHandlerTests.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/AbstractCompletionHandlerTests.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.completion.handlers import com.intellij.codeInsight.completion.CompletionType import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt index afe804fa566..cb2772985ce 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.completion.handlers import com.intellij.codeInsight.completion.CompletionType import com.intellij.psi.codeStyle.CodeStyleSettingsManager -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings import java.io.File diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt index bf6d1417a81..81fe77b1a34 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt @@ -25,7 +25,7 @@ import com.intellij.codeInsight.lookup.impl.LookupImpl import com.intellij.openapi.application.Result import com.intellij.openapi.command.WriteCommandAction import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.test.JetTestUtils import org.junit.Assert diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java index 361f5322733..d155e01cb96 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.completion.handlers; import org.jetbrains.kotlin.idea.KotlinCompletionTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java index 117f9c85c9b..4f9e6d9e51a 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.completion.handlers; import org.jetbrains.kotlin.idea.KotlinCompletionTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java index 1b104eddc89..258820461d6 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.completion.handlers; import com.intellij.codeInsight.completion.CompletionType; import org.jetbrains.kotlin.idea.KotlinCompletionTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt b/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt index 684d79cad7a..08f7a0b786c 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.completion.weighers import com.intellij.codeInsight.completion.CompletionType import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.testng.Assert import org.jetbrains.kotlin.test.util.configureWithExtraFile -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor public abstract class AbstractCompletionWeigherTest(val completionType: CompletionType, val relativeTestDataPath: String) : JetLightCodeInsightFixtureTestCase() { fun doTest(path: String) { diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java index 2560cdbaec3..fd21135d524 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java @@ -48,9 +48,9 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions; import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions; import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions; diff --git a/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java index 863bc6fc080..d804ab79824 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java @@ -33,7 +33,7 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.JetLanguage; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.SettingsConfigurator; diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt b/idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt index 38e32e02c9d..4d7f1adb31c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea import com.intellij.codeInsight.CodeInsightSettings import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiFile +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.JetFile import java.io.File diff --git a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java index bffc670075f..105c827d9d5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java @@ -19,6 +19,8 @@ package org.jetbrains.kotlin.idea; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt index 66dc5e66b10..36c1b868536 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt @@ -16,15 +16,15 @@ package org.jetbrains.kotlin.idea.caches.resolve -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.MockLibraryUtil import com.intellij.openapi.roots.libraries.Library import java.io.File import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VfsUtil -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor import com.intellij.openapi.module.Module import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ContentEntry diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt index 037d2badb27..00dce0e3b11 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.caches.resolve -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.roots.ModuleRootModificationUtil import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt index 17d3feb694c..581e0b79c2d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.actionSystem.IdeActions import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiFile import org.jetbrains.kotlin.idea.AbstractCopyPasteTest -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.testUtils.dumpTextWithErrors import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt index ab1de1fb7f0..9d353189d79 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt @@ -27,8 +27,8 @@ import com.intellij.testFramework.InspectionTestUtil import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.ConfigLibraryUtil import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.JetTestUtils diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java index 19406ce39ae..5b3745fcab7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java @@ -31,9 +31,9 @@ import com.intellij.testFramework.ExpectedHighlightingData; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerNavigationHandler; import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java index 0e576d45eb2..722a4c2596f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java @@ -22,8 +22,8 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.PsiModificationTrackerImpl; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java index 91b52e85083..c24b23f285e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java @@ -34,8 +34,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; import org.jetbrains.kotlin.idea.core.codeInsight.DescriptorClassMember; import org.jetbrains.kotlin.idea.core.codeInsight.ImplementMethodsHandler; import org.jetbrains.kotlin.idea.core.codeInsight.OverrideImplementMethodsHandler; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt index c493fe39da4..883e7d2ae73 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.idea.codeInsight -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import java.io.File import org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java index 74ae97bcfea..268b48ba042 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java @@ -32,9 +32,9 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; import java.util.ArrayList; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java index 261cab1a5aa..d74c4068eb0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.codeInsight.CodeInsightSettings; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; public final class OverrideImplementTest extends AbstractOverrideImplementTest { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java index 43568d14a9c..d81a812149a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; public final class OverrideImplementWithLibTest extends AbstractOverrideImplementTest { private static final String TEST_PATH = PluginTestCaseBase.getTestDataPathBase() + "/codeInsight/overrideImplement/withLib"; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt index b7c5c20627a..48c1fa87f23 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.codeInsight.smartEnter -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import com.intellij.openapi.actionSystem.IdeActions import org.jetbrains.kotlin.idea.JetFileType import org.jetbrains.kotlin.test.util.trimIndent diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt index 5836c97b67c..ced73660f7f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.conversion.copy import com.intellij.openapi.actionSystem.IdeActions import org.jetbrains.kotlin.idea.AbstractCopyPasteTest -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.editor.JetEditorOptions import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.JetTestUtils diff --git a/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt index c3aae44c44c..9d7abb5713f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.idea.coverage -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.test.JetTestUtils import java.io.File diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java index 026781a8162..a98d0d33980 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java @@ -39,8 +39,8 @@ import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.idea.KotlinMultiFileTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt index 21a3838911e..267be94efd1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.actions.SmartStepTarget import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import com.intellij.debugger.actions.MethodSmartStepTarget import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.psi.util.PsiFormatUtil import com.intellij.psi.PsiSubstitutor import com.intellij.psi.util.PsiFormatUtilBase -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase public abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTestCase() { private val fixture: JavaCodeInsightTestFixture diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt index 992fb2dc6d5..bc05a71b0f4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction import com.intellij.debugger.impl.PositionUtil import com.intellij.execution.process.ProcessOutputTypes import com.intellij.openapi.roots.libraries.LibraryUtil -import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor import com.intellij.openapi.roots.JdkOrderEntry import com.intellij.openapi.util.io.FileUtil import com.intellij.debugger.SourcePosition diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java index 3e787ab201b..c858ed5a63c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java @@ -36,8 +36,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; -import org.jetbrains.kotlin.idea.ProjectDescriptorWithStdlibSources; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt index c4dbd22735e..27020e8e70b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger.evaluate import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.debugger.KotlinEditorTextProvider -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.junit.Assert diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index ffebe530ff4..646c330daf9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.completion.util.testCompletion import org.jetbrains.kotlin.idea.project.TargetPlatform import com.intellij.codeInsight.completion.CompletionType -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import com.intellij.openapi.module.Module import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ContentEntry diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt index aa021f90a18..8982b51f8d2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiCompiledFile import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager import com.intellij.psi.impl.compiled.ClsFileImpl -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinClass diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt index db8fddd36ce..ebb63cd1261 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.decompiler import com.intellij.psi.ClassFileViewProvider import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinClass.Kind.ANONYMOUS_OBJECT import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinClass.Kind.LOCAL_CLASS import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.* diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt index d06d8af7aef..9ee819c93e3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt @@ -21,9 +21,9 @@ import com.intellij.psi.PsiElement import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.UsefulTestCase import junit.framework.TestCase -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.KotlinCodeInsightTestCase -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils import org.jetbrains.kotlin.idea.references.JetReference import org.jetbrains.kotlin.idea.testUtils.ModuleKind diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index 704b17f977a..a523a286750 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.idea.decompiler.navigation import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.OrderRootType diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java index 3dd02601989..6291319223b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java @@ -34,8 +34,8 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.decompiler.JetClsFile; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java index 8f02bf0b3b9..033efad3ce8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java @@ -26,7 +26,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.idea.JetLanguage; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTestCase { /** diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java index 4d4f549018e..a9510475b69 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.testFramework.LightPlatformTestCase; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.ProjectDescriptorWithStdlibSources; +import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources; public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegressionTest { /** diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceTest.kt index 6b796c936b3..e9bf68446c0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceTest.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import com.intellij.testFramework.LightPlatformTestCase import junit.framework.TestCase import org.jetbrains.kotlin.idea.JetFileType -import org.jetbrains.kotlin.idea.KotlinCodeInsightTestCase +import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase import org.jetbrains.kotlin.idea.testUtils.ModuleKind import org.jetbrains.kotlin.idea.testUtils.configureAs diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt index 1e3e8b25dd4..5362b85660c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.util.indexing.FileContentImpl import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt index 33baa6abff7..da40fdbf4f1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor import java.io.File import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest import org.jetbrains.kotlin.test.JetTestUtils diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt index 150a3c7c12b..8ecbf95a40f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.psi.PsiManager import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import com.intellij.testFramework.UsefulTestCase.* import org.junit.Assert.* -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest import com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.psi.PsiErrorElement diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index 9d3d11618fb..c78bd073ef9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -24,9 +24,9 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import org.jetbrains.kotlin.name.ClassId diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index 2546c386f93..7c4bf7fd93f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.testFramework.LightProjectDescriptor import com.intellij.psi.PsiManager import org.junit.Assert -import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor import java.io.File import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java index 7305be10698..6e0eb59580f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.editor; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.EditorTestUtil; import com.intellij.testFramework.LightCodeInsightTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractJetQuickDocProviderTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractJetQuickDocProviderTest.java index 928ae15245e..97ee2e4ae37 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractJetQuickDocProviderTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractJetQuickDocProviderTest.java @@ -24,8 +24,8 @@ import com.intellij.psi.PsiElement; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.ProjectDescriptorWithStdlibSources; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.util.UtilPackage; diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt index 123cc74b56d..611da9523c0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.editor.quickDoc import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.JetQuickDocumentationProvider -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.kotlin.psi.psiUtil.getParentOfType diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java b/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java index 76344b70830..0ea5a599edd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java @@ -30,7 +30,7 @@ import com.intellij.refactoring.MultiFileTestCase; import com.intellij.testFramework.PsiTestUtil; import kotlin.Function1; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java index 452ef3d1f6f..a69dd1ab4bc 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java @@ -27,7 +27,7 @@ import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; import org.jetbrains.kotlin.test.SettingsConfigurator; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt index c1d77e09b99..b6cd10a31b7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt @@ -20,7 +20,7 @@ import com.intellij.codeInsight.folding.CodeFoldingManager import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.command.UndoConfirmationPolicy import com.intellij.openapi.editor.FoldRegion -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import java.io.File import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import org.jetbrains.kotlin.test.InTextDirectivesUtils diff --git a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java index b93dede0b4b..8a076e82eb0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java @@ -36,7 +36,7 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.KotlinHierarchyViewTestBase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCalleeMethodsTreeStructure; import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallerMethodsTreeStructure; import org.jetbrains.kotlin.idea.hierarchy.overrides.KotlinOverrideTreeStructure; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java index 258d92a1413..671086ea1b6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java @@ -22,10 +22,9 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.kotlin.js.config.Config; -import org.jetbrains.kotlin.js.config.EcmaVersion; import org.jetbrains.kotlin.js.config.LibrarySourcesConfig; import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java index 8181a7a9837..e1989c3e168 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java index 0e6e8c1c732..acc7c407aea 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java @@ -22,8 +22,8 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.TagsTestDataUtil; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt index d992bd376c8..ae59e0131f0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt @@ -17,18 +17,18 @@ package org.jetbrains.kotlin.idea.highlighter import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor import com.intellij.openapi.vfs.VfsUtil import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream import com.intellij.openapi.projectRoots.Sdk -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import kotlin.test.assertEquals import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.diagnostics.Severity import kotlin.test.assertTrue -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import java.io.File public class NoErrorsInStdlibTest : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt index 1bf64c48a4d..8213eacb902 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.command.UndoConfirmationPolicy import java.io.File import org.junit.Assert -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.* import org.jetbrains.kotlin.psi.* diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index 7cfc055d486..6863e5da5e0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -30,9 +30,9 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Convertor; import kotlin.Function0; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.DirectiveBasedActionUtils; -import org.jetbrains.kotlin.idea.KotlinCodeInsightTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; +import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.util.application.ApplicationPackage; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.ConfigLibraryUtil; diff --git a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java index be53c1a9141..a418d88dc00 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java @@ -24,9 +24,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.asJava.KotlinLightClass; import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.asJava.LightClassUtil; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.psi.*; diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt index 6fd80b7edd2..33daa939643 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.kdoc import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java index 844e9242b64..00f3363b1cb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.rename.RenameProcessor; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; public class KdocRenameTest extends LightCodeInsightTestCase { @NotNull diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt index be79d38625d..80bc1868a10 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.navigation import com.intellij.openapi.projectRoots.Sdk import com.intellij.testFramework.LightCodeInsightTestCase import com.intellij.testFramework.LightPlatformCodeInsightTestCase -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.JetTestUtils import java.io.File diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java index 079314c1ca6..fd119d640ad 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java @@ -30,7 +30,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.ReferenceUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationMultifileTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationMultifileTest.java index bfb961b3f73..db32a569704 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationMultifileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationMultifileTest.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.idea.navigation; import com.intellij.codeInsight.navigation.GotoTargetHandler; -import org.jetbrains.kotlin.idea.KotlinCodeInsightTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java index 5ee3549a8ab..38cee41e69e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index ba8bbb05c5d..a5889317726 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -31,9 +31,9 @@ import junit.framework.ComparisonFailure; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.DirectiveBasedActionUtils; +import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.ConfigLibraryUtil; import org.jetbrains.kotlin.test.InTextDirectivesUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java index 4d52b746804..8b340fb2bd0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java @@ -31,9 +31,9 @@ import com.intellij.psi.PsiElement; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.DirectiveBasedActionUtils; +import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.ConfigLibraryUtil; import org.jetbrains.kotlin.test.InTextDirectivesUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java index 8117f2f036b..5e58d9d99f0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDocumentManager; import com.intellij.testFramework.PsiTestUtil; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.LocalFileSystemUtils; public class AddOpenToClassDeclarationTest extends AbstractQuickFixMultiFileTest { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt index df1fcf42303..b114c0b9d6d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt @@ -21,7 +21,7 @@ import com.intellij.testFramework.LightPlatformCodeInsightTestCase import com.intellij.testFramework.fixtures.CodeInsightTestUtil import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import kotlin.test.* -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import com.intellij.openapi.actionSystem.impl.SimpleDataContext import com.intellij.openapi.actionSystem.CommonDataKeys import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java index c683eb981ff..00902d64a65 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java @@ -36,8 +36,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.Visibilities; -import org.jetbrains.kotlin.idea.KotlinCodeInsightTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.psi.JetElement; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java index 34f7a1d9d98..19e9366368b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java @@ -23,8 +23,8 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt index 230a225268e..c2e9265736e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt @@ -27,8 +27,8 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt index b5522d5aba8..8cb573e1f24 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt @@ -37,8 +37,8 @@ import com.intellij.refactoring.move.moveInner.MoveInnerProcessor import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor import com.intellij.util.ActionRunner -import org.jetbrains.kotlin.idea.KotlinMultiFileTestCase -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveDestinationKotlinMoveTarget import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsOptions diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java index 71492d94bbc..0dbc6e5dd05 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring.nameSuggester; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.core.refactoring.EmptyValidator; import org.jetbrains.kotlin.idea.core.refactoring.JetNameSuggester; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt index a861694088b..5227a625e76 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt @@ -28,7 +28,7 @@ import com.intellij.refactoring.rename.RenameProcessor import com.intellij.refactoring.rename.RenamePsiElementProcessor import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.JavaPsiFacade import com.intellij.openapi.project.Project @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintException -import org.jetbrains.kotlin.idea.KotlinMultiFileTestCase +import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.name.* import org.jetbrains.kotlin.resolve.descriptorUtil.resolveTopLevelClass diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java index 1d65d98987a..802361a0b22 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.rename.RenameProcessor; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; public class SimpleNameReferenceRenameTest extends LightCodeInsightTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java index ca6f0be6415..9c74ec675b2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde; import org.jetbrains.kotlin.test.JetTestUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt index 249c2b929cc..878dd91d33b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.idea.resolve -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.HashSet diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt index 55997fd9af4..03ce2436f60 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.resolve -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase private val FILE_WITH_KOTLIN_CODE = PluginTestCaseBase.getTestDataPathBase() + "/resolve/referenceInJava/dependencies.kt" diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt index d4da2b0e1ce..9b077386299 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.idea.resolve -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.junit.Assert import junit.framework.AssertionFailedError diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java index 189d85ea50c..5416727fb19 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java @@ -28,7 +28,7 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.InTextDirectivesUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java index 723f9d7c946..66cc77ff683 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.LightProjectDescriptor; -import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; public abstract class AbstractReferenceResolveWithLibTest extends AbstractReferenceResolveTest { private static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/resolve/referenceWithLib"; diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt index 71b1d07038e..6169786f106 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt @@ -37,7 +37,7 @@ import com.intellij.psi.PsiManager import com.intellij.testFramework.MapDataContext import com.intellij.testFramework.PlatformTestCase import com.intellij.testFramework.PsiTestUtil -import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex import org.jetbrains.kotlin.idea.util.application.runWriteAction diff --git a/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt index cb630b51120..91213878830 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.idea.structureView -import org.jetbrains.kotlin.idea.PluginTestCaseBase -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import com.intellij.util.ui.tree.TreeUtil import com.intellij.openapi.util.io.FileUtil import java.io.File diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java index 8393b4622e0..bdc5e74fda3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java @@ -31,7 +31,7 @@ import kotlin.Function0; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.KotlinCompletionTestCase; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java index ddbec1f162b..c05bbdc7d82 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java @@ -22,8 +22,8 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.kotlin.idea.KotlinCodeInsightTestCase; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.testUtils.TestUtilsPackage; import org.jetbrains.kotlin.name.FqName; diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/JetStubsTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/JetStubsTest.java index 578a9dc5bdd..b4f95b1a41e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/JetStubsTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/JetStubsTest.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/DirectiveBasedActionUtils.java b/idea/tests/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.java similarity index 99% rename from idea/tests/org/jetbrains/kotlin/idea/DirectiveBasedActionUtils.java rename to idea/tests/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.java index b81e1b62cd8..a35bd8d27b0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/DirectiveBasedActionUtils.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/idea/tests/org/jetbrains/kotlin/idea/JdkAndMockLibraryProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java similarity index 98% rename from idea/tests/org/jetbrains/kotlin/idea/JdkAndMockLibraryProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java index d0930f3a358..91f6365913b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/JdkAndMockLibraryProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ContentEntry; diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/test/JetJdkAndLibraryProjectDescriptor.java similarity index 98% rename from idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/test/JetJdkAndLibraryProjectDescriptor.java index a6704f10e66..f2b609e6a58 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/JetJdkAndLibraryProjectDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/test/JetLightCodeInsightFixtureTestCase.java similarity index 99% rename from idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java rename to idea/tests/org/jetbrains/kotlin/idea/test/JetLightCodeInsightFixtureTestCase.java index 7e442025e38..d85c84f3ef0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/JetLightCodeInsightFixtureTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.openapi.actionSystem.*; diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/test/JetLightProjectDescriptor.java similarity index 97% rename from idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/test/JetLightProjectDescriptor.java index 031541c22f8..db6e7aecbd1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/JetLightProjectDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetStdJSProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/test/JetStdJSProjectDescriptor.java similarity index 98% rename from idea/tests/org/jetbrains/kotlin/idea/JetStdJSProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/test/JetStdJSProjectDescriptor.java index 243515ebf46..4853e71a258 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/JetStdJSProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/JetStdJSProjectDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetWithJdkAndRuntimeLightProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/test/JetWithJdkAndRuntimeLightProjectDescriptor.java similarity index 96% rename from idea/tests/org/jetbrains/kotlin/idea/JetWithJdkAndRuntimeLightProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/test/JetWithJdkAndRuntimeLightProjectDescriptor.java index 60cee96deb3..334bc9607ba 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/JetWithJdkAndRuntimeLightProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/JetWithJdkAndRuntimeLightProjectDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java similarity index 96% rename from idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java rename to idea/tests/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java index 92ed373c973..cf6072516e0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinMultiFileTestCase.kt b/idea/tests/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt similarity index 96% rename from idea/tests/org/jetbrains/kotlin/idea/KotlinMultiFileTestCase.kt rename to idea/tests/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt index dc913d2b835..1b637f226d7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinMultiFileTestCase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea +package org.jetbrains.kotlin.idea.test -import com.intellij.refactoring.MultiFileTestCase import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess +import com.intellij.refactoring.MultiFileTestCase import org.jetbrains.kotlin.test.JetTestUtils public abstract class KotlinMultiFileTestCase : MultiFileTestCase() { @@ -30,4 +30,4 @@ public abstract class KotlinMultiFileTestCase : MultiFileTestCase() { VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()) super.tearDown() } -} +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java b/idea/tests/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java similarity index 98% rename from idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java rename to idea/tests/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java index 560415c4f2d..9e2f3dcc7bd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.SdkModificator; diff --git a/idea/tests/org/jetbrains/kotlin/idea/ProjectDescriptorWithStdlibSources.java b/idea/tests/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java similarity index 97% rename from idea/tests/org/jetbrains/kotlin/idea/ProjectDescriptorWithStdlibSources.java rename to idea/tests/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java index 75bd12cb2a0..729db3c2f10 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/ProjectDescriptorWithStdlibSources.java +++ b/idea/tests/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea; +package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ContentEntry; diff --git a/idea/tests/org/jetbrains/kotlin/idea/testUtils.kt b/idea/tests/org/jetbrains/kotlin/idea/test/testUtils.kt similarity index 94% rename from idea/tests/org/jetbrains/kotlin/idea/testUtils.kt rename to idea/tests/org/jetbrains/kotlin/idea/test/testUtils.kt index 9ceed31be65..d56a41e5654 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/testUtils.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/test/testUtils.kt @@ -23,8 +23,8 @@ import com.intellij.testFramework.LightProjectDescriptor import com.intellij.util.Consumer import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages -import org.jetbrains.kotlin.idea.JetStdJSProjectDescriptor -import org.jetbrains.kotlin.idea.ProjectDescriptorWithStdlibSources +import org.jetbrains.kotlin.idea.test.JetStdJSProjectDescriptor +import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java b/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java index 75b3ceb3940..6f6ec7a82e6 100644 --- a/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java +++ b/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java @@ -21,8 +21,8 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; import org.jetbrains.kotlin.load.java.structure.JavaClassifierType; import org.jetbrains.kotlin.load.java.structure.JavaType; import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter; diff --git a/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt index 554b904679e..dd011b92c9d 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.psi -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor import com.intellij.psi.ElementManipulators import org.junit.Assert.* import com.intellij.openapi.util.TextRange diff --git a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt index 4fc9ecb130d..c74ff0f5f7d 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.psi.patternMatching -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.psiUtil.parents @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.kotlin.psi.JetWhenCondition -import org.jetbrains.kotlin.idea.DirectiveBasedActionUtils +import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils public abstract class AbstractJetPsiUnifierTest: JetLightCodeInsightFixtureTestCase() { public fun doTest(filePath: String) { diff --git a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java index fc5fa599bea..14c04fa5a54 100644 --- a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java +++ b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java @@ -26,9 +26,9 @@ import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.*; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java index af913d0b2b0..c4ce257708a 100644 --- a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java @@ -24,7 +24,7 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.util.Query; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java b/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java index d65f51d0356..98493ec56e4 100644 --- a/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.search; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.AnnotatedMembersSearch; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java b/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java index 64766304f9f..6e13a653eb5 100644 --- a/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.search; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.ClassInheritorsSearch; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java index d0d75b0fd1c..c8a8a0b548e 100644 --- a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java @@ -23,8 +23,8 @@ import com.intellij.psi.search.searches.AnnotatedMembersSearch; import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java index 135ab79462f..f47b8d266b8 100644 --- a/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java +++ b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java @@ -25,7 +25,7 @@ import com.intellij.util.PathUtil; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetObjectDeclaration; import org.junit.Assert; diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt index 926577e004f..dc5ac6f6e32 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiFile import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager import com.intellij.testFramework.LightPlatformTestCase -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.j2k.IdeaResolverForConverter import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor import org.jetbrains.kotlin.idea.testUtils.dumpTextWithErrors diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index 576d0eece78..f90225807ca 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -26,7 +26,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.command.WriteCommandAction import org.jetbrains.kotlin.test.util.trimIndent import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor -import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.psi.PsiJavaFile import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.idea.j2k.IdeaResolverForConverter