From 73aa21aab6097d1a4aaef2ab85e6ad5a9b1093bb Mon Sep 17 00:00:00 2001 From: Yunir Salimzyanov Date: Fri, 14 Aug 2020 14:27:20 +0300 Subject: [PATCH] Refactor and fix files previously affected by as36 patchset (KTI-315) --- .bunch | 4 +- .../api/fir/AbstractResolveCallTest.kt | 6 +-- .../kotlin/idea/test/compatTestWrappers.kt | 37 ------------------- .../idea/test/compatTestWrappers.kt.as40 | 37 ------------------- .../idea/highlighter/markers/dslStyleIcon.kt | 3 +- .../highlighter/markers/dslStyleIcon.kt.as40 | 3 +- .../highlighter/markers/dslStyleIcon.kt.as41 | 3 +- .../kotlin/idea/testResourceBundle.kt | 3 +- .../formatter/AbstractFormatterTest.java | 7 ++-- .../idea/AbstractExpressionSelectionTest.kt | 4 +- .../kotlin/idea/AbstractSmartSelectionTest.kt | 4 +- .../kotlin/idea/actions/QualifiedNamesTest.kt | 16 ++++---- .../moveUpDown/AbstractCodeMoverTest.kt | 10 ++--- .../AbstractSurroundWithTest.java | 4 +- .../unwrap/AbstractUnwrapRemoveTest.java | 4 +- ...actConfigureProjectByChangingFileTest.java | 4 +- .../idea/editor/KotlinCommenterTest.java | 8 ++-- .../kotlin/idea/editor/TypedHandlerTest.kt | 20 +++++----- .../AbstractBackspaceHandlerTest.kt | 4 +- .../ui/LoadVersionsFromMavenTest.java | 4 +- .../declarations/AbstractJoinLinesTest.java | 4 +- .../kotlin/idea/kdoc/KdocRenameTest.java | 6 +-- .../AbstractKotlinGotoImplementationTest.kt | 10 ++--- .../rename/SimpleNameReferenceRenameTest.java | 6 +-- 24 files changed, 69 insertions(+), 142 deletions(-) delete mode 100644 idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt delete mode 100644 idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.as40 diff --git a/.bunch b/.bunch index db065cec00e..8a7d10d01ed 100644 --- a/.bunch +++ b/.bunch @@ -3,7 +3,5 @@ 203_202 193 192_193 -as36_192_193 as40_193 -as41 -as42_as41 \ No newline at end of file +as41as42_as41 \ No newline at end of file diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt index 37f4de51392..400a1562bb6 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt @@ -8,15 +8,15 @@ package org.jetbrains.kotlin.idea.frontend.api.fir import com.intellij.openapi.editor.CaretState import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement +import com.intellij.testFramework.LightCodeInsightTestCase import org.jetbrains.kotlin.idea.addExternalTestFiles import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.CallInfo import org.jetbrains.kotlin.idea.frontend.api.analyze -import org.jetbrains.kotlin.idea.frontend.api.types.KtType import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionLikeSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtParameterSymbol -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase +import org.jetbrains.kotlin.idea.frontend.api.types.KtType import org.jetbrains.kotlin.psi.KtBinaryExpression import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtFile @@ -29,7 +29,7 @@ import kotlin.reflect.full.primaryConstructor import kotlin.reflect.jvm.javaGetter -abstract class AbstractResolveCallTest : @Suppress("DEPRECATION") KotlinLightCodeInsightTestCase() { +abstract class AbstractResolveCallTest : @Suppress("DEPRECATION") LightCodeInsightTestCase() { override fun getTestDataPath(): String = KotlinTestUtils.getHomeDirectory() + "/" protected fun doTest(path: String) { diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt deleted file mode 100644 index 53ee7ec9e13..00000000000 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -@file:Suppress("unused", "IncompatibleAPI", "PropertyName") - -package org.jetbrains.kotlin.idea.test - -import com.intellij.openapi.actionSystem.DataContext -import com.intellij.openapi.editor.Document -import com.intellij.openapi.editor.Editor -import com.intellij.openapi.module.Module -import com.intellij.openapi.project.Project -import com.intellij.psi.PsiFile -import com.intellij.testFramework.LightIdeaTestCase - -// FIX ME WHEN BUNCH as36 REMOVED -@Suppress("DEPRECATION") -@Deprecated("Use KotlinLightCodeInsightFixtureTestCase instead") -abstract class KotlinLightCodeInsightTestCase : com.intellij.testFramework.LightCodeInsightTestCase() { - protected inline val project_: Project get() = project - protected inline val module_: Module get() = module - protected inline val editor_: Editor get() = editor - protected inline val file_: PsiFile get() = file - protected inline val currentEditorDataContext_: DataContext get() = currentEditorDataContext - - protected fun configureFromFileText_(fileName: String, fileText: String): Document { - return configureFromFileText(fileName, fileText, false) - } -} - -// FIX ME WHEN BUNCH as36 REMOVED -abstract class KotlinLightIdeaTestCase : LightIdeaTestCase() { - protected inline val project_: Project get() = project - protected inline val module_: Module get() = module -} \ No newline at end of file diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.as40 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.as40 deleted file mode 100644 index 53ee7ec9e13..00000000000 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.as40 +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -@file:Suppress("unused", "IncompatibleAPI", "PropertyName") - -package org.jetbrains.kotlin.idea.test - -import com.intellij.openapi.actionSystem.DataContext -import com.intellij.openapi.editor.Document -import com.intellij.openapi.editor.Editor -import com.intellij.openapi.module.Module -import com.intellij.openapi.project.Project -import com.intellij.psi.PsiFile -import com.intellij.testFramework.LightIdeaTestCase - -// FIX ME WHEN BUNCH as36 REMOVED -@Suppress("DEPRECATION") -@Deprecated("Use KotlinLightCodeInsightFixtureTestCase instead") -abstract class KotlinLightCodeInsightTestCase : com.intellij.testFramework.LightCodeInsightTestCase() { - protected inline val project_: Project get() = project - protected inline val module_: Module get() = module - protected inline val editor_: Editor get() = editor - protected inline val file_: PsiFile get() = file - protected inline val currentEditorDataContext_: DataContext get() = currentEditorDataContext - - protected fun configureFromFileText_(fileName: String, fileText: String): Document { - return configureFromFileText(fileName, fileText, false) - } -} - -// FIX ME WHEN BUNCH as36 REMOVED -abstract class KotlinLightIdeaTestCase : LightIdeaTestCase() { - protected inline val project_: Project get() = project - protected inline val module_: Module get() = module -} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt index 160456e9a52..324c8d2ad84 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt @@ -14,7 +14,8 @@ import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension import javax.swing.Icon -// FIX ME WHEN BUNCH as36 REMOVED +// FIX ME WHEN BUNCH as40 REMOVED +// FIX ME WHEN BUNCH as41 REMOVED internal fun createDslStyleIcon(styleId: Int): Icon { val globalScheme = EditorColorsManager.getInstance().globalScheme val markersColor = globalScheme.getAttributes(DslHighlighterExtension.styleById(styleId)).foregroundColor diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 index 9743a86c33e..4b7930ccf65 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 @@ -8,7 +8,8 @@ package org.jetbrains.kotlin.idea.highlighter.markers import com.intellij.icons.AllIcons import javax.swing.Icon -// FIX ME WHEN BUNCH as36 REMOVED +// FIX ME WHEN BUNCH as40 REMOVED +// FIX ME WHEN BUNCH as41 REMOVED internal fun createDslStyleIcon(styleId: Int): Icon { return AllIcons.Gutter.Colors } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 index 9743a86c33e..4b7930ccf65 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 @@ -8,7 +8,8 @@ package org.jetbrains.kotlin.idea.highlighter.markers import com.intellij.icons.AllIcons import javax.swing.Icon -// FIX ME WHEN BUNCH as36 REMOVED +// FIX ME WHEN BUNCH as40 REMOVED +// FIX ME WHEN BUNCH as41 REMOVED internal fun createDslStyleIcon(styleId: Int): Icon { return AllIcons.Gutter.Colors } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt b/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt index 2bd403c7eae..f5cc9057ee3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt +++ b/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea // Remove the function, when there's no dependency to cidr during running Kotlin tests. -// FIX ME WHEN BUNCH as36 REMOVED +// FIX ME WHEN BUNCH as40 REMOVED +// FIX ME WHEN BUNCH as41 REMOVED fun registerAdditionalResourceBundleInTests() { } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/formatter/AbstractFormatterTest.java b/idea/tests/org/jetbrains/kotlin/formatter/AbstractFormatterTest.java index 435806ab32c..59a5368c9b1 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/AbstractFormatterTest.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/AbstractFormatterTest.java @@ -14,18 +14,17 @@ import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.registry.Registry; -import com.intellij.openapi.util.registry.RegistryValue; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.CodeStyleSettings; +import com.intellij.testFramework.LightIdeaTestCase; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.KotlinLanguage; import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings; -import org.jetbrains.kotlin.idea.test.KotlinLightIdeaTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -37,7 +36,7 @@ import java.util.Map; // Based on from com.intellij.psi.formatter.java.AbstractJavaFormatterTest @SuppressWarnings("UnusedDeclaration") -public abstract class AbstractFormatterTest extends KotlinLightIdeaTestCase { +public abstract class AbstractFormatterTest extends LightIdeaTestCase { protected enum Action {REFORMAT, INDENT} @@ -137,7 +136,7 @@ public abstract class AbstractFormatterTest extends KotlinLightIdeaTestCase { String testFileExtension = expectedFileNameWithExtension.substring(expectedFileNameWithExtension.lastIndexOf(".")); String originalFileText = FileUtil.loadFile(new File(testFileName + testFileExtension), true); - CodeStyleSettings codeStyleSettings = CodeStyle.getSettings(getProject_()); + CodeStyleSettings codeStyleSettings = CodeStyle.getSettings(getProject()); KotlinCodeStyleSettings customSettings = codeStyleSettings.getCustomSettings(KotlinCodeStyleSettings.class); try { Integer rightMargin = InTextDirectivesUtils.getPrefixedInt(originalFileText, "// RIGHT_MARGIN: "); diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.kt index 38e5409d1ed..70ddc15e776 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.kt @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.idea +import com.intellij.testFramework.LightCodeInsightTestCase import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils import org.jetbrains.kotlin.idea.refactoring.IntroduceRefactoringException import org.jetbrains.kotlin.idea.refactoring.selectElement -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.KotlinTestUtils @Suppress("DEPRECATION") -abstract class AbstractExpressionSelectionTest : KotlinLightCodeInsightTestCase() { +abstract class AbstractExpressionSelectionTest : LightCodeInsightTestCase() { override fun getTestDataPath() = "" fun doTestExpressionSelection(path: String) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.kt index 2ffbc0021f2..1f072b4f616 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.kt @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.idea +import com.intellij.testFramework.LightCodeInsightTestCase import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils import org.jetbrains.kotlin.idea.refactoring.getExpressionShortText import org.jetbrains.kotlin.idea.refactoring.getSmartSelectSuggestions -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.KotlinTestUtils @Suppress("DEPRECATION") -abstract class AbstractSmartSelectionTest : KotlinLightCodeInsightTestCase() { +abstract class AbstractSmartSelectionTest : LightCodeInsightTestCase() { fun doTestSmartSelection(path: String) { configureByFile(path) diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt index 5c68ed20781..ce24489abe6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.actions import com.intellij.ide.actions.CopyReferenceAction import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase +import com.intellij.testFramework.LightCodeInsightTestCase import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtVisitorVoid import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner @@ -16,9 +16,9 @@ import java.util.* @Suppress("DEPRECATION") @RunWith(JUnit3WithIdeaConfigurationRunner::class) -class QualifiedNamesTest : KotlinLightCodeInsightTestCase() { +class QualifiedNamesTest : LightCodeInsightTestCase() { fun testClassRef() { - configureFromFileText_( + configureFromFileText( "class.kt", """ package foo.bar @@ -35,7 +35,8 @@ class QualifiedNamesTest : KotlinLightCodeInsightTestCase() { val anonymous = object { } - """ + """, + false ) assertEquals( listOf( @@ -51,7 +52,7 @@ class QualifiedNamesTest : KotlinLightCodeInsightTestCase() { } fun testFunRef() { - configureFromFileText_( + configureFromFileText( "fun.kt", """ package foo.bar @@ -66,7 +67,8 @@ class QualifiedNamesTest : KotlinLightCodeInsightTestCase() { fun topLevelFun() val topLevelVal = ":)" - """ + """, + false ) assertEquals( listOf( @@ -82,7 +84,7 @@ class QualifiedNamesTest : KotlinLightCodeInsightTestCase() { private fun getQualifiedNamesForDeclarations(): List { val result = ArrayList() - file_.accept(object : KtVisitorVoid() { + file.accept(object : KtVisitorVoid() { override fun visitElement(element: PsiElement) { element.acceptChildren(this) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt index d07c6c39598..9d79af3d7f4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt @@ -5,25 +5,23 @@ package org.jetbrains.kotlin.idea.codeInsight.moveUpDown -import com.intellij.application.options.CodeStyle import com.intellij.codeInsight.editorActions.moveLeftRight.MoveElementLeftAction import com.intellij.codeInsight.editorActions.moveLeftRight.MoveElementRightAction import com.intellij.codeInsight.editorActions.moveUpDown.LineMover import com.intellij.codeInsight.editorActions.moveUpDown.MoveStatementDownAction import com.intellij.codeInsight.editorActions.moveUpDown.MoveStatementUpAction import com.intellij.codeInsight.editorActions.moveUpDown.StatementUpDownMover -import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.editor.actionSystem.EditorAction import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.util.io.FileUtil +import com.intellij.testFramework.LightCodeInsightTestCase import junit.framework.ComparisonFailure import junit.framework.TestCase import org.jetbrains.kotlin.formatter.FormatSettingsUtil import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover import org.jetbrains.kotlin.idea.formatter.kotlinCustomSettings -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase import org.jetbrains.kotlin.idea.test.configureCodeStyleAndRun import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils @@ -67,7 +65,7 @@ abstract class AbstractMoveLeftRightTest : AbstractCodeMoverTest() { } @Suppress("DEPRECATION") -abstract class AbstractCodeMoverTest : KotlinLightCodeInsightTestCase() { +abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() { protected fun doTest( path: String, trailingComma: Boolean = false, @@ -103,8 +101,8 @@ abstract class AbstractCodeMoverTest : KotlinLightCodeInsightTestCase() { } private fun invokeAndCheck(path: String, action: EditorAction, isApplicableExpected: Boolean) { - val editor = editor_ - val dataContext = currentEditorDataContext_ + val editor = editor + val dataContext = currentEditorDataContext val before = editor.document.text runWriteAction { action.actionPerformed(editor, dataContext) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/AbstractSurroundWithTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/AbstractSurroundWithTest.java index af495527179..e9df6d56fc5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/AbstractSurroundWithTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/AbstractSurroundWithTest.java @@ -13,11 +13,11 @@ import com.intellij.openapi.editor.SelectionModel; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiElement; import com.intellij.rt.execution.junit.FileComparisonFailure; +import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.codeInsight.surroundWith.expression.*; import org.jetbrains.kotlin.idea.codeInsight.surroundWith.statement.*; -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -25,7 +25,7 @@ import java.io.File; import java.util.List; @SuppressWarnings("deprecation") -public abstract class AbstractSurroundWithTest extends KotlinLightCodeInsightTestCase { +public abstract class AbstractSurroundWithTest extends LightCodeInsightTestCase { public void doTestWithIfSurrounder(String path) throws Exception { doTest(path, new KotlinIfSurrounder()); diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/AbstractUnwrapRemoveTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/AbstractUnwrapRemoveTest.java index 783d8283e0e..a00714078dd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/AbstractUnwrapRemoveTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/AbstractUnwrapRemoveTest.java @@ -11,16 +11,16 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiElement; +import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; import java.util.List; @SuppressWarnings("deprecation") -public abstract class AbstractUnwrapRemoveTest extends KotlinLightCodeInsightTestCase { +public abstract class AbstractUnwrapRemoveTest extends LightCodeInsightTestCase { public void doTestExpressionRemover(@NotNull String path) throws Exception { doTest(path, KotlinUnwrappers.KotlinExpressionRemover.class); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java index e08f4df64dd..7ab7bd1b6eb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java @@ -16,11 +16,11 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiJavaModule; import com.intellij.psi.search.FilenameIndex; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.plugins.groovy.GroovyFileType; @@ -31,7 +31,7 @@ import java.util.Objects; @SuppressWarnings("deprecation") public abstract class AbstractConfigureProjectByChangingFileTest - extends KotlinLightCodeInsightTestCase { + extends LightCodeInsightTestCase { private static final String DEFAULT_VERSION = "default_version"; private PsiFile moduleInfoFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java index 11bbd851bd1..61b1d0478f9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java @@ -9,8 +9,8 @@ import com.intellij.application.options.CodeStyle; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.testFramework.EditorTestUtil; +import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.kotlin.formatter.FormatSettingsUtil; -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -21,7 +21,7 @@ import java.io.File; @SuppressWarnings("deprecation") @RunWith(JUnit3WithIdeaConfigurationRunner.class) -public class KotlinCommenterTest extends KotlinLightCodeInsightTestCase { +public class KotlinCommenterTest extends LightCodeInsightTestCase { private static final String BASE_PATH = new File(PluginTestCaseBase.getTestDataPathBase(), "/editor/commenter/").getAbsolutePath(); @@ -54,9 +54,9 @@ public class KotlinCommenterTest extends KotlinLightCodeInsightTestCase { private void doLineCommentTest() throws Exception { configure(); - CodeStyleSettings codeStyleSettings = CodeStyle.getSettings(getProject_()); + CodeStyleSettings codeStyleSettings = CodeStyle.getSettings(getProject()); try { - String text = getFile_().getText(); + String text = getFile().getText(); SettingsConfigurator configurator = FormatSettingsUtil.createConfigurator(text, codeStyleSettings); configurator.configureSettings(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/TypedHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/TypedHandlerTest.kt index cbe0b6ae4c0..03d7d02dfcf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/TypedHandlerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/TypedHandlerTest.kt @@ -10,17 +10,17 @@ package org.jetbrains.kotlin.idea.editor import com.intellij.application.options.CodeStyle import com.intellij.psi.codeStyle.CodeStyleSettings import com.intellij.testFramework.EditorTestUtil +import com.intellij.testFramework.LightCodeInsightTestCase import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle import org.jetbrains.kotlin.idea.formatter.ktCodeStyleSettings -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.runner.RunWith @Suppress("DEPRECATION") @RunWith(JUnit3WithIdeaConfigurationRunner::class) -class TypedHandlerTest : KotlinLightCodeInsightTestCase() { +class TypedHandlerTest : LightCodeInsightTestCase() { private val dollar = '$' fun testTypeStringTemplateStart() = doTypeTest( @@ -1089,8 +1089,8 @@ class TypedHandlerTest : KotlinLightCodeInsightTestCase() { fun testMoveThroughGT() { configureFromFileText("a.kt", "val a: List>>") - EditorTestUtil.performTypingAction(editor_, '>') - EditorTestUtil.performTypingAction(editor_, '>') + EditorTestUtil.performTypingAction(editor, '>') + EditorTestUtil.performTypingAction(editor, '>') checkResultByText("val a: List>") } @@ -1099,7 +1099,7 @@ class TypedHandlerTest : KotlinLightCodeInsightTestCase() { } private fun enableSmartEnterWithTabs(): () -> Unit = { - val indentOptions = CodeStyle.getSettings(project_).getIndentOptions(KotlinFileType.INSTANCE) + val indentOptions = CodeStyle.getSettings(project).getIndentOptions(KotlinFileType.INSTANCE) indentOptions.USE_TAB_CHARACTER = true indentOptions.SMART_TABS = true } @@ -1116,12 +1116,12 @@ class TypedHandlerTest : KotlinLightCodeInsightTestCase() { configureFromFileText("a.kt", beforeText.trimMargin()) for (ch in text) { - EditorTestUtil.performTypingAction(editor_, ch) + EditorTestUtil.performTypingAction(editor, ch) } checkResultByText(afterText.trimMargin()) } finally { if (settingsModifier != null) { - CodeStyle.getSettings(project_).clearCodeStyleSettings() + CodeStyle.getSettings(project).clearCodeStyleSettings() } } } @@ -1145,10 +1145,10 @@ class TypedHandlerTest : KotlinLightCodeInsightTestCase() { private fun doLtGtTest(initText: String, shouldCloseBeInsert: Boolean) { configureFromFileText("a.kt", initText) - EditorTestUtil.performTypingAction(editor_, '<') + EditorTestUtil.performTypingAction(editor, '<') checkResultByText(if (shouldCloseBeInsert) initText.replace("", "<>") else initText.replace("", "<")) - EditorTestUtil.performTypingAction(editor_, EditorTestUtil.BACKSPACE_FAKE_CHAR) + EditorTestUtil.performTypingAction(editor, EditorTestUtil.BACKSPACE_FAKE_CHAR) checkResultByText(initText) } @@ -1157,7 +1157,7 @@ class TypedHandlerTest : KotlinLightCodeInsightTestCase() { } private val enableKotlinOfficialCodeStyle: () -> Unit = { - val settings = ktCodeStyleSettings(project_)?.all ?: error("No Settings") + val settings = ktCodeStyleSettings(project)?.all ?: error("No Settings") KotlinStyleGuideCodeStyle.apply(settings) } } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/backspaceHandler/AbstractBackspaceHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/backspaceHandler/AbstractBackspaceHandlerTest.kt index 385e4ddc643..b08b52f2d0a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/backspaceHandler/AbstractBackspaceHandlerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/backspaceHandler/AbstractBackspaceHandlerTest.kt @@ -8,11 +8,11 @@ package org.jetbrains.kotlin.idea.editor.backspaceHandler import com.intellij.openapi.actionSystem.IdeActions import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.EditorTestUtil -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase +import com.intellij.testFramework.LightCodeInsightTestCase import java.io.File @Suppress("DEPRECATION") -abstract class AbstractBackspaceHandlerTest : KotlinLightCodeInsightTestCase() { +abstract class AbstractBackspaceHandlerTest : LightCodeInsightTestCase() { fun doTest(path: String) { configureFromFileText("a.kt", loadFile(path)) EditorTestUtil.executeAction(getEditor(), IdeActions.ACTION_EDITOR_BACKSPACE) 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 967567a3e10..68b3731b5a9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.idea.framework.ui; +import com.intellij.testFramework.LightIdeaTestCase; import com.intellij.util.text.VersionComparatorUtil; -import org.jetbrains.kotlin.idea.test.KotlinLightIdeaTestCase; import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; import org.junit.runner.RunWith; import java.util.Collection; @RunWith(JUnit3WithIdeaConfigurationRunner.class) -public class LoadVersionsFromMavenTest extends KotlinLightIdeaTestCase { +public class LoadVersionsFromMavenTest extends LightIdeaTestCase { public void testDownload() throws Exception { Collection versions = ConfigureDialogWithModulesAndVersion.loadVersions("1.0.0"); assertTrue(versions.size() > 0); diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/AbstractJoinLinesTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/AbstractJoinLinesTest.java index 6d26d8806aa..04a6b81a99e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/AbstractJoinLinesTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/AbstractJoinLinesTest.java @@ -9,15 +9,15 @@ import com.intellij.codeInsight.editorActions.JoinLinesHandler; import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.rt.execution.junit.FileComparisonFailure; +import com.intellij.testFramework.LightCodeInsightTestCase; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase; import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; @SuppressWarnings("deprecation") -public abstract class AbstractJoinLinesTest extends KotlinLightCodeInsightTestCase { +public abstract class AbstractJoinLinesTest extends LightCodeInsightTestCase { public void doTest(@NotNull String path) throws Exception { configureByFile(path); new JoinLinesHandler(null).execute(getEditor(), getEditor().getCaretModel().getCurrentCaret(), diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java index 5c6a222481e..0a218b6d08c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocRenameTest.java @@ -8,16 +8,16 @@ package org.jetbrains.kotlin.idea.kdoc; import com.intellij.codeInsight.TargetElementUtil; import com.intellij.psi.PsiElement; import com.intellij.refactoring.rename.RenameProcessor; +import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.CompatKt; -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; import org.junit.runner.RunWith; @SuppressWarnings("deprecation") @RunWith(JUnit3WithIdeaConfigurationRunner.class) -public class KdocRenameTest extends KotlinLightCodeInsightTestCase { +public class KdocRenameTest extends LightCodeInsightTestCase { @NotNull @Override protected String getTestDataPath() { @@ -45,7 +45,7 @@ public class KdocRenameTest extends KotlinLightCodeInsightTestCase { private void doTest(String newName) { configureByFile(getTestName(false) + ".kt"); PsiElement element = TargetElementUtil - .findTargetElement(getEditor_(), + .findTargetElement(getEditor(), TargetElementUtil.ELEMENT_NAME_ACCEPTED | TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED); assertNotNull(element); new RenameProcessor(getProject(), element, newName, true, true).run(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt index bf93096b374..ec95a8f297e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt @@ -6,18 +6,18 @@ package org.jetbrains.kotlin.idea.navigation import com.intellij.openapi.projectRoots.Sdk -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase +import com.intellij.testFramework.LightCodeInsightTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.invalidateLibraryCache import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File @Suppress("DEPRECATION") -abstract class AbstractKotlinGotoImplementationTest : KotlinLightCodeInsightTestCase() { +abstract class AbstractKotlinGotoImplementationTest : LightCodeInsightTestCase() { override fun setUp() { super.setUp() - invalidateLibraryCache(project_) + invalidateLibraryCache(project) } override fun getTestDataPath(): String = KotlinTestUtils.getHomeDirectory() + File.separator @@ -26,7 +26,7 @@ abstract class AbstractKotlinGotoImplementationTest : KotlinLightCodeInsightTest protected fun doTest(path: String) { configureByFile(path) - val gotoData = NavigationTestUtils.invokeGotoImplementations(editor_, file_) - NavigationTestUtils.assertGotoDataMatching(editor_, gotoData) + val gotoData = NavigationTestUtils.invokeGotoImplementations(editor, file) + NavigationTestUtils.assertGotoDataMatching(editor, gotoData) } } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java index f429d1e828d..2bc8086085a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java @@ -8,12 +8,12 @@ package org.jetbrains.kotlin.idea.refactoring.rename; import com.intellij.codeInsight.TargetElementUtil; import com.intellij.psi.PsiElement; import com.intellij.refactoring.rename.RenameProcessor; +import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; @SuppressWarnings("deprecation") -public class SimpleNameReferenceRenameTest extends KotlinLightCodeInsightTestCase { +public class SimpleNameReferenceRenameTest extends LightCodeInsightTestCase { @NotNull @Override @@ -52,7 +52,7 @@ public class SimpleNameReferenceRenameTest extends KotlinLightCodeInsightTestCas private void doTest(String newName) throws Exception { configureByFile(getTestName(true) + ".kt"); PsiElement element = TargetElementUtil - .findTargetElement(getEditor_(), + .findTargetElement(getEditor(), TargetElementUtil.ELEMENT_NAME_ACCEPTED | TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED); assertNotNull(element); new RenameProcessor(getProject(), element, newName, true, true).run();