From 854b73b03c7941cdeee0c1465ba72a24e8e39b06 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Tue, 16 Apr 2019 13:56:07 +0200 Subject: [PATCH] Specify test runners for IDE tests --- .../test/JUnitWithIdeaConfigurationRunner.kt | 27 +++++++++++++++++++ .../test/SmartEnterCompletionTest.kt | 3 +++ .../test/confidence/KotlinConfidenceTest.java | 3 +++ .../handlers/BasicCompletionHandlerTest.kt | 6 ++++- .../CompletionMultifileHandlerTest.kt | 3 +++ .../handlers/JavaCompletionHandlerTest.java | 4 ++- .../SmartCompletionMultifileHandlerTest.kt | 3 +++ .../liveTemplates/LiveTemplatesContextTest.kt | 3 +++ .../idea/liveTemplates/LiveTemplatesTest.kt | 3 +++ .../asJava/KotlinLightClassInheritorTest.kt | 3 +++ .../kotlin/asJava/KtFileLightClassTest.kt | 3 +++ .../kotlin/asJava/KtLightAnnotationTest.kt | 3 +++ .../kotlin/asJava/LightClassFromTextTest.kt | 3 +++ .../LightClassesClasspathSortingTest.kt | 3 +++ .../findUsages/FindUsagesMultiModuleTest.kt | 10 +++---- .../KotlinFindUsagesWithLibraryCustomTest.kt | 3 +++ .../idea/DummyFileResolveCachingTest.kt | 3 +++ .../idea/KotlinHierarchyViewTestBase.java | 3 +++ .../kotlin/idea/RegisteredFindersTest.kt | 3 +++ .../kotlin/idea/ResolveElementCacheTest.kt | 3 +++ .../kotlin/idea/WordSelectionTest.java | 3 +++ .../idea/actions/NewKotlinFileActionTest.kt | 3 +++ .../kotlin/idea/actions/QualifiedNamesTest.kt | 3 +++ .../idea/caches/ImplicitPackagePrefixTest.kt | 3 +++ .../idea/caches/KotlinShortNamesCacheTest.kt | 3 +++ .../caches/resolve/CustomModuleInfoTest.kt | 3 +++ .../idea/caches/resolve/IdeaModuleInfoTest.kt | 3 +++ .../Java8MultiModuleHighlightingTest.kt | 3 +++ .../Java9MultiModuleHighlightingTest.kt | 4 +++ .../resolve/MultiModuleHighlightingTest.kt | 3 +++ .../codeInsight/Java8OverrideImplementTest.kt | 3 +++ .../idea/codeInsight/KotlinPairMatcherTest.kt | 3 +++ .../idea/codeInsight/OverrideImplementTest.kt | 3 +++ .../OverrideImplementWithLibTest.kt | 3 +++ .../codeInsight/smartEnter/SmartEnterTest.kt | 3 +++ .../AutoConfigureKotlinSdkOnStartupTest.kt | 4 +++ .../ConfigureKotlinInTempDirTest.kt | 3 +++ .../configuration/ConfigureKotlinTest.java | 3 +++ .../KotlinFrameworkSupportProviderTest.kt | 3 +++ .../CodeFragmentCompletionInLibraryTest.kt | 4 +++ .../debugger/sequence/dsl/KotlinDslTest.kt | 3 +++ .../collection/PositiveCollectionBuildTest.kt | 3 +++ .../collection/TypedCollectionChainTest.kt | 3 +++ .../sequence/psi/java/AmbiguousChainsTest.kt | 4 +++ .../psi/java/LocationPositiveChainTest.kt | 4 +++ .../psi/java/NegativeJavaStreamTest.kt | 3 +++ .../sequence/psi/java/TypedJavaChainTest.kt | 3 +++ .../psi/sequence/TypedSequenceChain.kt | 3 +++ .../decompiler/InternalCompiledClassesTest.kt | 3 +++ .../navigation/NavigateFromJSLibraryTest.kt | 3 +++ .../NavigateFromLibrarySourcesTest.kt | 3 +++ .../NavigateToLibraryRegressionTest.java | 3 +++ .../NavigateToStdlibSourceRegressionTest.java | 3 +++ .../NavigationWithMultipleLibrariesTest.kt | 4 ++- .../BuiltInDecompilerConsistencyTest.kt | 4 +++ .../stubBuilder/ClsStubConsistencyTest.kt | 4 +++ .../ClsStubForWrongAbiVersionTest.kt | 5 +++- .../DecompiledTextConsistencyTest.kt | 3 +++ .../DecompiledTextForWrongAbiVersionTest.kt | 4 ++- .../idea/editor/KotlinCommenterTest.java | 4 ++- .../kotlin/idea/editor/LazyElementTypeTest.kt | 3 +++ .../idea/editor/StripTrailingSpacesTest.kt | 3 +++ .../kotlin/idea/editor/TypedHandlerTest.kt | 3 +++ .../quickDoc/QuickDocInCompletionTest.kt | 3 +++ .../quickDoc/QuickDocInHierarchyTest.kt | 3 +++ .../editor/quickDoc/QuickDocNavigationTest.kt | 3 +++ .../ExternalAnnotationTest.kt | 3 +++ .../idea/filters/KotlinExceptionFilterTest.kt | 3 +++ .../FoldingAfterOptimizeImportsTest.kt | 3 +++ .../ui/LoadVersionsFromMavenTest.java | 4 ++- .../HighlightingPerformanceTest.kt | 3 +++ .../highlighter/HighlightingUpdateTest.kt | 3 +++ .../highlighter/Jsr305HighlightingTest.kt | 3 +++ .../KotlinHighlightingLexerTest.kt | 3 +++ .../KotlinRainbowHighlighterTest.kt | 3 +++ .../idea/highlighter/NoErrorsInStdlibTest.kt | 3 +++ .../kotlin/idea/index/IndexExceptionTest.kt | 3 +++ ...CoroutineNonBlockingontextDetectionTest.kt | 3 +++ .../inspections/InspectionDescriptionTest.kt | 3 +++ .../KotlinCleanupInspectionTest.kt | 3 +++ .../intentions/IntentionDescriptionTest.kt | 3 +++ .../idea/javaFacade/KotlinJavaFacadeTest.java | 3 +++ .../jvm/KotlinJvmDeclarationSearcherTest.kt | 3 +++ .../kotlin/idea/kdoc/KDocFinderTest.kt | 3 +++ .../kotlin/idea/kdoc/KDocSampleTest.kt | 3 +++ .../kotlin/idea/kdoc/KdocRenameTest.java | 3 +++ .../lightClasses/LightClassEqualsTest.java | 3 +++ .../lightClasses/LightElementsEqualsTest.kt | 4 ++- .../GotoWithMultipleLibrariesTest.kt | 3 +++ ...KotlinGotoImplementationMultifileTest.java | 3 +++ .../parameterInfo/ArgumentNameHintsTest.kt | 4 +++ .../idea/parameterInfo/InlayTypeHintsTest.kt | 3 +++ .../parameterInfo/LambdaImplicitHintsTest.kt | 3 +++ .../LambdaReturnValueHintsTest.kt | 3 +++ .../parameterInfo/SuspendingCallHintsTest.kt | 3 +++ .../idea/quickfix/AddRequireModuleTest.kt | 6 ++--- .../CommonIntentionActionsParametersTest.kt | 4 +++ ...ommonIntentionActionsParametersTest.kt.192 | 3 +++ .../quickfix/CommonIntentionActionsTest.kt | 3 +++ .../CommonIntentionActionsTest.kt.181 | 3 +++ .../CommonIntentionActionsTest.kt.182 | 3 +++ .../UpdateConfigurationQuickFixTest.kt | 3 +++ .../idea/refactoring/InplaceRenameTest.kt | 3 +++ .../refactoring/KotlinNamesValidatorTest.kt | 3 +++ .../KotlinChangeSignatureTest.kt | 4 ++- .../KotlinMultiModuleChangeSignatureTest.kt | 3 +++ .../move/MoveKotlinDeclarationsHandlerTest.kt | 3 +++ .../MoveKotlinDeclarationsHandlerTest.kt.181 | 3 +++ .../nameSuggester/KotlinNameSuggesterTest.kt | 3 +++ .../BuiltInsReferenceResolverTest.java | 4 ++- .../kotlin/idea/repl/IdeReplExecutionTest.kt | 3 +++ .../kotlin/idea/repl/IdeaJsr223Test.kt | 3 +++ .../idea/run/KotlinConsoleFilterTest.kt | 3 +++ .../kotlin/idea/run/RunConfigurationTest.kt | 3 +++ .../idea/run/RunConfigurationTest.kt.181 | 3 +++ .../StandaloneScriptRunConfigurationTest.kt | 3 +++ .../scratch/CustomScratchRunActionTest.kt | 3 +++ .../idea/scratch/ScratchOptionsSaveTest.kt | 3 +++ .../idea/script/ScriptOptionsSaveTest.kt | 3 +++ .../idea/search/PsiBasedClassResolverTest.kt | 3 +++ .../kotlin/idea/stubs/DebugTextByStubTest.kt | 3 +++ .../kotlin/idea/stubs/KotlinStubsTest.java | 3 +++ .../kotlin/psi/KotlinInjectionTest.kt | 3 +++ .../kotlin/psi/KotlinLibInjectionTest.kt | 3 +++ .../kotlin/psi/KotlinStdlibInjectionTest.kt | 3 +++ ...StringTemplateExpressionManipulatorTest.kt | 3 +++ .../psi/injection/StringInjectionHostTest.kt | 3 +++ .../StringInterpolationInjectionTest.kt | 3 +++ .../kotlin/search/DefinitionsSearchTest.kt | 3 +++ .../search/JUnitMembersSearcherTest.java | 3 +++ ...patibilityVerifierVersionComparisonTest.kt | 2 ++ 131 files changed, 428 insertions(+), 20 deletions(-) create mode 100644 compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnitWithIdeaConfigurationRunner.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnitWithIdeaConfigurationRunner.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnitWithIdeaConfigurationRunner.kt new file mode 100644 index 00000000000..8442d67d39b --- /dev/null +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnitWithIdeaConfigurationRunner.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.test + +import org.junit.internal.runners.JUnit38ClassRunner +import org.junit.runners.BlockJUnit4ClassRunner + +class JUnit3WithIdeaConfigurationRunner(klass: Class<*>?) : JUnit38ClassRunner(klass) { + + companion object { + init { + IdeaSystemPropertiesForParallelRunConfigurator.setProperties() + } + } +} + +class JUnit4WithIdeaConfigurationRunner(klass: Class<*>?) : BlockJUnit4ClassRunner(klass) { + + companion object { + init { + IdeaSystemPropertiesForParallelRunConfigurator.setProperties() + } + } +} \ No newline at end of file diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/SmartEnterCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/SmartEnterCompletionTest.kt index b98c5fc6525..785086d8273 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/SmartEnterCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/SmartEnterCompletionTest.kt @@ -10,7 +10,10 @@ import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class SmartEnterCompletionTest : KotlinLightCodeInsightFixtureTestCase() { fun testBasic() { diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java index b9061a6483a..90df5111a66 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java @@ -23,11 +23,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.completion.test.CompletionTestUtilKt; import org.jetbrains.kotlin.idea.test.TestUtilsKt; import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import java.io.File; import java.lang.reflect.Method; import java.util.List; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class KotlinConfidenceTest extends LightCompletionTestCase { private static final String TYPE_DIRECTIVE_PREFIX = "// TYPE:"; private final ThreadLocal skipComplete = ThreadLocal.withInitial(() -> false); diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt index d19feb8ca45..0e2ce156017 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt @@ -8,9 +8,13 @@ package org.jetbrains.kotlin.completion.handlers import com.intellij.codeInsight.completion.CompletionType import org.jetbrains.kotlin.idea.completion.test.COMPLETION_TEST_DATA_BASE_PATH import org.jetbrains.kotlin.idea.completion.test.handlers.CompletionHandlerTestBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File -@Deprecated("All tests from here to be moved to the generated test") class BasicCompletionHandlerTest : CompletionHandlerTestBase(){ +@Deprecated("All tests from here to be moved to the generated test") +@RunWith(JUnit3WithIdeaConfigurationRunner::class) +class BasicCompletionHandlerTest : CompletionHandlerTestBase(){ private fun checkResult(){ fixture.checkResultByFile(getTestName(false) + ".kt.after") } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionMultifileHandlerTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionMultifileHandlerTest.kt index 5bda3155364..bd99338aac2 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionMultifileHandlerTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionMultifileHandlerTest.kt @@ -7,8 +7,11 @@ package org.jetbrains.kotlin.idea.completion.test.handlers import org.jetbrains.kotlin.idea.completion.test.COMPLETION_TEST_DATA_BASE_PATH import org.jetbrains.kotlin.idea.completion.test.KotlinCompletionTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CompletionMultiFileHandlerTest : KotlinCompletionTestCase() { fun testExtensionFunctionImport() { doTest() diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/JavaCompletionHandlerTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/JavaCompletionHandlerTest.java index 379e9ce00fa..e7bc196a132 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/JavaCompletionHandlerTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/JavaCompletionHandlerTest.java @@ -7,9 +7,11 @@ package org.jetbrains.kotlin.idea.completion.test.handlers; import org.jetbrains.kotlin.idea.completion.test.CompletionTestUtilKt; import org.jetbrains.kotlin.idea.completion.test.KotlinCompletionTestCase; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import java.io.File; - +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class JavaCompletionHandlerTest extends KotlinCompletionTestCase { public void testClassAutoImport() { doTest(); diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionMultifileHandlerTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionMultifileHandlerTest.kt index 1f9fe33f8ac..f347764049b 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionMultifileHandlerTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionMultifileHandlerTest.kt @@ -10,8 +10,11 @@ import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.kotlin.idea.completion.test.COMPLETION_TEST_DATA_BASE_PATH import org.jetbrains.kotlin.idea.completion.test.KotlinCompletionTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class SmartCompletionMultifileHandlerTest : KotlinCompletionTestCase() { fun testImportExtensionFunction() { doTest() } diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesContextTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesContextTest.kt index 67fc6e356c3..4bb20db9a8d 100644 --- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesContextTest.kt +++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesContextTest.kt @@ -9,8 +9,11 @@ import com.intellij.codeInsight.template.TemplateContextType import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType.* import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LiveTemplatesContextTest : KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath(): String = File(TEST_DATA_BASE_PATH, "/context").path + File.separator diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt index afcdb6d4803..bd42865b636 100644 --- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt +++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt @@ -18,9 +18,12 @@ import junit.framework.TestCase import org.jetbrains.annotations.NonNls import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File import java.util.* +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() { override fun setUp() { super.setUp() diff --git a/idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt index 1a9ffe141a4..0942377dd25 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt +++ b/idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt @@ -12,8 +12,11 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinLightClassInheritorTest : KotlinLightCodeInsightFixtureTestCase() { fun testAnnotation() { doTestInheritorByText("annotation class A", "java.lang.annotation.Annotation", false) diff --git a/idea/tests/org/jetbrains/kotlin/asJava/KtFileLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/KtFileLightClassTest.kt index 531cb5ba866..f3b911e537b 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/KtFileLightClassTest.kt +++ b/idea/tests/org/jetbrains/kotlin/asJava/KtFileLightClassTest.kt @@ -19,7 +19,10 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KtFileLightClassTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt index 6585a75f844..9e454579e50 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt @@ -23,7 +23,10 @@ import org.jetbrains.kotlin.idea.facet.configureFacet import org.jetbrains.kotlin.idea.facet.getOrCreateFacet import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KtLightAnnotationTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/asJava/LightClassFromTextTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/LightClassFromTextTest.kt index b2a1611ed47..3600f897529 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/LightClassFromTextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/asJava/LightClassFromTextTest.kt @@ -16,8 +16,11 @@ import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.KtPsiFactory +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith // see KtFileLightClassTest +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LightClassFromTextTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt index 3cdf9b9962e..1ccd20744b3 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt @@ -13,10 +13,13 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils +import org.junit.runner.RunWith import java.io.File import kotlin.test.assertNotNull +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LightClassesClasspathSortingTest : KotlinLightCodeInsightFixtureTestCase() { fun testExplicitClass() { diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt index c4084d84e6e..f975b2f1f27 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt @@ -6,37 +6,33 @@ package org.jetbrains.kotlin.findUsages import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromDirStructure -import org.junit.Test +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class FindUsagesMultiModuleTest : AbstractFindUsagesMultiModuleTest() { - @Test fun testFindActualInterface() { doTest() } - @Test fun testFindCommonClassFromActual() { doTest() } - @Test fun testFindCommonFromActual() { doTest() } - @Test fun testFindCommonPropertyFromActual() { doTest() } - @Test fun testFindCommonSuperclass() { doTest() } - @Test fun testFindImplFromHeader() { doTest() } diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryCustomTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryCustomTest.kt index 7964184466d..cf025266519 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryCustomTest.kt +++ b/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryCustomTest.kt @@ -8,7 +8,10 @@ package org.jetbrains.kotlin.findUsages import com.intellij.psi.search.FilenameIndex import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinFindUsagesWithLibraryCustomTest : AbstractKotlinFindUsagesWithLibraryTest() { fun testFindUsagesForLocalClassProperty() { val libraryFile = FilenameIndex.getFilesByName(getProject(), "library.kt", myFixture.module.moduleWithLibrariesScope).first() diff --git a/idea/tests/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt index 944f1a0c40f..cb3fc6d55ff 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt @@ -13,7 +13,10 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class DummyFileResolveCachingTest : LightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java index 67e3a5596f6..3035b5b927a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java @@ -11,10 +11,13 @@ import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.test.HierarchyViewTestFixture; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import java.io.File; import java.io.IOException; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public abstract class KotlinHierarchyViewTestBase extends KotlinLightCodeInsightFixtureTestCase { private final HierarchyViewTestFixture hierarchyFixture = new HierarchyViewTestFixture(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt b/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt index c91cbca39e1..d371f69b206 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt @@ -11,8 +11,11 @@ import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class RegisteredFindersTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = LightCodeInsightFixtureTestCase.JAVA_LATEST diff --git a/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt b/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt index dc53633312c..5b0461d2b35 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt @@ -25,9 +25,12 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.util.elementByOffset import org.jetbrains.kotlin.types.typeUtil.containsError +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class ResolveElementCacheTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java index 99139690080..3a471fb8908 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java @@ -11,10 +11,13 @@ import com.intellij.testFramework.fixtures.CodeInsightTestUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.junit.runner.RunWith; import java.io.File; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class WordSelectionTest extends KotlinLightCodeInsightFixtureTestCase { private static final String TEST_RELATIVE_DIR = "wordSelection"; diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/NewKotlinFileActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/NewKotlinFileActionTest.kt index 1642f3d248f..212efe776a1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/actions/NewKotlinFileActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/actions/NewKotlinFileActionTest.kt @@ -6,8 +6,11 @@ package org.jetbrains.kotlin.idea.actions import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class NewKotlinFileActionTest: LightCodeInsightFixtureTestCase() { companion object { private val EMPTY_PARTS_ERROR = "Name can't have empty parts" diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt index 2e67e738786..6d54a89ce9f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt @@ -11,8 +11,11 @@ import com.intellij.testFramework.LightCodeInsightTestCase import com.intellij.testFramework.LightPlatformCodeInsightTestCase import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtVisitorVoid +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.util.* +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class QualifiedNamesTest: LightCodeInsightTestCase() { fun testClassRef() { LightPlatformCodeInsightTestCase.configureFromFileText( diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/ImplicitPackagePrefixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/ImplicitPackagePrefixTest.kt index 6f7d9b647b3..ad773696051 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/ImplicitPackagePrefixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/ImplicitPackagePrefixTest.kt @@ -11,7 +11,10 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.idea.util.sourceRoots +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class ImplicitPackagePrefixTest : KotlinLightCodeInsightFixtureTestCase() { private lateinit var cacheService: PerModulePackageCacheService diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt index 54077e79184..2526c861bd5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt @@ -20,9 +20,12 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtProperty +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils +import org.junit.runner.RunWith import kotlin.reflect.KMutableProperty0 +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinShortNamesCacheTest : KotlinLightCodeInsightFixtureTestCase() { private lateinit var cacheInstance: PsiShortNamesCache diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt index 1dfaba883fb..527baead648 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt @@ -13,8 +13,11 @@ import org.jetbrains.kotlin.idea.caches.project.getModuleInfo import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CustomModuleInfoTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt index a34b7c0231d..114d40863b6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt @@ -29,13 +29,16 @@ import org.jetbrains.kotlin.idea.framework.CommonLibraryKind import org.jetbrains.kotlin.idea.framework.JSLibraryKind import org.jetbrains.kotlin.idea.test.PluginTestCaseBase.* import org.jetbrains.kotlin.idea.util.application.runWriteAction +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.util.addDependency import org.jetbrains.kotlin.test.util.jarRoot import org.jetbrains.kotlin.test.util.projectLibrary import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class IdeaModuleInfoTest : ModuleTestCase() { fun testSimpleModuleDependency() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java8MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java8MultiModuleHighlightingTest.kt index 5fb99f415c7..64614b85e05 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java8MultiModuleHighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java8MultiModuleHighlightingTest.kt @@ -6,8 +6,11 @@ package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.TestJdkKind +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class Java8MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() { override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/multiModuleHighlighting/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt index eadb0ade695..9243ad4a2f9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt @@ -7,10 +7,14 @@ package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.module.Module import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestJdkKind.FULL_JDK_9 +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class Java9MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() { override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + "/multiModuleHighlighting/java9/" 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 2391d5769a6..5ae59140358 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt @@ -40,9 +40,12 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.projectStructure.sdk import org.jetbrains.kotlin.samWithReceiver.SamWithReceiverCommandLineProcessor.Companion.ANNOTATION_OPTION import org.jetbrains.kotlin.samWithReceiver.SamWithReceiverCommandLineProcessor.Companion.PLUGIN_ID +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestJdkKind.FULL_JDK +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) open class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() { override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/multiModuleHighlighting/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/Java8OverrideImplementTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/Java8OverrideImplementTest.kt index 2c1cc45b665..dbc40442179 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/Java8OverrideImplementTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/Java8OverrideImplementTest.kt @@ -7,7 +7,10 @@ package org.jetbrains.kotlin.idea.codeInsight import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class Java8OverrideImplementTest : AbstractOverrideImplementTest() { companion object { private val TEST_PATH = PluginTestCaseBase.getTestDataPathBase() + "/codeInsight/overrideImplement/jdk8" diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/KotlinPairMatcherTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/KotlinPairMatcherTest.kt index 82099361249..b376f8c8e81 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/KotlinPairMatcherTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/KotlinPairMatcherTest.kt @@ -9,8 +9,11 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinPairMatcher import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.lang.IllegalArgumentException +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinPairMatcherTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): KotlinLightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt index ffca3730dcf..1d0a24cf155 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt @@ -7,7 +7,10 @@ package org.jetbrains.kotlin.idea.codeInsight import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.configureLanguageAndApiVersion +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class OverrideImplementTest : AbstractOverrideImplementTest() { override fun setUp() { super.setUp() diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.kt index a241bff6427..bc5b3924719 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.kt @@ -7,7 +7,10 @@ package org.jetbrains.kotlin.idea.codeInsight import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class OverrideImplementWithLibTest : AbstractOverrideImplementTest() { private val 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 1a292857bf6..ad42cca2318 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt @@ -10,7 +10,10 @@ import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() { fun testIfCondition() = doFunTest( """ diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt index 4590d534686..3c689e4d66b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt @@ -7,9 +7,13 @@ package org.jetbrains.kotlin.idea.configuration import com.intellij.openapi.projectRoots.ProjectJdkTable import org.jetbrains.kotlin.idea.framework.KotlinSdkType +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith // Do not add new tests here since application is initialized only once +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class AutoConfigureKotlinSdkOnStartupTest : AbstractConfigureKotlinInTempDirTest() { fun testKotlinSdkAdded() { Assert.assertTrue(ProjectJdkTable.getInstance().allJdks.any { it.sdkType is KotlinSdkType }) diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt index e6a1e228bc3..5496138ff0e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt @@ -14,9 +14,12 @@ import org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JsCompilerArgumen import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings import org.jetbrains.kotlin.idea.project.languageVersionSettings +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith import java.io.IOException +@RunWith(JUnit3WithIdeaConfigurationRunner::class) open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinInTempDirTest() { @Throws(IOException::class) fun testNoKotlincExistsNoSettingsRuntime10() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java index d3ac1e652d3..a3dac902724 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java @@ -37,7 +37,9 @@ import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtilKt; import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind; import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind; import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleKt; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; import org.jetbrains.kotlin.utils.PathUtil; +import org.junit.runner.RunWith; import java.io.File; import java.io.IOException; @@ -49,6 +51,7 @@ import java.util.stream.StreamSupport; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { public void testNewLibrary_copyJar() { doTestOneJavaModule(KotlinWithLibraryConfigurator.FileState.COPY); diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinFrameworkSupportProviderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinFrameworkSupportProviderTest.kt index 6a24d80cec7..d8b07e84bc8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinFrameworkSupportProviderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinFrameworkSupportProviderTest.kt @@ -14,7 +14,10 @@ import org.jetbrains.kotlin.config.apiVersionView import org.jetbrains.kotlin.config.languageVersionView import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder import org.jetbrains.kotlin.idea.framework.JavaFrameworkSupportProvider +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinFrameworkSupportProviderTest : FrameworkSupportProviderTestCase() { private fun doTest(provider: FrameworkSupportInModuleProvider) { selectFramework(provider).createLibraryDescription() 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 795ac2b23ab..90aabb04888 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -19,11 +19,15 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils +import org.junit.runner.RunWith import java.io.File private val LIBRARY_SRC_PATH = KotlinTestUtils.getHomeDirectory() + "/idea/idea-completion/testData/codeFragmentInLibrarySource/customLibrary/" +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() { override fun getProjectDescriptor() = object: SdkAndMockLibraryProjectDescriptor(LIBRARY_SRC_PATH, false) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/dsl/KotlinDslTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/dsl/KotlinDslTest.kt index b5395ba588a..b1c4dea2e9d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/dsl/KotlinDslTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/dsl/KotlinDslTest.kt @@ -8,7 +8,10 @@ import com.intellij.debugger.streams.test.DslTestCase import com.intellij.debugger.streams.trace.dsl.impl.DslImpl import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCollectionsPeekCallFactory import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinDslTest : DslTestCase(DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory()))) { override fun getTestDataPath(): String { return "idea/testData/debugger/sequence/dsl" diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/PositiveCollectionBuildTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/PositiveCollectionBuildTest.kt index a8c446344e0..6fd664a42e2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/PositiveCollectionBuildTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/PositiveCollectionBuildTest.kt @@ -7,7 +7,10 @@ package org.jetbrains.kotlin.idea.debugger.sequence.psi.collection import com.intellij.debugger.streams.wrapper.StreamChainBuilder import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase import org.jetbrains.kotlin.idea.debugger.sequence.lib.collections.KotlinCollectionSupportProvider +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class PositiveCollectionBuildTest : KotlinPsiChainBuilderTestCase.Positive("collection/positive") { override val kotlinChainBuilder: StreamChainBuilder = KotlinCollectionSupportProvider().chainBuilder diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/TypedCollectionChainTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/TypedCollectionChainTest.kt index 6afdf9ca2c9..ea9359b1660 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/TypedCollectionChainTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/collection/TypedCollectionChainTest.kt @@ -8,7 +8,10 @@ import com.intellij.debugger.streams.wrapper.StreamChainBuilder import org.jetbrains.kotlin.idea.debugger.sequence.lib.collections.KotlinCollectionSupportProvider import org.jetbrains.kotlin.idea.debugger.sequence.psi.TypedChainTestCase import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinSequenceTypes +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class TypedCollectionChainTest : TypedChainTestCase("collection/positive/types") { override val kotlinChainBuilder: StreamChainBuilder = KotlinCollectionSupportProvider().chainBuilder diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/AmbiguousChainsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/AmbiguousChainsTest.kt index 75bbf1d9d0b..d5391c2589d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/AmbiguousChainsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/AmbiguousChainsTest.kt @@ -4,6 +4,10 @@ */ package org.jetbrains.kotlin.idea.debugger.sequence.psi.java +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith + +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class AmbiguousChainsTest : PositiveJavaStreamTest("ambiguous") { fun testSimpleExpression() = doTest(2) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/LocationPositiveChainTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/LocationPositiveChainTest.kt index b7d9ee8a2d8..73c427e58aa 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/LocationPositiveChainTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/LocationPositiveChainTest.kt @@ -4,6 +4,10 @@ */ package org.jetbrains.kotlin.idea.debugger.sequence.psi.java +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith + +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LocationPositiveChainTest : PositiveJavaStreamTest("location") { fun testAnonymousBody() = doTest() diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/NegativeJavaStreamTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/NegativeJavaStreamTest.kt index a79f1c0125d..7ee9b25e760 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/NegativeJavaStreamTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/NegativeJavaStreamTest.kt @@ -7,7 +7,10 @@ package org.jetbrains.kotlin.idea.debugger.sequence.psi.java import com.intellij.debugger.streams.wrapper.StreamChainBuilder import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class NegativeJavaStreamTest : KotlinPsiChainBuilderTestCase.Negative("streams/negative") { override val kotlinChainBuilder: StreamChainBuilder = JavaStandardLibrarySupportProvider().chainBuilder diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/TypedJavaChainTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/TypedJavaChainTest.kt index 08ddb868fb9..e8b5932d525 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/TypedJavaChainTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/java/TypedJavaChainTest.kt @@ -11,7 +11,10 @@ import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinSequenceTypes import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinSequenceTypes.INT import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinSequenceTypes.LONG import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinSequenceTypes.NULLABLE_ANY +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class TypedJavaChainTest : TypedChainTestCase("streams/positive/types") { override val kotlinChainBuilder: StreamChainBuilder = JavaStandardLibrarySupportProvider().chainBuilder diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/TypedSequenceChain.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/TypedSequenceChain.kt index 0fc4b49217b..606db77e526 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/TypedSequenceChain.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/psi/sequence/TypedSequenceChain.kt @@ -8,7 +8,10 @@ import com.intellij.debugger.streams.wrapper.StreamChainBuilder import org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence.KotlinSequenceSupportProvider import org.jetbrains.kotlin.idea.debugger.sequence.psi.TypedChainTestCase import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinSequenceTypes +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class TypedSequenceChain : TypedChainTestCase("sequence/positive/types") { override val kotlinChainBuilder: StreamChainBuilder = KotlinSequenceSupportProvider().chainBuilder diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt index a4354c05154..0660456ebb7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt @@ -9,7 +9,10 @@ import com.intellij.psi.ClassFileViewProvider import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class InternalCompiledClassesTest : AbstractInternalCompiledClassesTest() { private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/decompiler/internalClasses" diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromJSLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromJSLibraryTest.kt index 0d0afa2dd49..47a2ad21e0c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromJSLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromJSLibraryTest.kt @@ -9,7 +9,10 @@ import com.intellij.testFramework.LightProjectDescriptor import junit.framework.TestCase import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class NavigateFromJSLibrarySourcesTest : AbstractNavigateFromLibrarySourcesTest() { fun testIcon() { TestCase.assertEquals( 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 772703533d2..9291cb530a7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -14,8 +14,11 @@ import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import kotlin.test.assertTrue +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class NavigateFromLibrarySourcesTest: AbstractNavigateFromLibrarySourcesTest() { fun testJdkClass() { checkNavigationFromLibrarySource("Thread", "java.lang.Thread") 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 7b8bf00caf6..90f7057396a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java @@ -17,7 +17,10 @@ import org.jetbrains.kotlin.idea.KotlinFileType; import org.jetbrains.kotlin.idea.KotlinLanguage; import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.TestUtilsKt; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTestCase { @Override 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 90f53b56f63..13adc9e5b47 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java @@ -10,7 +10,10 @@ import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.idea.test.TestUtilsKt; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegressionTest { /** * Regression test against KT-3186 diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigationWithMultipleLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigationWithMultipleLibrariesTest.kt index f3f3fe0dc09..1c76ba530b1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigationWithMultipleLibrariesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigationWithMultipleLibrariesTest.kt @@ -22,14 +22,16 @@ import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo import org.jetbrains.kotlin.idea.decompiler.navigation.NavigationChecker.Companion.checkAnnotatedCode import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.projectStructure.getModuleDir +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.testFramework.runWriteAction import org.jetbrains.kotlin.test.util.addDependency import org.jetbrains.kotlin.test.util.jarRoot import org.jetbrains.kotlin.test.util.projectLibrary import org.junit.Assert +import org.junit.runner.RunWith import java.io.File - +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class NavigationWithMultipleCustomLibrariesTest : AbstractNavigationToSourceOrDecompiledTest() { override val testDataPath = PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigationMultipleLibs/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt index d587099920b..b3258ad56e7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt @@ -21,8 +21,12 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.stubs.KotlinClassStub import org.jetbrains.kotlin.psi.stubs.elements.KtClassElementType import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class BuiltInDecompilerConsistencyTest : KotlinLightCodeInsightFixtureTestCase() { private val classFileDecompiler = KotlinClassFileDecompiler() private val builtInsDecompiler = KotlinBuiltInDecompiler() 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 25e57edfa4d..f0ab80a7dc2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt @@ -16,8 +16,12 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class ClsStubConsistencyTest : KotlinLightCodeInsightFixtureTestCase() { private fun doTest(id: ClassId) { val packageFile = VirtualFileFinder.SERVICE.getInstance(project).findVirtualFileWithHeader(id) 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 b330a268994..a21c032d9ae 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -8,9 +8,12 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.decompiler.textBuilder.findTestLibraryRoot import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils +import org.junit.runner.RunWith import java.io.File - +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { fun testPackage() = testStubsForFileWithWrongAbiVersion("Wrong_packageKt") 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 f0d65116bc0..bf282d702fa 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -26,9 +26,12 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.resolve.MemberComparator import org.jetbrains.kotlin.resolve.descriptorUtil.resolveTopLevelClass import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class DecompiledTextConsistencyTest : LightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = object : KotlinWithJdkAndRuntimeLightProjectDescriptor() { 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 30222a3839c..a4a0cff66d6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -13,10 +13,12 @@ import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile import org.jetbrains.kotlin.idea.decompiler.common.INCOMPATIBLE_ABI_VERSION_GENERAL_COMMENT import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.Assert +import org.junit.runner.RunWith import java.io.File - +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest() { override fun getProjectDescriptor(): LightProjectDescriptor { diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java index ed2f8b1f8ad..ddbe86eebb3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java @@ -11,11 +11,13 @@ import com.intellij.testFramework.EditorTestUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.kotlin.formatter.FormatSettingsUtil; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.SettingsConfigurator; +import org.junit.runner.RunWith; import java.io.File; - +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class KotlinCommenterTest extends LightCodeInsightTestCase { private static final String BASE_PATH = new File(PluginTestCaseBase.getTestDataPathBase(), "/editor/commenter/").getAbsolutePath(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/LazyElementTypeTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/LazyElementTypeTest.kt index eabad98363c..0a2a267aa80 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/LazyElementTypeTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/LazyElementTypeTest.kt @@ -13,8 +13,11 @@ import com.intellij.testFramework.LightPlatformTestCase import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseBase import org.jetbrains.kotlin.psi.KtLambdaExpression +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LazyElementTypeTest : KotlinLightCodeInsightFixtureTestCaseBase() { fun testSplitArrow() = reparse("val t = { a: Int -> }", ' ') fun testDeleteArrow() = reparse("val t = { a: Int -> }", BACKSPACE_FAKE_CHAR) diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/StripTrailingSpacesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/StripTrailingSpacesTest.kt index 785e23c1472..11d4bb1d08c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/StripTrailingSpacesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/StripTrailingSpacesTest.kt @@ -11,7 +11,10 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.testFramework.EditorTestUtil import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class StripTrailingSpacesTest : LightCodeInsightFixtureTestCase() { override fun getTestDataPath(): String { return PluginTestCaseBase.getTestDataPathBase() + "/editor/stripTrailingSpaces/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/TypedHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/TypedHandlerTest.kt index 4889958d857..b444a01e269 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/TypedHandlerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/TypedHandlerTest.kt @@ -13,7 +13,10 @@ import com.intellij.testFramework.LightPlatformTestCase import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle import org.jetbrains.kotlin.idea.formatter.ktCodeStyleSettings +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class TypedHandlerTest : LightCodeInsightTestCase() { private val dollar = '$' diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInCompletionTest.kt index d6ba5a8573a..da10ab2fe00 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInCompletionTest.kt @@ -12,8 +12,11 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtProperty +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class QuickDocInCompletionTest: KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath(): String { return PluginTestCaseBase.getTestDataPathBase() + "/kdoc/inCompletion/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInHierarchyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInHierarchyTest.kt index 5767087fe5b..04936b4bfe6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInHierarchyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInHierarchyTest.kt @@ -22,7 +22,10 @@ import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider import org.jetbrains.kotlin.idea.hierarchy.KotlinTypeHierarchyProvider import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class QuickDocInHierarchyTest() : CodeInsightTestCase() { override fun getTestDataPath(): String { return PluginTestCaseBase.getTestDataPathBase() + "/kdoc/inTypeHierarchy/" 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 5149fa95e8d..2f9136b4a47 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt @@ -17,8 +17,11 @@ import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.psi.psiUtil.getParentOfType +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class QuickDocNavigationTest() : KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath(): String { return PluginTestCaseBase.getTestDataPathBase() + "/kdoc/navigate/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/externalAnnotations/ExternalAnnotationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/externalAnnotations/ExternalAnnotationTest.kt index d7ae7873355..0f7baad1509 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/externalAnnotations/ExternalAnnotationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/externalAnnotations/ExternalAnnotationTest.kt @@ -10,10 +10,13 @@ import com.intellij.testFramework.LightPlatformTestCase import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.util.application.runWriteAction +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class ExternalAnnotationTest : KotlinLightCodeInsightFixtureTestCase() { fun testNotNullMethod() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt index 356b38d8953..1a4cd12d914 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt @@ -12,11 +12,14 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.refactoring.toVirtualFile import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith import java.io.File private data class SuffixOption(val suffix: String, val expectedLine: Int, val expectedColumn: Int) +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinExceptionFilterTest : KotlinLightCodeInsightFixtureTestCase() { private val mySuffixPlug = "" private val myPathPlug = "" diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt index 677350d6b89..dbb1d1c0f17 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt @@ -13,8 +13,11 @@ import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.test.InTextDirectivesUtils +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class FoldingAfterOptimizeImportsTest : AbstractKotlinFoldingTest() { private val fixture: JavaCodeInsightTestFixture get() = myFixture!! diff --git a/idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java b/idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java index 07f2ba2e03d..785bceae994 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java @@ -7,9 +7,11 @@ package org.jetbrains.kotlin.idea.framework.ui; import com.intellij.testFramework.LightIdeaTestCase; import com.intellij.util.text.VersionComparatorUtil; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import java.util.Collection; - +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class LoadVersionsFromMavenTest extends LightIdeaTestCase { public void testDownload() throws Exception { Collection versions = ConfigureDialogWithModulesAndVersion.loadVersions("1.0.0"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingPerformanceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingPerformanceTest.kt index df17969cc9b..a07837bd085 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingPerformanceTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingPerformanceTest.kt @@ -11,7 +11,10 @@ import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.PlatformTestUtil import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class HighlightingPerformanceTest : KotlinLightCodeInsightFixtureTestCase() { private val text = """ fun test(a: String, b: ArrayList) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingUpdateTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingUpdateTest.kt index 95bcf723367..7396c01239a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingUpdateTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingUpdateTest.kt @@ -13,8 +13,11 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import kotlin.test.assertEquals +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class HighlightingUpdateTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): KotlinLightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt index f41abd2d09e..7e4f1fa60a7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt @@ -15,9 +15,12 @@ import org.jetbrains.kotlin.idea.stubs.createFacet import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.ReportLevel +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor { val foreignAnnotationsJar = MockLibraryUtil.compileJvmLibraryToJar("third-party/annotations", "foreign-annotations") diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingLexerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingLexerTest.kt index 097bfae7a0b..1f1630192cb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingLexerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingLexerTest.kt @@ -6,7 +6,10 @@ package org.jetbrains.kotlin.idea.highlighter import com.intellij.testFramework.LexerTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinHighlightingLexerTest : LexerTestCase() { override fun createLexer() = KotlinHighlightingLexer() diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/KotlinRainbowHighlighterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/KotlinRainbowHighlighterTest.kt index e1badfe2dbd..604d2fbd71d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/KotlinRainbowHighlighterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/KotlinRainbowHighlighterTest.kt @@ -7,7 +7,10 @@ package org.jetbrains.kotlin.idea.highlighter import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinRainbowHighlighterTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt index dcf12197f19..b5c01941eec 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt @@ -17,8 +17,11 @@ import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class NoErrorsInStdlibTest : KotlinLightCodeInsightFixtureTestCase() { fun testNoErrors() { val relativePathToProjectRoot = File(System.getProperty("user.dir")).relativeTo(File(myFixture.testDataPath)).path diff --git a/idea/tests/org/jetbrains/kotlin/idea/index/IndexExceptionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/index/IndexExceptionTest.kt index 885c1ff1ea6..181b16f475e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/index/IndexExceptionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/index/IndexExceptionTest.kt @@ -7,7 +7,10 @@ package org.jetbrains.kotlin.idea.index import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class IndexExceptionTest : KotlinLightCodeInsightFixtureTestCase() { fun testRecursionInTypeParameters() { myFixture.configureByText("test.kt", "fun T.some() {}") diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/CoroutineNonBlockingontextDetectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/inspections/CoroutineNonBlockingontextDetectionTest.kt index d31af3b2272..348755e8936 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/CoroutineNonBlockingontextDetectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/CoroutineNonBlockingontextDetectionTest.kt @@ -10,7 +10,10 @@ import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CoroutineNonBlockingContextDetectionTest : KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + "/inspections/blockingCallsDetection" diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionDescriptionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionDescriptionTest.kt index f30a00a2a8b..1dbfd6484be 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionDescriptionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionDescriptionTest.kt @@ -17,7 +17,10 @@ import com.intellij.testFramework.LightPlatformTestCase import com.intellij.testFramework.UsefulTestCase import gnu.trove.THashMap import org.jetbrains.kotlin.idea.KotlinPluginUtil +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class InspectionDescriptionTest : LightPlatformTestCase() { fun testDescriptionsAndShortNames() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt index 80edca86e35..4ecfcb890a5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt @@ -13,7 +13,10 @@ import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinCleanupInspectionTest(): KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + "/inspections/cleanup" diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionDescriptionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionDescriptionTest.kt index 49ad176c8c7..19edb73f2c6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionDescriptionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionDescriptionTest.kt @@ -11,8 +11,11 @@ import com.intellij.openapi.extensions.Extensions import com.intellij.testFramework.LightPlatformTestCase import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.idea.KotlinPluginUtil +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class IntentionDescriptionTest : LightPlatformTestCase() { private val necessaryNormalNames = listOf("description.html", "before.kt.template", "after.kt.template") diff --git a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java index c4ad0df8d2f..50a3c9700aa 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java @@ -18,9 +18,12 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import static org.jetbrains.kotlin.asJava.LightClassUtilsKt.toLightClass; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase { @NotNull @Override diff --git a/idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt b/idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt index 0429a851dc6..49d053a539d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/jvm/KotlinJvmDeclarationSearcherTest.kt @@ -17,8 +17,11 @@ import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import kotlin.reflect.KClass +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinJvmDeclarationSearcherTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt index cb26a6e9e46..ee4c6947898 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocFinderTest.kt @@ -12,8 +12,11 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KDocFinderTest() : LightPlatformCodeInsightFixtureTestCase() { override fun getTestDataPath(): String { return PluginTestCaseBase.getTestDataPathBase() + "/kdoc/finder/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocSampleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocSampleTest.kt index b829e32fd43..8f71fbff46b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocSampleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocSampleTest.kt @@ -19,9 +19,12 @@ import org.jetbrains.kotlin.kdoc.psi.impl.KDocSection import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.resolve.BindingContext.DECLARATION_TO_DESCRIPTOR import org.jetbrains.kotlin.test.InTextDirectivesUtils +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KDocSampleTest : AbstractMultiModuleTest() { override fun getTestDataPath() = "${PluginTestCaseBase.getTestDataPathBase()}/kdoc/multiModuleSamples/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java index cd3a5a2965d..051e1ffb715 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java @@ -13,7 +13,10 @@ import com.intellij.refactoring.rename.RenameProcessor; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class KdocRenameTest extends LightCodeInsightTestCase { @NotNull @Override diff --git a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java index 7a1222eef81..b704e1dfd2a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java @@ -15,7 +15,10 @@ import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDe import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.psi.KtClassOrObject; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class LightClassEqualsTest extends KotlinLightCodeInsightFixtureTestCase { @NotNull @Override diff --git a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightElementsEqualsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightElementsEqualsTest.kt index 7c012707dd3..61c24a4e74d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightElementsEqualsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightElementsEqualsTest.kt @@ -14,9 +14,11 @@ import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtElement +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.lang.System.identityHashCode as idh - +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LightElementsEqualsTest : KotlinLightCodeInsightFixtureTestCase() { private val SAMPLE_SOURCE = """ diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoWithMultipleLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoWithMultipleLibrariesTest.kt index 46a59ab58a1..e0f3073057b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoWithMultipleLibrariesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoWithMultipleLibrariesTest.kt @@ -10,11 +10,14 @@ import com.intellij.openapi.module.StdModuleTypes import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.allKotlinFiles +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.util.addDependency import org.jetbrains.kotlin.test.util.jarRoot import org.jetbrains.kotlin.test.util.projectLibrary +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class GotoWithMultipleLibrariesTest : AbstractMultiModuleTest() { override fun getTestDataPath() = "${PluginTestCaseBase.getTestDataPathBase()}/multiModuleReferenceResolve/sameJarInDifferentLibraries/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java index d818f55d62d..8176ad6331d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java @@ -11,9 +11,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import java.io.File; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class KotlinGotoImplementationMultifileTest extends KotlinLightCodeInsightFixtureTestCase { public void testImplementFunInJava() { doKotlinJavaTest(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ArgumentNameHintsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ArgumentNameHintsTest.kt index 392e5859aa8..d7234354d7d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ArgumentNameHintsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ArgumentNameHintsTest.kt @@ -7,7 +7,11 @@ package org.jetbrains.kotlin.idea.parameterInfo import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class ArgumentNameHintsTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/InlayTypeHintsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/InlayTypeHintsTest.kt index 36b32586da8..b1229e7be84 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/InlayTypeHintsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/InlayTypeHintsTest.kt @@ -7,7 +7,10 @@ package org.jetbrains.kotlin.idea.parameterInfo import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class InlayTypeHintsTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/LambdaImplicitHintsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/LambdaImplicitHintsTest.kt index bbdb1b99d5e..4e1f5098bf9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/LambdaImplicitHintsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/LambdaImplicitHintsTest.kt @@ -8,7 +8,10 @@ package org.jetbrains.kotlin.idea.parameterInfo import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LambdaImplicitHintsTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): KotlinLightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/LambdaReturnValueHintsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/LambdaReturnValueHintsTest.kt index 7f9bdd21d51..685a73cc8b3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/LambdaReturnValueHintsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/LambdaReturnValueHintsTest.kt @@ -13,9 +13,12 @@ import com.intellij.testFramework.utils.inlays.InlayHintsChecker import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.TagsTestDataUtil import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class LambdaReturnValueHintsTest : KotlinLightCodeInsightFixtureTestCase() { companion object { const val DISABLE_ACTION_TEXT = "Do not show lambda return expression hints" diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/SuspendingCallHintsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/SuspendingCallHintsTest.kt index c50b63955be..c2f67503a7d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/SuspendingCallHintsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/SuspendingCallHintsTest.kt @@ -8,7 +8,10 @@ package org.jetbrains.kotlin.idea.parameterInfo import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class SuspendingCallHintsTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): KotlinLightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt index 98f804d4fed..92cf80e4a93 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt @@ -6,12 +6,12 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.daemon.QuickFixBundle -import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.kotlin.idea.core.script.isScriptDependenciesUpdaterDisabled import org.jetbrains.kotlin.idea.test.KotlinLightJava9ModulesCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinMultiModuleJava9ProjectDescriptor.ModuleDescriptor.* +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith - +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinAddRequiredModuleTest : KotlinLightJava9ModulesCodeInsightFixtureTestCase() { private val messageM2 = QuickFixBundle.message("module.info.add.requires.name", "M_TWO")!! diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt index 98c00be35bb..2f955e77818 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt @@ -11,7 +11,11 @@ import com.intellij.psi.PsiType import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.uast.UMethod +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CommonIntentionActionsParametersTest : LightPlatformCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_FULL_JDK diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt.192 b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt.192 index 55a2283c2da..1e887066ea4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt.192 +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt.192 @@ -11,7 +11,10 @@ import com.intellij.psi.PsiType import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.uast.UMethod +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CommonIntentionActionsParametersTest : LightPlatformCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_FULL_JDK diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt index 8357c87a8fc..38521317192 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt @@ -21,9 +21,12 @@ import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtModifierListOwner +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.uast.toUElement import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private class SimpleMethodRequest( project: Project, diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.181 b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.181 index 9e233769914..dcdec106082 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.181 +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.181 @@ -23,9 +23,12 @@ import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.uast.UParameter import org.jetbrains.uast.UastContext +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.uast.toUElement import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private class SimpleMethodRequest( project: Project, diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.182 b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.182 index 5eb691c6b2a..4970d4f2a63 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.182 +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt.182 @@ -22,9 +22,12 @@ import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtModifierListOwner +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.uast.toUElement import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() { private class SimpleMethodRequest( project: Project, diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt index 348781f22a4..99151012451 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt @@ -26,8 +26,11 @@ import org.jetbrains.kotlin.idea.project.languageVersionSettings import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.configureKotlinFacet import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase() { fun testDisableInlineClasses() { configureRuntime("mockRuntime11") diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt index 81e6606fd29..a2def0d924f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt @@ -23,9 +23,12 @@ import org.jetbrains.kotlin.idea.refactoring.rename.findElementForRename import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.test.InTextDirectivesUtils +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import kotlin.test.assertFalse import kotlin.test.assertTrue +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class InplaceRenameTest : LightPlatformCodeInsightTestCase() { override fun isRunInWriteAction(): Boolean = false override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + "/refactoring/rename/inplace/" diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidatorTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidatorTest.kt index 168f63b6070..d16790e6e60 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidatorTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidatorTest.kt @@ -8,8 +8,11 @@ package org.jetbrains.kotlin.idea.refactoring import com.intellij.lang.refactoring.NamesValidator import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.refactoring.KotlinNamesValidator +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinNamesValidatorTest : LightCodeInsightFixtureTestCase() { val validator: NamesValidator = KotlinNamesValidator() diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt index c3c0b103c15..82641c659ac 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt @@ -44,12 +44,14 @@ import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.test.InTextDirectivesUtils +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.types.typeUtil.makeNullable import org.jetbrains.kotlin.utils.sure +import org.junit.runner.RunWith import java.io.File import java.util.* - +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { companion object { internal val BUILT_INS = DefaultBuiltIns.Instance diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMultiModuleChangeSignatureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMultiModuleChangeSignatureTest.kt index c7d69144044..a807be5a6bb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMultiModuleChangeSignatureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMultiModuleChangeSignatureTest.kt @@ -14,8 +14,11 @@ import org.jetbrains.kotlin.idea.test.extractMarkerOffset import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.types.KotlinType +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinMultiModuleChangeSignatureTest : KotlinMultiFileTestCase() { init { isMultiModule = true diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt index a56bad81c99..902e512385b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt @@ -19,8 +19,11 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.extractMultipleMarkerOffsets import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class MoveKotlinDeclarationsHandlerTest : KotlinMultiFileTestCase() { override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.181 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.181 index 0ad2ddd43b0..75bfc4bf6f7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.181 +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveKotlinDeclarationsHandlerTest.kt.181 @@ -20,8 +20,11 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.extractMultipleMarkerOffsets import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class MoveKotlinDeclarationsHandlerTest : KotlinMultiFileTestCase() { override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt index 89a8a16d254..047307f4953 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt @@ -16,9 +16,12 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils +import org.junit.runner.RunWith import java.lang.AssertionError +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinNameSuggesterTest : KotlinLightCodeInsightFixtureTestCase() { fun testArrayList() = doTest() diff --git a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java index 4827ea860f6..7e1e893900d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java @@ -22,13 +22,15 @@ import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.Collection; import java.util.List; import static org.jetbrains.kotlin.test.util.ReferenceUtils.renderAsGotoImplementation; - +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class BuiltInsReferenceResolverTest extends KotlinLightCodeInsightFixtureTestCase { public void testAny() throws Exception { doTest(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/repl/IdeReplExecutionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/repl/IdeReplExecutionTest.kt index 8652e8d832a..d12a45768ee 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/repl/IdeReplExecutionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/repl/IdeReplExecutionTest.kt @@ -13,11 +13,14 @@ import org.jetbrains.kotlin.console.KotlinConsoleKeeper import org.jetbrains.kotlin.console.KotlinConsoleRunner import org.jetbrains.kotlin.idea.run.createLibraryWithLongPaths import org.jetbrains.kotlin.idea.util.application.runWriteAction +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Test +import org.junit.runner.RunWith import kotlin.reflect.KMutableProperty0 import kotlin.test.assertFalse import kotlin.test.assertTrue +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class IdeReplExecutionTest : PlatformTestCase() { private lateinit var consoleRunner: KotlinConsoleRunner private var commandsSent = 0 diff --git a/idea/tests/org/jetbrains/kotlin/idea/repl/IdeaJsr223Test.kt b/idea/tests/org/jetbrains/kotlin/idea/repl/IdeaJsr223Test.kt index df35307c9b8..423eaa022d8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/repl/IdeaJsr223Test.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/repl/IdeaJsr223Test.kt @@ -6,13 +6,16 @@ package org.jetbrains.kotlin.idea.repl import com.intellij.testFramework.PlatformTestCase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Test +import org.junit.runner.RunWith import javax.script.ScriptContext import javax.script.ScriptEngine import javax.script.ScriptEngineManager import javax.script.ScriptException import kotlin.test.assertFails +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class IdeaJsr223Test : PlatformTestCase() { @Test diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/KotlinConsoleFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/KotlinConsoleFilterTest.kt index 261aeb637e2..ea92dbe7673 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/KotlinConsoleFilterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/KotlinConsoleFilterTest.kt @@ -8,7 +8,10 @@ package org.jetbrains.kotlin.idea.run import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinConsoleFilterTest : KotlinLightCodeInsightFixtureTestCase() { fun testWindowsPath() { val filter = KotlinConsoleFilter(project, GlobalSearchScope.allScope(project)) diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt index b5f3b144bc7..345c349ffdc 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt @@ -33,12 +33,15 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.allChildren import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith import java.io.File import java.util.* private val RUN_PREFIX = "// RUN:" +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class RunConfigurationTest: KotlinCodeInsightTestCase() { fun getTestProject() = myProject!! override fun getModule() = myModule!! diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.181 b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.181 index ff6692db677..0fa3e833422 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.181 +++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt.181 @@ -34,12 +34,15 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.allChildren import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith import java.io.File import java.util.* private val RUN_PREFIX = "// RUN:" +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class RunConfigurationTest: KotlinCodeInsightTestCase() { fun getTestProject() = myProject!! override fun getModule() = myModule!! diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt index 00cf51bb166..ab364c1e398 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt @@ -17,10 +17,13 @@ import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.stubindex.KotlinScriptFqnIndex import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.utils.PathUtil import org.junit.Assert +import org.junit.runner.RunWith import kotlin.test.assertNotEquals +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { fun testConfigurationForScript() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/CustomScratchRunActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/scratch/CustomScratchRunActionTest.kt index eb6bb2450a3..015f49b60a1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/scratch/CustomScratchRunActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/scratch/CustomScratchRunActionTest.kt @@ -11,7 +11,10 @@ import com.intellij.openapi.roots.libraries.Library import org.jetbrains.kotlin.idea.run.createLibraryWithLongPaths import org.jetbrains.kotlin.idea.scratch.output.InlayScratchFileRenderer import org.jetbrains.kotlin.idea.util.application.runWriteAction +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CustomScratchRunActionTest : AbstractScratchRunActionTest() { fun testLongCommandLineWithRepl() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchOptionsSaveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchOptionsSaveTest.kt index 1bd02784b48..e25e3981d67 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchOptionsSaveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchOptionsSaveTest.kt @@ -6,11 +6,14 @@ package org.jetbrains.kotlin.idea.scratch import org.jetbrains.kotlin.idea.scratch.ui.ScratchTopPanel +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith import javax.swing.JCheckBox import kotlin.reflect.full.createType import kotlin.reflect.full.declaredMemberProperties +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class ScratchOptionsSaveTest : AbstractScratchRunActionTest() { fun testOptionsSaveOnClosingFile() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/ScriptOptionsSaveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/ScriptOptionsSaveTest.kt index 1610f3e60d0..2d0f0975107 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/ScriptOptionsSaveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/script/ScriptOptionsSaveTest.kt @@ -11,7 +11,10 @@ import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class ScriptOptionsSaveTest : KotlinLightCodeInsightFixtureTestCase() { fun testSaveAutoReload() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/search/PsiBasedClassResolverTest.kt b/idea/tests/org/jetbrains/kotlin/idea/search/PsiBasedClassResolverTest.kt index 6108c451d16..4603bcd52f0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/search/PsiBasedClassResolverTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/search/PsiBasedClassResolverTest.kt @@ -11,8 +11,11 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseBase import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getParentOfType +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.Assert +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class PsiBasedClassResolverTest : KotlinLightCodeInsightFixtureTestCaseBase() { fun testSimple() { Assert.assertFalse(doTest("@Test fun foo()")!!) diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt index 9d1351ddfdf..e1923d4d36b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt @@ -27,7 +27,10 @@ import kotlin.test.assertEquals import org.jetbrains.kotlin.psi.KtClassBody import org.jetbrains.kotlin.psi.KtClassInitializer import org.jetbrains.kotlin.psi.debugText.getDebugText +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class DebugTextByStubTest : LightCodeInsightFixtureTestCase() { private fun createFileAndStubTree(text: String): Pair> { val file = myFixture.configureByText("test.kt", text) as KtFile diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/KotlinStubsTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/KotlinStubsTest.java index 03a676b2cc9..105a2922152 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/KotlinStubsTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/KotlinStubsTest.java @@ -15,9 +15,12 @@ import org.jetbrains.kotlin.psi.KtDeclaration; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import java.util.List; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class KotlinStubsTest extends LightCodeInsightFixtureTestCase { @NotNull @Override diff --git a/idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt b/idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt index d480aade63b..cfa0911f2d9 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt @@ -13,7 +13,10 @@ import org.intellij.lang.regexp.RegExpLanguage import org.intellij.plugins.intelliLang.Configuration import org.intellij.plugins.intelliLang.inject.config.BaseInjection import org.intellij.plugins.intelliLang.inject.config.InjectionPlace +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinInjectionTest : AbstractInjectionTest() { fun testInjectionOnJavaPredefinedMethodWithAnnotation() = doInjectionPresentTest( """ diff --git a/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt b/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt index fb8e9597573..24669b9a0da 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt @@ -11,8 +11,11 @@ import org.intellij.lang.annotations.Language import org.intellij.lang.regexp.RegExpLanguage import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinLibInjectionTest : AbstractInjectionTest() { override fun setUp() { super.setUp() diff --git a/idea/tests/org/jetbrains/kotlin/psi/KotlinStdlibInjectionTest.kt b/idea/tests/org/jetbrains/kotlin/psi/KotlinStdlibInjectionTest.kt index da56a77d72f..ec05b8cc194 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/KotlinStdlibInjectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/KotlinStdlibInjectionTest.kt @@ -8,7 +8,10 @@ package org.jetbrains.kotlin.psi import org.intellij.lang.annotations.Language import org.intellij.lang.regexp.RegExpLanguage import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class KotlinStdlibInjectionTest : AbstractInjectionTest() { fun testOnRegex0() = assertInjectionPresent( """ diff --git a/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt index 2cd1b3fbe9c..30381411d48 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt @@ -11,7 +11,10 @@ import com.intellij.testFramework.LoggedErrorProcessor import org.apache.log4j.Logger import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class StringTemplateExpressionManipulatorTest : KotlinLightCodeInsightFixtureTestCase() { fun testSingleQuoted() { doTestContentChange("\"a\"", "b", "\"b\"") diff --git a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt index 5d223023f67..b5727970f80 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt @@ -9,10 +9,13 @@ import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtStringTemplateExpression import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestWithEnvironment import org.jetbrains.kotlin.utils.keysToMap +import org.junit.runner.RunWith import java.util.* +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class StringInjectionHostTest : KotlinTestWithEnvironment() { fun testRegular() { with (quoted("")) { diff --git a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInterpolationInjectionTest.kt b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInterpolationInjectionTest.kt index 960c66048b8..735e0e10ec9 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInterpolationInjectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInterpolationInjectionTest.kt @@ -15,7 +15,10 @@ import junit.framework.TestCase import org.intellij.plugins.intelliLang.inject.InjectLanguageAction import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class StringInterpolationInjectionTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/tests/org/jetbrains/kotlin/search/DefinitionsSearchTest.kt b/idea/tests/org/jetbrains/kotlin/search/DefinitionsSearchTest.kt index cde442edab8..6c6cde1d664 100644 --- a/idea/tests/org/jetbrains/kotlin/search/DefinitionsSearchTest.kt +++ b/idea/tests/org/jetbrains/kotlin/search/DefinitionsSearchTest.kt @@ -10,8 +10,11 @@ import com.intellij.psi.search.searches.DefinitionsScopedSearch import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.InTextDirectivesUtils +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.junit.runner.RunWith import java.io.File +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class DefinitionsSearchTest : AbstractSearcherTest() { fun testNestedClass() { doTest() diff --git a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java index 9e5ac386882..70db6790d5a 100644 --- a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java @@ -14,11 +14,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; +import org.junit.runner.RunWith; import java.io.File; import java.io.IOException; import java.util.List; +@RunWith(JUnit3WithIdeaConfigurationRunner.class) public class JUnitMembersSearcherTest extends AbstractSearcherTest { private static final LightProjectDescriptor junitProjectDescriptor = new KotlinJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.12.jar")); diff --git a/idea/tests/org/jetbrains/kotlin/test/CompatibilityVerifierVersionComparisonTest.kt b/idea/tests/org/jetbrains/kotlin/test/CompatibilityVerifierVersionComparisonTest.kt index c855bc2e1d6..c6a40a1050e 100644 --- a/idea/tests/org/jetbrains/kotlin/test/CompatibilityVerifierVersionComparisonTest.kt +++ b/idea/tests/org/jetbrains/kotlin/test/CompatibilityVerifierVersionComparisonTest.kt @@ -8,7 +8,9 @@ package org.jetbrains.kotlin.test import com.intellij.testFramework.LightPlatformTestCase import org.jetbrains.kotlin.idea.KotlinPluginVersion import org.jetbrains.kotlin.idea.PlatformVersion +import org.junit.runner.RunWith +@RunWith(JUnit3WithIdeaConfigurationRunner::class) class CompatibilityVerifierVersionComparisonTest : LightPlatformTestCase() { fun testKotlinVersionParsing() { val version = KotlinPluginVersion.parse("1.2.40-dev-193-Studio3.0-1")