diff --git a/RegExpSupport/test/org/intellij/lang/regexp/RegExpWordSelectionFilterTest.java b/RegExpSupport/test/org/intellij/lang/regexp/RegExpWordSelectionFilterTest.java index e48bfb36f075..7d5d7c720063 100644 --- a/RegExpSupport/test/org/intellij/lang/regexp/RegExpWordSelectionFilterTest.java +++ b/RegExpSupport/test/org/intellij/lang/regexp/RegExpWordSelectionFilterTest.java @@ -19,13 +19,13 @@ import com.intellij.codeInsight.editorActions.SelectWordHandler; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.editor.Editor; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; /** * @author Bas Leijdekkers */ -public class RegExpWordSelectionFilterTest extends LightPlatformCodeInsightFixtureTestCase { +public class RegExpWordSelectionFilterTest extends BasePlatformTestCase { public void testSelectWordSkipChar() { doTest("graafmachine", diff --git a/RegExpSupport/test/org/intellij/lang/regexp/inspection/RegExpInspectionTestCase.java b/RegExpSupport/test/org/intellij/lang/regexp/inspection/RegExpInspectionTestCase.java index 1c90e1ea88e1..098fd428a5bc 100644 --- a/RegExpSupport/test/org/intellij/lang/regexp/inspection/RegExpInspectionTestCase.java +++ b/RegExpSupport/test/org/intellij/lang/regexp/inspection/RegExpInspectionTestCase.java @@ -7,7 +7,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.openapi.project.Project; import com.intellij.profile.codeInspection.ProjectInspectionProfileManager; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.lang.annotations.Language; import org.intellij.lang.regexp.RegExpFileType; import org.jetbrains.annotations.NotNull; @@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull; /** * @author Bas Leijdekkers */ -public abstract class RegExpInspectionTestCase extends LightPlatformCodeInsightFixtureTestCase { +public abstract class RegExpInspectionTestCase extends BasePlatformTestCase { @NotNull protected abstract LocalInspectionTool getInspection(); diff --git a/java/java-tests/testSrc/com/intellij/copyright/JavaCopyrightTest.kt b/java/java-tests/testSrc/com/intellij/copyright/JavaCopyrightTest.kt index 36aaf19cd93a..1417615a07f8 100644 --- a/java/java-tests/testSrc/com/intellij/copyright/JavaCopyrightTest.kt +++ b/java/java-tests/testSrc/com/intellij/copyright/JavaCopyrightTest.kt @@ -2,11 +2,11 @@ package com.intellij.copyright import com.intellij.ide.highlighter.JavaFileType -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import com.maddyhome.idea.copyright.CopyrightProfile import com.maddyhome.idea.copyright.psi.UpdateCopyrightFactory -class JavaCopyrightTest : LightPlatformCodeInsightFixtureTestCase() { +class JavaCopyrightTest : BasePlatformTestCase() { fun testMultipleCopyrightsInOneFile() { myFixture.configureByText(JavaFileType.INSTANCE, """ diff --git a/java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesProcessingTest.java b/java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesProcessingTest.java index f6504d2c4e01..80894c5de615 100644 --- a/java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesProcessingTest.java +++ b/java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesProcessingTest.java @@ -3,7 +3,7 @@ package com.intellij.ide.fileTemplates; import com.intellij.platform.templates.SaveProjectAsTemplateAction; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import gnu.trove.TIntObjectHashMap; import java.util.regex.Matcher; @@ -12,7 +12,7 @@ import java.util.regex.Pattern; /** * @author Dmitry Avdeev */ -public class FileTemplatesProcessingTest extends LightPlatformCodeInsightFixtureTestCase { +public class FileTemplatesProcessingTest extends BasePlatformTestCase { @Override protected void setUp() throws Exception { super.setUp(); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/CreateTBXReferenceTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/CreateTBXReferenceTest.kt index a973a0992ae0..32f893c68069 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/CreateTBXReferenceTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/CreateTBXReferenceTest.kt @@ -9,11 +9,11 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.LangDataKeys import com.intellij.openapi.actionSystem.impl.SimpleDataContext import com.intellij.openapi.ide.CopyPasteManager -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import junit.framework.TestCase import java.awt.datatransfer.DataFlavor -class CreateTBXReferenceTest : LightPlatformCodeInsightFixtureTestCase() { +class CreateTBXReferenceTest : BasePlatformTestCase() { override fun getTestDataPath(): String { return "${JavaTestUtil.getJavaTestDataPath()}/codeInsight/copyTBXReference/" } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaReformatOnTypingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaReformatOnTypingTest.java index 2aa58c6fa6dc..ffeab7c4673b 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaReformatOnTypingTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaReformatOnTypingTest.java @@ -8,9 +8,9 @@ import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.project.Project; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; -public class JavaReformatOnTypingTest extends LightPlatformCodeInsightFixtureTestCase { +public class JavaReformatOnTypingTest extends BasePlatformTestCase { @Override public void setUp() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java index 2d4e2a85ec8b..8a760fefa41f 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java @@ -7,7 +7,7 @@ import com.intellij.openapi.fileEditor.TextEditor; import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider; import com.intellij.psi.PsiDocumentManager; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -17,7 +17,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class JavaTypingTest extends LightPlatformCodeInsightFixtureTestCase { +public class JavaTypingTest extends BasePlatformTestCase { public void testIndentRBrace() { doTest('}'); doTestUndo(); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/ReformatCodeActionInEditorTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/ReformatCodeActionInEditorTest.java index d48edfe9e420..ad9069310dd6 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/ReformatCodeActionInEditorTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/ReformatCodeActionInEditorTest.java @@ -25,11 +25,11 @@ import com.intellij.formatting.fileSet.NamedScopeDescriptor; import com.intellij.openapi.editor.Document; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import static com.intellij.codeInsight.actions.TextRangeType.*; -public class ReformatCodeActionInEditorTest extends LightPlatformCodeInsightFixtureTestCase { +public class ReformatCodeActionInEditorTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/indentOptionsProvider/FileIndentProviderTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/indentOptionsProvider/FileIndentProviderTest.java index 5938592700a6..e6d06e0e4148 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/indentOptionsProvider/FileIndentProviderTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/indentOptionsProvider/FileIndentProviderTest.java @@ -11,7 +11,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.FileIndentOptionsProvider; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -20,7 +20,7 @@ import java.io.File; /** * @author Rustam Vishnyakov */ -public class FileIndentProviderTest extends LightPlatformCodeInsightFixtureTestCase { +public class FileIndentProviderTest extends BasePlatformTestCase { private final FileIndentOptionsProvider TEST_FILE_INDENT_OPTIONS_PROVIDER = new TestIndentOptionsProvider(); private CommonCodeStyleSettings.IndentOptions myTestIndentOptions; private boolean myUseOnFullReformat; diff --git a/java/java-tests/testSrc/com/intellij/java/find/EditorSearchTest.java b/java/java-tests/testSrc/com/intellij/java/find/EditorSearchTest.java index ff3543241981..e41f8bc04fec 100644 --- a/java/java-tests/testSrc/com/intellij/java/find/EditorSearchTest.java +++ b/java/java-tests/testSrc/com/intellij/java/find/EditorSearchTest.java @@ -18,12 +18,12 @@ package com.intellij.java.find; import com.intellij.find.EditorSearchSession; import com.intellij.ide.IdeEventQueue; import com.intellij.openapi.wm.IdeFocusManager; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import javax.swing.text.BadLocationException; import javax.swing.text.JTextComponent; -public class EditorSearchTest extends LightPlatformCodeInsightFixtureTestCase { +public class EditorSearchTest extends BasePlatformTestCase { private static final String THE_CODE = "public class A {\n" + " //First comment ABC, ABCD, abc\n" + " int ABC = 3;\n" + diff --git a/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/EmbeddedLiveTemplatesTest.java b/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/EmbeddedLiveTemplatesTest.java index ed035ce1e3b8..98e97afcea54 100644 --- a/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/EmbeddedLiveTemplatesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/ide/fileTemplates/EmbeddedLiveTemplatesTest.java @@ -10,12 +10,12 @@ import com.intellij.openapi.fileTypes.PlainTextFileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author Dmitry Avdeev */ -public class EmbeddedLiveTemplatesTest extends LightPlatformCodeInsightFixtureTestCase { +public class EmbeddedLiveTemplatesTest extends BasePlatformTestCase { public void testCreateFromTemplateAction() { diff --git a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java index ba14779ceceb..482590e03a22 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java @@ -22,11 +22,11 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.DetectableIndentOptionsProvider; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; -public class DetectIndentAndTypeTest extends LightPlatformCodeInsightFixtureTestCase { +public class DetectIndentAndTypeTest extends BasePlatformTestCase { private CodeStyleSettings mySettings; private static final String myText = "public class T {\n" + diff --git a/java/java-tests/testSrc/com/intellij/java/psi/impl/file/impl/TempFileSystemTest.java b/java/java-tests/testSrc/com/intellij/java/psi/impl/file/impl/TempFileSystemTest.java index 065706f60022..babd81802f4c 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/impl/file/impl/TempFileSystemTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/impl/file/impl/TempFileSystemTest.java @@ -23,9 +23,9 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.testFramework.PlatformTestCase; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; -public class TempFileSystemTest extends LightPlatformCodeInsightFixtureTestCase { +public class TempFileSystemTest extends BasePlatformTestCase { public void testMove() { ProjectRootManager rootManager = ProjectRootManager.getInstance(getProject()); VirtualFile sourceRoot = rootManager.getContentSourceRoots()[0]; diff --git a/java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaBinaryPlusExpressionIndexTest.kt b/java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaBinaryPlusExpressionIndexTest.kt index 3ef291b99eef..e5f28e53ed16 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaBinaryPlusExpressionIndexTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaBinaryPlusExpressionIndexTest.kt @@ -3,12 +3,12 @@ package com.intellij.java.psi.impl.search import com.intellij.openapi.fileTypes.StdFileTypes import com.intellij.psi.impl.java.JavaBinaryPlusExpressionIndex -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import com.intellij.util.indexing.FileContentImpl import com.intellij.util.indexing.IndexingDataKeys import org.intellij.lang.annotations.Language -class JavaBinaryPlusExpressionIndexTest : LightPlatformCodeInsightFixtureTestCase() { +class JavaBinaryPlusExpressionIndexTest : BasePlatformTestCase() { fun testIndex() { @Language("JAVA") val file = myFixture.configureByText(StdFileTypes.JAVA, """ diff --git a/java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaNullMethodArgumentIndexTest.kt b/java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaNullMethodArgumentIndexTest.kt index 21889b892293..fd8868d5e688 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaNullMethodArgumentIndexTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/psi/impl/search/JavaNullMethodArgumentIndexTest.kt @@ -17,12 +17,11 @@ package com.intellij.java.psi.impl.search import com.intellij.openapi.fileTypes.StdFileTypes import com.intellij.psi.impl.search.JavaNullMethodArgumentIndex -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import com.intellij.util.indexing.FileContentImpl import com.intellij.util.indexing.IndexingDataKeys -import org.intellij.lang.annotations.Language -class JavaNullMethodArgumentIndexTest : LightPlatformCodeInsightFixtureTestCase() { +class JavaNullMethodArgumentIndexTest : BasePlatformTestCase() { fun testIndex() { val file = myFixture.configureByText(StdFileTypes.JAVA, """ diff --git a/java/java-tests/testSrc/com/intellij/projectView/NestedFilesInProjectViewTest.java b/java/java-tests/testSrc/com/intellij/projectView/NestedFilesInProjectViewTest.java index bd88ad806aa4..a49c0aa84cef 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/NestedFilesInProjectViewTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/NestedFilesInProjectViewTest.java @@ -7,14 +7,14 @@ import com.intellij.ide.projectView.impl.ProjectViewFileNestingService; import com.intellij.ide.projectView.impl.ProjectViewFileNestingService.NestingRule; import com.intellij.ide.projectView.impl.ProjectViewImpl; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class NestedFilesInProjectViewTest extends LightPlatformCodeInsightFixtureTestCase { +public class NestedFilesInProjectViewTest extends BasePlatformTestCase { private void doTest(@NotNull final String expected) { final ProjectViewImpl projectView = (ProjectViewImpl)ProjectView.getInstance(getProject()); diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java index 0f3d0a080017..2ea8fd45ac95 100644 --- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java @@ -1,9 +1,11 @@ // Copyright 2000-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 file. package com.intellij.codeInsight; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; + /** * @deprecated Use {@link JavaCodeInsightTestCase} for Java-dependent tests, - * {@link com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase} for non-Java-dependent + * {@link BasePlatformTestCase} for non-Java-dependent * tests */ @Deprecated diff --git a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java index e75a6f91975f..10381c7908f2 100644 --- a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java @@ -1,9 +1,11 @@ // Copyright 2000-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 file. package com.intellij.codeInsight.completion; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; + /** * @deprecated Use {@link JavaCompletionTestCase} for Java-dependent completion tests and - * {@link com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase} for non-Java-dependent + * {@link BasePlatformTestCase} for non-Java-dependent * completion tests */ @Deprecated diff --git a/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java b/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java index 63d6e15e57d6..2f60997f8026 100644 --- a/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java @@ -1,9 +1,11 @@ // Copyright 2000-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 file. package com.intellij.testFramework; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; + /** * @deprecated Use {@link JavaInspectionTestCase} for Java-dependent tests, - * {@link com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase} for non-Java-dependent tests + * {@link BasePlatformTestCase} for non-Java-dependent tests */ @Deprecated public abstract class InspectionTestCase extends JavaInspectionTestCase { diff --git a/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java b/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java index 942ebb42c669..49eaada363b4 100644 --- a/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java @@ -1,9 +1,11 @@ // Copyright 2000-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 file. package com.intellij.testFramework; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; + /** * @deprecated Use {@link JavaModuleTestCase} for Java-dependent tests, - * {@link com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase} for non-Java-dependent tess + * {@link BasePlatformTestCase} for non-Java-dependent tess */ @Deprecated public abstract class ModuleTestCase extends JavaModuleTestCase { diff --git a/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java b/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java index 1f621fca3541..3c36a9083a01 100644 --- a/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java @@ -1,9 +1,11 @@ // Copyright 2000-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 file. package com.intellij.testFramework; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; + /** * @deprecated Use {@link JavaPsiTestCase} for Java-dependent tests, - * {@link com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase} for non-Java-dependent tests + * {@link BasePlatformTestCase} for non-Java-dependent tests */ public abstract class PsiTestCase extends JavaPsiTestCase { } diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java index fc852194de4e..b5d773902c03 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java @@ -3,7 +3,7 @@ package com.intellij.testFramework.fixtures; /** * @deprecated Use {@link LightJavaCodeInsightFixtureTestCase} for Java-dependent tests, - * {@link LightPlatformCodeInsightFixtureTestCase} for non-Java dependent tests + * {@link BasePlatformTestCase} for non-Java dependent tests */ public abstract class LightCodeInsightFixtureTestCase extends LightJavaCodeInsightFixtureTestCase { } diff --git a/java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java b/java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java index ed5ca3c9cf00..df694eb5ef8a 100644 --- a/java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java +++ b/java/testFramework/src/com/siyeh/ig/LightInspectionTestCase.java @@ -1,9 +1,11 @@ // Copyright 2000-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 file. package com.siyeh.ig; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; + /** * @deprecated Use {@link LightJavaInspectionTestCase} for Java-dependent tests, - * {@link com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase} for non-Java-dependent tests + * {@link BasePlatformTestCase} for non-Java-dependent tests */ @Deprecated public abstract class LightInspectionTestCase extends LightJavaInspectionTestCase { diff --git a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPatternComparatorTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPatternComparatorTest.java index 8380e235c12b..383b88064720 100644 --- a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPatternComparatorTest.java +++ b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPatternComparatorTest.java @@ -15,7 +15,7 @@ */ package com.jetbrains.jsonSchema; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.ThreeState; import com.jetbrains.jsonSchema.settings.mappings.JsonSchemaPatternComparator; import org.jetbrains.annotations.NotNull; @@ -24,7 +24,7 @@ import org.junit.Assert; /** * @author Irina.Chernushina on 2/17/2016. */ -public class JsonSchemaPatternComparatorTest extends LightPlatformCodeInsightFixtureTestCase { +public class JsonSchemaPatternComparatorTest extends BasePlatformTestCase { public void testPatterns() { final JsonSchemaPatternComparator comparator = new JsonSchemaPatternComparator(getProject()); Assert.assertEquals(ThreeState.YES, comparator.isSimilar(p("test"), p("test"))); diff --git a/platform/lang-impl/testSources/com/intellij/codeInsight/hints/InlayPassTest.kt b/platform/lang-impl/testSources/com/intellij/codeInsight/hints/InlayPassTest.kt index 9b0e2bd70f85..713f6b901069 100644 --- a/platform/lang-impl/testSources/com/intellij/codeInsight/hints/InlayPassTest.kt +++ b/platform/lang-impl/testSources/com/intellij/codeInsight/hints/InlayPassTest.kt @@ -4,9 +4,9 @@ package com.intellij.codeInsight.hints import com.intellij.codeInsight.hints.presentation.SpacePresentation import com.intellij.openapi.editor.EditorCustomElementRenderer import com.intellij.openapi.editor.Inlay -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class InlayPassTest : LightPlatformCodeInsightFixtureTestCase() { +class InlayPassTest : BasePlatformTestCase() { private val noSettings = SettingsKey("no") fun testBlockAndInlineElementMayBeAtSameOffset() { diff --git a/platform/lang-impl/testSources/com/intellij/codeInsight/hints/PresentationTest.kt b/platform/lang-impl/testSources/com/intellij/codeInsight/hints/PresentationTest.kt index a1dc23f95674..33fd60c32e2a 100644 --- a/platform/lang-impl/testSources/com/intellij/codeInsight/hints/PresentationTest.kt +++ b/platform/lang-impl/testSources/com/intellij/codeInsight/hints/PresentationTest.kt @@ -3,7 +3,7 @@ package com.intellij.codeInsight.hints import com.intellij.codeInsight.hints.presentation.* import com.intellij.openapi.editor.impl.EditorImpl -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import junit.framework.TestCase import java.awt.Point import java.awt.event.MouseEvent @@ -119,7 +119,7 @@ class PresentationTest : TestCase() { } } -class HeavyPresentationTest : LightPlatformCodeInsightFixtureTestCase() { +class HeavyPresentationTest : BasePlatformTestCase() { override fun setUp() { super.setUp() myFixture.configureByText("__Dummy__.java", "class A {}") diff --git a/platform/lang-impl/testSources/com/intellij/codeInspection/LongLineInspectionTest.java b/platform/lang-impl/testSources/com/intellij/codeInspection/LongLineInspectionTest.java index 464022ddf6f6..71e2e8bcef88 100644 --- a/platform/lang-impl/testSources/com/intellij/codeInspection/LongLineInspectionTest.java +++ b/platform/lang-impl/testSources/com/intellij/codeInspection/LongLineInspectionTest.java @@ -17,14 +17,14 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.longLine.LongLineInspection; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.io.File; /** * @author Dmitry Batkovich */ -public class LongLineInspectionTest extends LightPlatformCodeInsightFixtureTestCase { +public class LongLineInspectionTest extends BasePlatformTestCase { public void testShortLine() { doTest("java"); diff --git a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java index b102af67cd35..b544abf759ea 100644 --- a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java +++ b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java @@ -6,7 +6,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.util.ProgressIndicatorUtils; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.Alarm; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; /** * @author mikhail.sokolov */ -public class MultiThreadSearchDeadlockTest extends LightPlatformCodeInsightFixtureTestCase { +public class MultiThreadSearchDeadlockTest extends BasePlatformTestCase { private static final Collection ourEqualityProviders = Collections.singleton(new TrivialElementsEqualityProvider()); diff --git a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java index a37e004c1a44..9da698dc50c7 100644 --- a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java +++ b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java @@ -3,7 +3,7 @@ package com.intellij.ide.actions.searcheverywhere; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.Pair; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.Alarm; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * @author mikhail.sokolov */ -public class MultiThreadSearchTest extends LightPlatformCodeInsightFixtureTestCase { +public class MultiThreadSearchTest extends BasePlatformTestCase { private static final String MORE_ITEM = "...MORE"; private static final Collection ourEqualityProviders = Collections.singleton(new TrivialElementsEqualityProvider()); diff --git a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java index 84406607185b..59677edda5ad 100644 --- a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java +++ b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java @@ -2,7 +2,7 @@ package com.intellij.ide.actions.searcheverywhere; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,7 +15,7 @@ import java.util.UUID; import static com.intellij.ide.actions.searcheverywhere.SearchEverywhereUI.SearchListModel; -public class SearchModelTest extends LightPlatformCodeInsightFixtureTestCase { +public class SearchModelTest extends BasePlatformTestCase { private final static SearchEverywhereContributor STUB_CONTRIBUTOR_1 = createStubContributor(100); private final static SearchEverywhereContributor STUB_CONTRIBUTOR_2 = createStubContributor(200); diff --git a/platform/lang-impl/testSources/com/intellij/java/find/AbstractFindInEditorTest.java b/platform/lang-impl/testSources/com/intellij/java/find/AbstractFindInEditorTest.java index a94d009e73af..8b3c64c25b67 100644 --- a/platform/lang-impl/testSources/com/intellij/java/find/AbstractFindInEditorTest.java +++ b/platform/lang-impl/testSources/com/intellij/java/find/AbstractFindInEditorTest.java @@ -7,11 +7,11 @@ import com.intellij.ide.IdeEventQueue; import com.intellij.ide.impl.DataManagerImpl; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.editor.Editor; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import javax.swing.text.JTextComponent; -public abstract class AbstractFindInEditorTest extends LightPlatformCodeInsightFixtureTestCase { +public abstract class AbstractFindInEditorTest extends BasePlatformTestCase { protected void setTextToFind(String text) { EditorSearchSession editorSearchSession = getEditorSearchComponent(); assertNotNull(editorSearchSession); diff --git a/platform/platform-tests/testSrc/com/intellij/application/options/codeInsight/editor/quotes/SelectionQuotingTypedHandlerTest.java b/platform/platform-tests/testSrc/com/intellij/application/options/codeInsight/editor/quotes/SelectionQuotingTypedHandlerTest.java index 71da3e9b9813..669cfe4402ea 100644 --- a/platform/platform-tests/testSrc/com/intellij/application/options/codeInsight/editor/quotes/SelectionQuotingTypedHandlerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/application/options/codeInsight/editor/quotes/SelectionQuotingTypedHandlerTest.java @@ -23,13 +23,13 @@ import com.intellij.openapi.editor.actionSystem.TypedAction; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.project.Project; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; /** * @author oleg */ -public class SelectionQuotingTypedHandlerTest extends LightPlatformCodeInsightFixtureTestCase { +public class SelectionQuotingTypedHandlerTest extends BasePlatformTestCase { private boolean myPrevValue; diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLinesCounterTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLinesCounterTest.java index a224520b4071..e24d392a918f 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLinesCounterTest.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLinesCounterTest.java @@ -18,10 +18,10 @@ package com.intellij.codeInsight.actions; import com.intellij.openapi.editor.Document; import com.intellij.psi.PsiFile; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.junit.Assert; -public class ChangedLinesCounterTest extends LightPlatformCodeInsightFixtureTestCase { +public class ChangedLinesCounterTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { diff --git a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeSamplesCorrectnessTest.java b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeSamplesCorrectnessTest.java index 324247e9bfe4..e45f5576703e 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeSamplesCorrectnessTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeSamplesCorrectnessTest.java @@ -8,7 +8,7 @@ import com.intellij.psi.PsiErrorElement; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.junit.Assert; @@ -16,7 +16,7 @@ import java.util.*; import static com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider.SettingsType; -public class CodeSamplesCorrectnessTest extends LightPlatformCodeInsightFixtureTestCase { +public class CodeSamplesCorrectnessTest extends BasePlatformTestCase { private List myErrorReports; private SettingsType[] mySettingValues; diff --git a/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeWordSelectionTest.java b/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeWordSelectionTest.java index c2fa7e367826..a83c638263e5 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeWordSelectionTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeWordSelectionTest.java @@ -2,12 +2,12 @@ package com.intellij.ide.highlighter.custom; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author yole */ -public class CustomFileTypeWordSelectionTest extends LightPlatformCodeInsightFixtureTestCase { +public class CustomFileTypeWordSelectionTest extends BasePlatformTestCase { public void testCustomFileTypeBraces() { doTest(); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/BlockSelectionTest.groovy b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/BlockSelectionTest.groovy index 3eee08fcee9c..c80ff6604a0b 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/BlockSelectionTest.groovy +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/BlockSelectionTest.groovy @@ -17,13 +17,13 @@ package com.intellij.openapi.editor.actions import com.intellij.ide.ClipboardSynchronizer import com.intellij.openapi.actionSystem.IdeActions import com.intellij.openapi.editor.LogicalPosition -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import java.awt.datatransfer.StringSelection /** * @author peter */ -class BlockSelectionTest extends LightPlatformCodeInsightFixtureTestCase { +class BlockSelectionTest extends BasePlatformTestCase { void "test paste tabs into block selection"() { myFixture.configureByText "a.txt", """\ diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorCloneCaretAboveBelowTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorCloneCaretAboveBelowTest.java index 2d73640ff655..922b6af887d2 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorCloneCaretAboveBelowTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorCloneCaretAboveBelowTest.java @@ -16,9 +16,9 @@ package com.intellij.openapi.editor.actions; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; -public class EditorCloneCaretAboveBelowTest extends LightPlatformCodeInsightFixtureTestCase { +public class EditorCloneCaretAboveBelowTest extends BasePlatformTestCase { public void testStoringDesiredXPosition() { init("long line\n" + "line\n" + diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java index d236adb7a2b5..bc7e7e84b4a0 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java @@ -15,9 +15,9 @@ */ package com.intellij.openapi.editor.actions; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; -public class IndentSelectionActionTest extends LightPlatformCodeInsightFixtureTestCase { +public class IndentSelectionActionTest extends BasePlatformTestCase { public void testWithoutSelection() { verifyAction("some text", diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveToCaretStopTest.kt b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveToCaretStopTest.kt index 7c5578996c09..2d3517a57f0b 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveToCaretStopTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveToCaretStopTest.kt @@ -10,9 +10,9 @@ import com.intellij.openapi.editor.actions.MoveToCaretStopTest.Direction.BACKWAR import com.intellij.openapi.editor.actions.MoveToCaretStopTest.Direction.FORWARD import com.intellij.openapi.editor.ex.EditorSettingsExternalizable import com.intellij.openapi.util.Comparing -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class MoveToCaretStopTest : LightPlatformCodeInsightFixtureTestCase() { +class MoveToCaretStopTest : BasePlatformTestCase() { enum class Action { MOVE, DELETE } enum class Direction : Comparator { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/NextPrevWordTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/NextPrevWordTest.java index 4415b9da05f0..beec93da3b60 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/NextPrevWordTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/NextPrevWordTest.java @@ -6,12 +6,12 @@ import com.intellij.openapi.editor.FoldRegion; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx; import com.intellij.testFramework.EditorTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author peter */ -public class NextPrevWordTest extends LightPlatformCodeInsightFixtureTestCase { +public class NextPrevWordTest extends BasePlatformTestCase { public void testNextWordFromPreLastPosition() { myFixture.configureByText("a.txt", ">"); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java index 558fafa388f4..6f827d1238f3 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java @@ -22,14 +22,14 @@ import com.intellij.openapi.editor.*; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.project.Project; import com.intellij.testFramework.EditorTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.ui.LightweightHint; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.Arrays; -public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsightFixtureTestCase { +public class SelectUnselectOccurrenceActionsTest extends BasePlatformTestCase { private int hintCount; @Override diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java index e8c2a26ed1d3..0655ef3870ba 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java @@ -16,9 +16,9 @@ package com.intellij.openapi.editor.actions; import com.intellij.openapi.fileTypes.FileTypes; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; -public class ToggleColumnModeActionMultiCaretTest extends LightPlatformCodeInsightFixtureTestCase { +public class ToggleColumnModeActionMultiCaretTest extends BasePlatformTestCase { public void testSingleCaretWithoutSelection() { doTestToggleOnOff("line1\n" + "line2", diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java index d5ce60e79f97..0cda26cdf948 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.fileTypes.PlainTextFileType; import com.intellij.psi.PsiElement; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import java.awt.*; @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Dmitry Avdeev */ -public class DocumentMarkupModelTest extends LightPlatformCodeInsightFixtureTestCase { +public class DocumentMarkupModelTest extends BasePlatformTestCase { public void testInfoTestAttributes() { LanguageExtensionPoint extension = new LanguageExtensionPoint<>(); extension.language="TEXT"; diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java index 7e2277f129b9..55136e500b72 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java @@ -22,11 +22,11 @@ import com.intellij.openapi.editor.EditorLastActionTracker; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.editor.actionSystem.EditorActionManager; import com.intellij.testFramework.fixtures.EditorMouseFixture; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class EditorLastActionTrackerTest extends LightPlatformCodeInsightFixtureTestCase { +public class EditorLastActionTrackerTest extends BasePlatformTestCase { public static final String SAMPLE_ACTION = "EditorDelete"; private final EditorActionHandler myActionHandler = new MyActionHandler(); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/FoldingAnchorsOverlayStrategyTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/FoldingAnchorsOverlayStrategyTest.java index 5150930946fb..8b4d52effd64 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/FoldingAnchorsOverlayStrategyTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/FoldingAnchorsOverlayStrategyTest.java @@ -21,13 +21,13 @@ import com.intellij.openapi.editor.FoldingModel; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.testFramework.EditorTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.util.*; import static com.intellij.openapi.editor.impl.DisplayedFoldingAnchor.Type; -public class FoldingAnchorsOverlayStrategyTest extends LightPlatformCodeInsightFixtureTestCase { +public class FoldingAnchorsOverlayStrategyTest extends BasePlatformTestCase { public void testExpanded() { prepareEditor("
\n" + "
\n" + diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/GuardBlockTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/GuardBlockTest.java index 17d09e1b5898..99292e9a85d3 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/GuardBlockTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/GuardBlockTest.java @@ -4,12 +4,12 @@ import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.RangeMarker; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author cdr */ -public class GuardBlockTest extends LightPlatformCodeInsightFixtureTestCase { +public class GuardBlockTest extends BasePlatformTestCase { private RangeMarker createGuard(final int start, final int end) { final Document document = myFixture.getEditor().getDocument(); return document.createGuardedBlock(start, end); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/RichCopyTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/RichCopyTest.java index 7f4b3c853d97..c9e83af4b567 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/RichCopyTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/RichCopyTest.java @@ -7,7 +7,7 @@ import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import junit.framework.ComparisonFailure; import org.jetbrains.annotations.NotNull; @@ -18,7 +18,7 @@ import java.io.InputStream; import java.io.Reader; import java.nio.charset.StandardCharsets; -public class RichCopyTest extends LightPlatformCodeInsightFixtureTestCase { +public class RichCopyTest extends BasePlatformTestCase { private static final String PLATFORM_SPECIFIC_PLACEHOLDER = "___PLATFORM_SPECIFIC___"; public void testNormalSelection() throws Exception { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/SyntaxInfoConstructionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/SyntaxInfoConstructionTest.java index bee4e0ed95fe..ca2b1ff2a11a 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/SyntaxInfoConstructionTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/SyntaxInfoConstructionTest.java @@ -29,13 +29,13 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.ui.JBColor; /** * @author Denis Zhdanov */ -public class SyntaxInfoConstructionTest extends LightPlatformCodeInsightFixtureTestCase { +public class SyntaxInfoConstructionTest extends BasePlatformTestCase { public void testBlockSelection() { String text = "package org;\n" + diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/EnforcedPlaintTextFileTypeManagerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/EnforcedPlaintTextFileTypeManagerTest.java index 70670acf3097..759d3f348b6c 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/EnforcedPlaintTextFileTypeManagerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/EnforcedPlaintTextFileTypeManagerTest.java @@ -18,13 +18,13 @@ package com.intellij.openapi.fileTypes; import com.intellij.openapi.file.exclude.EnforcedPlainTextFileTypeFactory; import com.intellij.openapi.file.exclude.EnforcedPlainTextFileTypeManager; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.ui.UIUtil; /** * @author Rustam Vishnyakov */ -public class EnforcedPlaintTextFileTypeManagerTest extends LightPlatformCodeInsightFixtureTestCase { +public class EnforcedPlaintTextFileTypeManagerTest extends BasePlatformTestCase { public void testMarkAsPlainText() { EnforcedPlainTextFileTypeManager manager = EnforcedPlainTextFileTypeManager.getInstance(); VirtualFile file = myFixture.getTempDirFixture().createFile("test.java"); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/project/DumbServiceImplTest.groovy b/platform/platform-tests/testSrc/com/intellij/openapi/project/DumbServiceImplTest.groovy index e6da011f5943..031f268bdcc8 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/project/DumbServiceImplTest.groovy +++ b/platform/platform-tests/testSrc/com/intellij/openapi/project/DumbServiceImplTest.groovy @@ -17,7 +17,7 @@ package com.intellij.openapi.project import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.progress.ProgressIndicator -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import com.intellij.util.TimeoutUtil import com.intellij.util.concurrency.Semaphore import com.intellij.util.ui.UIUtil @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull /** * @author peter */ -class DumbServiceImplTest extends LightPlatformCodeInsightFixtureTestCase { +class DumbServiceImplTest extends BasePlatformTestCase { void "test runWhenSmart is executed synchronously in smart mode"() { int invocations = 0 diff --git a/platform/platform-tests/testSrc/com/intellij/patterns/VirtualFilePatternsTest.java b/platform/platform-tests/testSrc/com/intellij/patterns/VirtualFilePatternsTest.java index 9e0b96788697..3b6a39a2c380 100644 --- a/platform/platform-tests/testSrc/com/intellij/patterns/VirtualFilePatternsTest.java +++ b/platform/platform-tests/testSrc/com/intellij/patterns/VirtualFilePatternsTest.java @@ -16,12 +16,12 @@ package com.intellij.patterns; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author peter */ -public class VirtualFilePatternsTest extends LightPlatformCodeInsightFixtureTestCase { +public class VirtualFilePatternsTest extends BasePlatformTestCase { public void testWithSuperParent() { VirtualFile file = myFixture.addFileToProject("foo/bar.txt", "").getVirtualFile(); assert PlatformPatterns.virtualFile().withSuperParent(1, PlatformPatterns.virtualFile().withName("foo")).accepts(file); diff --git a/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiEventConsistencyTest.kt b/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiEventConsistencyTest.kt index 6c4f82d001bc..4306026b1ecd 100644 --- a/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiEventConsistencyTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiEventConsistencyTest.kt @@ -12,8 +12,7 @@ import com.intellij.psi.impl.source.DummyHolder import com.intellij.psi.impl.source.codeStyle.CodeEditUtil import com.intellij.psi.impl.source.tree.* import com.intellij.psi.tree.IElementType -import com.intellij.testFramework.LightPlatformTestCase -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.jetbrains.jetCheck.Generator import org.jetbrains.jetCheck.ImperativeCommand import org.jetbrains.jetCheck.IntDistribution @@ -22,7 +21,7 @@ import org.jetbrains.jetCheck.PropertyChecker /** * @author peter */ -class PsiEventConsistencyTest : LightPlatformCodeInsightFixtureTestCase() { +class PsiEventConsistencyTest : BasePlatformTestCase() { fun `test replacing child after changing its subtree`() { WriteCommandAction.runWriteCommandAction(project) { diff --git a/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java b/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java index 4e25c259b989..6d8a0bd890e8 100644 --- a/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java +++ b/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java @@ -10,7 +10,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLanguageInjectionHost; import com.intellij.psi.impl.source.tree.CompositeElement; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import gnu.trove.THashMap; import gnu.trove.TObjectIntHashMap; @@ -19,7 +19,7 @@ import java.util.*; /** * @author gregsh */ -public class IElementTypeTest extends LightPlatformCodeInsightFixtureTestCase { +public class IElementTypeTest extends BasePlatformTestCase { // load all parser definitions, instantiate all lexers & parsers to initialize all IElementType constants @SuppressWarnings("UnusedDeclaration") public void testCount() { diff --git a/platform/platform-tests/testSrc/com/intellij/psi/util/CachedValuesTest.java b/platform/platform-tests/testSrc/com/intellij/psi/util/CachedValuesTest.java index 763b3a04cc82..9e57a098ee95 100644 --- a/platform/platform-tests/testSrc/com/intellij/psi/util/CachedValuesTest.java +++ b/platform/platform-tests/testSrc/com/intellij/psi/util/CachedValuesTest.java @@ -7,7 +7,7 @@ import com.intellij.openapi.util.SimpleModificationTracker; import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.PsiModificationTrackerImpl; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.TimeoutUtil; import junit.framework.TestCase; import one.util.streamex.IntStreamEx; @@ -22,7 +22,7 @@ import java.util.function.Supplier; /** * @author peter */ -public class CachedValuesTest extends LightPlatformCodeInsightFixtureTestCase { +public class CachedValuesTest extends BasePlatformTestCase { private final UserDataHolderBase holder = new UserDataHolderBase(); public void testCachedValueCapturingInvalidStuff() { diff --git a/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java b/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java index a0759ec64f78..e986bc56dce8 100644 --- a/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java +++ b/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java @@ -18,14 +18,14 @@ package com.intellij.structureView; import com.intellij.ide.util.treeView.smartTree.*; import com.intellij.openapi.ui.Queryable; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Comparator; -public class SmartTreeStructureTest extends LightPlatformCodeInsightFixtureTestCase { +public class SmartTreeStructureTest extends BasePlatformTestCase { private final Queryable.PrintInfo myPrintInfo = new Queryable.PrintInfo(); private TestTreeModel myModel; diff --git a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewTest.java b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewTest.java index b1b1a10f6d69..09440bd11660 100644 --- a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewTest.java +++ b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewTest.java @@ -33,7 +33,7 @@ import com.intellij.psi.impl.source.PsiFileImpl; import com.intellij.testFramework.LeakHunter; import com.intellij.testFramework.LightPlatformTestCase; import com.intellij.testFramework.PlatformTestCase; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.usageView.UsageInfo; import com.intellij.usages.*; import com.intellij.util.ui.UIUtil; @@ -48,7 +48,7 @@ import javax.swing.tree.TreeNode; import java.util.HashSet; import java.util.Set; -public class UsageViewTest extends LightPlatformCodeInsightFixtureTestCase { +public class UsageViewTest extends BasePlatformTestCase { public void testUsageViewDoesNotHoldPsiFilesOrDocuments() { // sick and tired of hunting tests leaking documents ((UndoManagerImpl)UndoManager.getInstance(getProject())).flushCurrentCommandMerger(); diff --git a/platform/platform-tests/testSrc/com/intellij/util/AstLoadingFilterTest.java b/platform/platform-tests/testSrc/com/intellij/util/AstLoadingFilterTest.java index c4a3a84c8808..68094d404758 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/AstLoadingFilterTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/AstLoadingFilterTest.java @@ -5,9 +5,9 @@ import com.intellij.openapi.util.ThrowableComputable; import com.intellij.openapi.util.registry.Registry; import com.intellij.psi.impl.source.PsiFileImpl; import com.intellij.testFramework.exceptionCases.AbstractExceptionCase; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; -public class AstLoadingFilterTest extends LightPlatformCodeInsightFixtureTestCase { +public class AstLoadingFilterTest extends BasePlatformTestCase { @Override protected void setUp() throws Exception { diff --git a/platform/platform-tests/testSrc/com/intellij/util/PsiErrorElementUtilTest.java b/platform/platform-tests/testSrc/com/intellij/util/PsiErrorElementUtilTest.java index b73bb987b907..60821210cb9d 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/PsiErrorElementUtilTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/PsiErrorElementUtilTest.java @@ -18,11 +18,11 @@ package com.intellij.util; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.psi.PsiFile; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.junit.Assert; -public class PsiErrorElementUtilTest extends LightPlatformCodeInsightFixtureTestCase { +public class PsiErrorElementUtilTest extends BasePlatformTestCase { @NotNull @Override diff --git a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java index 1bcf061dd2c4..86eafd6d7d99 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java @@ -6,13 +6,13 @@ import com.intellij.openapi.fileTypes.ex.FakeFileType; import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.FileTypeIndexImpl; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; /** * @author Dmitry Avdeev */ -public class FileTypeIndexTest extends LightPlatformCodeInsightFixtureTestCase { +public class FileTypeIndexTest extends BasePlatformTestCase { public void testAddFileType() { addAndRemoveFileType(); diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/PersistencePerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/PersistencePerformanceTest.java index 4bd0294b5900..4f6723275855 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/io/PersistencePerformanceTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/io/PersistencePerformanceTest.java @@ -8,7 +8,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.PlatformTestCase; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.TimeoutUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.indexing.FileBasedIndex; @@ -26,7 +26,7 @@ import java.util.concurrent.Future; /** * @author Dmitry Avdeev */ -public class PersistencePerformanceTest extends LightPlatformCodeInsightFixtureTestCase { +public class PersistencePerformanceTest extends BasePlatformTestCase { private final List> myMaps = new ArrayList<>(); private final List myKeys = new ArrayList<>(); private PersistentStringEnumerator myEnumerator; diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/FileUrlLocationTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/FileUrlLocationTest.java index 94fee6da3f7a..7d7cf2638249 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/FileUrlLocationTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/FileUrlLocationTest.java @@ -22,14 +22,14 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.util.Collections; /** * @author Roman Chernyatchik */ -public class FileUrlLocationTest extends LightPlatformCodeInsightFixtureTestCase { +public class FileUrlLocationTest extends BasePlatformTestCase { public void testExcluded() { myFixture.addFileToProject("secondary/my_example_spec.xml", ""); ModuleRootModificationUtil.updateExcludedFolders(getModule(), ModuleRootManager.getInstance(getModule()).getContentRoots()[0], Collections.emptyList(), Collections.singletonList("/src")); diff --git a/platform/testFramework/src/com/intellij/codeInsight/folding/impl/AbstractFoldingPolicyTest.java b/platform/testFramework/src/com/intellij/codeInsight/folding/impl/AbstractFoldingPolicyTest.java index 33767df876e0..01dea359a43a 100644 --- a/platform/testFramework/src/com/intellij/codeInsight/folding/impl/AbstractFoldingPolicyTest.java +++ b/platform/testFramework/src/com/intellij/codeInsight/folding/impl/AbstractFoldingPolicyTest.java @@ -18,10 +18,10 @@ package com.intellij.codeInsight.folding.impl; import com.intellij.codeInsight.folding.CodeFoldingManager; import com.intellij.openapi.editor.FoldRegion; import com.intellij.psi.PsiElement; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; -public abstract class AbstractFoldingPolicyTest extends LightPlatformCodeInsightFixtureTestCase { +public abstract class AbstractFoldingPolicyTest extends BasePlatformTestCase { protected void doTest(@NotNull String text, @NotNull String ext) { myFixture.configureByText("test." + ext, text); diff --git a/platform/testFramework/src/com/intellij/codeInsight/folding/impl/AbstractPsiNamesElementSignatureProviderTest.java b/platform/testFramework/src/com/intellij/codeInsight/folding/impl/AbstractPsiNamesElementSignatureProviderTest.java index 8e4161a4c253..98bac173625a 100644 --- a/platform/testFramework/src/com/intellij/codeInsight/folding/impl/AbstractPsiNamesElementSignatureProviderTest.java +++ b/platform/testFramework/src/com/intellij/codeInsight/folding/impl/AbstractPsiNamesElementSignatureProviderTest.java @@ -6,11 +6,11 @@ import com.intellij.openapi.editor.FoldRegion; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -abstract class AbstractPsiNamesElementSignatureProviderTest extends LightPlatformCodeInsightFixtureTestCase { +abstract class AbstractPsiNamesElementSignatureProviderTest extends BasePlatformTestCase { void doTest(@NotNull String text, @NotNull String ext) { myFixture.configureByText("test." + ext, text); diff --git a/platform/testFramework/src/com/intellij/psi/codeStyle/arrangement/AbstractRearrangerTest.java b/platform/testFramework/src/com/intellij/psi/codeStyle/arrangement/AbstractRearrangerTest.java index 2c2d85ffaa44..40ece2ac845d 100644 --- a/platform/testFramework/src/com/intellij/psi/codeStyle/arrangement/AbstractRearrangerTest.java +++ b/platform/testFramework/src/com/intellij/psi/codeStyle/arrangement/AbstractRearrangerTest.java @@ -18,7 +18,7 @@ import com.intellij.psi.codeStyle.arrangement.match.StdArrangementMatchRule; import com.intellij.psi.codeStyle.arrangement.model.ArrangementAtomMatchCondition; import com.intellij.psi.codeStyle.arrangement.model.ArrangementMatchCondition; import com.intellij.psi.codeStyle.arrangement.std.*; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -33,7 +33,7 @@ import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Or /** * @author Denis Zhdanov */ -public abstract class AbstractRearrangerTest extends LightPlatformCodeInsightFixtureTestCase { +public abstract class AbstractRearrangerTest extends BasePlatformTestCase { private static final RichTextHandler[] RICH_TEXT_HANDLERS = {new RangeHandler(), new FoldingHandler()}; private static final Pattern ATTRIBUTE_PATTERN = Pattern.compile("([^\\s]+)=([^\\s]+)"); diff --git a/platform/testFramework/src/com/intellij/testFramework/FileEditorManagerTestCase.java b/platform/testFramework/src/com/intellij/testFramework/FileEditorManagerTestCase.java index a81dbdfbab05..dd323442e0d5 100644 --- a/platform/testFramework/src/com/intellij/testFramework/FileEditorManagerTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/FileEditorManagerTestCase.java @@ -13,7 +13,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.ui.docking.DockContainer; import com.intellij.ui.docking.DockManager; import com.intellij.util.ui.UIUtil; @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; /** * @author Dmitry Avdeev */ -public abstract class FileEditorManagerTestCase extends LightPlatformCodeInsightFixtureTestCase { +public abstract class FileEditorManagerTestCase extends BasePlatformTestCase { protected FileEditorManagerImpl myManager; private FileEditorManager myOldManager; private Set myOldDockContainers; diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/BasePlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/BasePlatformTestCase.java new file mode 100644 index 000000000000..741c04790002 --- /dev/null +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/BasePlatformTestCase.java @@ -0,0 +1,127 @@ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package com.intellij.testFramework.fixtures; + +import com.intellij.lang.Language; +import com.intellij.openapi.command.WriteCommandAction; +import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiFileFactory; +import com.intellij.psi.PsiManager; +import com.intellij.testFramework.LightProjectDescriptor; +import com.intellij.testFramework.PlatformTestUtil; +import com.intellij.testFramework.UsefulTestCase; +import com.intellij.testFramework.fixtures.impl.LightTempDirTestFixtureImpl; +import org.jetbrains.annotations.NotNull; + +/** + * @author peter + */ +public abstract class BasePlatformTestCase extends UsefulTestCase { + protected CodeInsightTestFixture myFixture; + + @Override + protected void setUp() throws Exception { + super.setUp(); + + IdeaTestFixtureFactory factory = IdeaTestFixtureFactory.getFixtureFactory(); + TestFixtureBuilder fixtureBuilder = factory.createLightFixtureBuilder(getProjectDescriptor()); + IdeaProjectTestFixture fixture = fixtureBuilder.getFixture(); + + TempDirTestFixture tempDirFixture = createTempDirTestFixture(); + myFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(fixture, tempDirFixture); + + myFixture.setTestDataPath(getTestDataPath()); + myFixture.setUp(); + } + + protected TempDirTestFixture createTempDirTestFixture() { + IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current(); + return policy != null + ? policy.createTempDirTestFixture() + : new LightTempDirTestFixtureImpl(true); + } + + @Override + protected void tearDown() throws Exception { + try { + myFixture.tearDown(); + } + catch (Throwable e) { + addSuppressedException(e); + } + finally { + myFixture = null; + super.tearDown(); + } + } + + /** + * Returns relative path to the test data. + */ + protected String getBasePath() { + return ""; + } + + protected LightProjectDescriptor getProjectDescriptor() { + return null; + } + + /** + * Return absolute path to the test data. Not intended to be overridden in tests written as part of the IntelliJ IDEA codebase; + * must be overridden in plugins which use the test framework. + * + * @see #getBasePath() + */ + protected String getTestDataPath() { + String path = isCommunity() ? PlatformTestUtil.getCommunityPath() : IdeaTestExecutionPolicy.getHomePathWithPolicy(); + return StringUtil.trimEnd(FileUtil.toSystemIndependentName(path), "/") + '/' + + StringUtil.trimStart(FileUtil.toSystemIndependentName(getBasePath()), "/"); + } + + protected boolean isCommunity() { + return false; + } + + @Override + protected void runTest() throws Throwable { + if (isWriteActionRequired()) { + WriteCommandAction.writeCommandAction(getProject()).run(() -> doRunTests()); + } + else { + doRunTests(); + } + } + + protected boolean isWriteActionRequired() { + return false; + } + + protected void doRunTests() throws Throwable { + super.runTest(); + } + + protected Project getProject() { + return myFixture.getProject(); + } + + protected PsiManager getPsiManager() { + return PsiManager.getInstance(getProject()); + } + + protected PsiFile createLightFile(FileType fileType, String text) { + return PsiFileFactory.getInstance(getProject()).createFileFromText("a." + fileType.getDefaultExtension(), fileType, text); + } + + public PsiFile createLightFile(String fileName, Language language, String text) { + return PsiFileFactory.getInstance(getProject()).createFileFromText(fileName, language, text, false, true); + } + + @NotNull + protected Module getModule() { + return myFixture.getModule(); + } +} \ No newline at end of file diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixture4TestCase.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixture4TestCase.java index cf1bf22443fc..b61f63d258a6 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixture4TestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixture4TestCase.java @@ -14,7 +14,7 @@ import org.junit.runners.model.Statement; * @author gregsh */ @RunWith(JUnit4.class) -public abstract class LightPlatformCodeInsightFixture4TestCase extends LightPlatformCodeInsightFixtureTestCase { +public abstract class LightPlatformCodeInsightFixture4TestCase extends BasePlatformTestCase { @Rule public TestRule rule = (base, description) -> new Statement() { @Override diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixtureTestCase.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixtureTestCase.java index bd4f5fefbd5a..3ca251facfe7 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixtureTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixtureTestCase.java @@ -1,127 +1,9 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-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 file. package com.intellij.testFramework.fixtures; -import com.intellij.lang.Language; -import com.intellij.openapi.command.WriteCommandAction; -import com.intellij.openapi.fileTypes.FileType; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiFileFactory; -import com.intellij.psi.PsiManager; -import com.intellij.testFramework.LightProjectDescriptor; -import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.UsefulTestCase; -import com.intellij.testFramework.fixtures.impl.LightTempDirTestFixtureImpl; -import org.jetbrains.annotations.NotNull; - /** - * @author peter + * @deprecated Please use {@link BasePlatformTestCase} */ -public abstract class LightPlatformCodeInsightFixtureTestCase extends UsefulTestCase { - protected CodeInsightTestFixture myFixture; - - @Override - protected void setUp() throws Exception { - super.setUp(); - - IdeaTestFixtureFactory factory = IdeaTestFixtureFactory.getFixtureFactory(); - TestFixtureBuilder fixtureBuilder = factory.createLightFixtureBuilder(getProjectDescriptor()); - IdeaProjectTestFixture fixture = fixtureBuilder.getFixture(); - - TempDirTestFixture tempDirFixture = createTempDirTestFixture(); - myFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(fixture, tempDirFixture); - - myFixture.setTestDataPath(getTestDataPath()); - myFixture.setUp(); - } - - protected TempDirTestFixture createTempDirTestFixture() { - IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current(); - return policy != null - ? policy.createTempDirTestFixture() - : new LightTempDirTestFixtureImpl(true); - } - - @Override - protected void tearDown() throws Exception { - try { - myFixture.tearDown(); - } - catch (Throwable e) { - addSuppressedException(e); - } - finally { - myFixture = null; - super.tearDown(); - } - } - - /** - * Returns relative path to the test data. - */ - protected String getBasePath() { - return ""; - } - - protected LightProjectDescriptor getProjectDescriptor() { - return null; - } - - /** - * Return absolute path to the test data. Not intended to be overridden in tests written as part of the IntelliJ IDEA codebase; - * must be overridden in plugins which use the test framework. - * - * @see #getBasePath() - */ - protected String getTestDataPath() { - String path = isCommunity() ? PlatformTestUtil.getCommunityPath() : IdeaTestExecutionPolicy.getHomePathWithPolicy(); - return StringUtil.trimEnd(FileUtil.toSystemIndependentName(path), "/") + '/' + - StringUtil.trimStart(FileUtil.toSystemIndependentName(getBasePath()), "/"); - } - - protected boolean isCommunity() { - return false; - } - - @Override - protected void runTest() throws Throwable { - if (isWriteActionRequired()) { - WriteCommandAction.writeCommandAction(getProject()).run(() -> doRunTests()); - } - else { - doRunTests(); - } - } - - protected boolean isWriteActionRequired() { - return false; - } - - protected void doRunTests() throws Throwable { - super.runTest(); - } - - protected Project getProject() { - return myFixture.getProject(); - } - - protected PsiManager getPsiManager() { - return PsiManager.getInstance(getProject()); - } - - protected PsiFile createLightFile(FileType fileType, String text) { - return PsiFileFactory.getInstance(getProject()).createFileFromText("a." + fileType.getDefaultExtension(), fileType, text); - } - - public PsiFile createLightFile(String fileName, Language language, String text) { - return PsiFileFactory.getInstance(getProject()).createFileFromText(fileName, language, text, false, true); - } - - @NotNull - protected Module getModule() { - return myFixture.getModule(); - } -} \ No newline at end of file +@Deprecated +public abstract class LightPlatformCodeInsightFixtureTestCase extends BasePlatformTestCase { +} diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/ExpectedHighlightingDataFunctionalTest.java b/platform/testFramework/testSrc/com/intellij/testFramework/ExpectedHighlightingDataFunctionalTest.java index 9240d6e5565c..6d7d45180f77 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/ExpectedHighlightingDataFunctionalTest.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/ExpectedHighlightingDataFunctionalTest.java @@ -6,12 +6,12 @@ import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.PsiPlainText; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.junit.ComparisonFailure; -public class ExpectedHighlightingDataFunctionalTest extends LightPlatformCodeInsightFixtureTestCase { +public class ExpectedHighlightingDataFunctionalTest extends BasePlatformTestCase { public void testExpectedWarning() { doTest("just some text", new MySimpleInspection()); diff --git a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigCommenterTest.kt b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigCommenterTest.kt index 4be6cf13e42b..679e823fc419 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigCommenterTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigCommenterTest.kt @@ -3,9 +3,9 @@ package org.editorconfig.language import com.intellij.codeInsight.generation.actions.CommentByLineCommentAction import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class EditorConfigCommenterTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigCommenterTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/commenter/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigFormattingTest.kt b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigFormattingTest.kt index 6f76a4c82dd9..1dc6567bbf57 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/EditorConfigFormattingTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/EditorConfigFormattingTest.kt @@ -6,9 +6,9 @@ import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.command.WriteCommandAction import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.psi.codeStyle.CommonCodeStyleSettings -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class EditorConfigFormattingTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigFormattingTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/formatting" private fun doTestWithSettings(settings: CommonCodeStyleSettings.() -> Unit) { diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigCompletionTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigCompletionTest.kt index e356b880aa7d..58b46912687f 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigCompletionTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigCompletionTest.kt @@ -4,13 +4,13 @@ package org.editorconfig.language.codeinsight import com.intellij.codeInsight.lookup.LookupElement import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.util.registry.Registry -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.editorconfig.EditorConfigRegistry import org.editorconfig.language.assertIterableEquals import org.editorconfig.language.services.EditorConfigOptionDescriptorManager import org.editorconfig.language.services.impl.EditorConfigOptionDescriptorManagerImpl -class EditorConfigCompletionTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigCompletionTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/completion/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigFoldingBuilderTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigFoldingBuilderTest.kt index 2fb522637482..2a7d93f034ab 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigFoldingBuilderTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigFoldingBuilderTest.kt @@ -2,9 +2,9 @@ package org.editorconfig.language.codeinsight import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class EditorConfigFoldingBuilderTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigFoldingBuilderTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/folding/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigHighlightUsagesTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigHighlightUsagesTest.kt index 24edfe282b52..126673d25112 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigHighlightUsagesTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigHighlightUsagesTest.kt @@ -5,9 +5,9 @@ import com.intellij.codeInsight.daemon.impl.IdentifierHighlighterPassFactory.doW import com.intellij.codeInsight.daemon.impl.SeveritiesProvider import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.ExpectedHighlightingData -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class EditorConfigHighlightUsagesTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigHighlightUsagesTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/highlightUsages/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigInspectionsTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigInspectionsTest.kt index b49531640a9b..6cc89f850099 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigInspectionsTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigInspectionsTest.kt @@ -3,11 +3,11 @@ package org.editorconfig.language.codeinsight import com.intellij.codeInspection.LocalInspectionTool import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.editorconfig.language.codeinsight.inspections.* import kotlin.reflect.KClass -class EditorConfigInspectionsTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigInspectionsTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/inspections" diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigQuickfixesTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigQuickfixesTest.kt index 0ea05620a9dc..76a9f298384a 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigQuickfixesTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigQuickfixesTest.kt @@ -4,13 +4,13 @@ package org.editorconfig.language.codeinsight import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInspection.LocalInspectionTool import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.editorconfig.language.codeinsight.inspections.* import org.editorconfig.language.messages.EditorConfigBundle import org.jetbrains.annotations.PropertyKey import kotlin.reflect.KClass -class EditorConfigQuickfixesTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigQuickfixesTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/quickfixes/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigRefactoringTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigRefactoringTest.kt index 5483aae226cd..dcc9c76e8680 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigRefactoringTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigRefactoringTest.kt @@ -3,10 +3,10 @@ package org.editorconfig.language.codeinsight import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.testFramework.fixtures.CodeInsightTestUtil -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.editorconfig.language.codeinsight.refactoring.EditorConfigRenameHandler -class EditorConfigRefactoringTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigRefactoringTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/refactoring/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigResolveTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigResolveTest.kt index ad42876ac077..883b4a30612f 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigResolveTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/EditorConfigResolveTest.kt @@ -8,10 +8,10 @@ import com.intellij.psi.PsiFile import com.intellij.psi.PsiReference import com.intellij.psi.util.PsiUtilCore import com.intellij.testFramework.UsefulTestCase -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import java.util.* -class EditorConfigResolveTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigResolveTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/resolve/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EditorConfigIntentionTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EditorConfigIntentionTest.kt index 79dba5dcc00d..6d0be2a52511 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EditorConfigIntentionTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EditorConfigIntentionTest.kt @@ -3,11 +3,11 @@ package org.editorconfig.language.codeinsight.actions import com.intellij.codeInsight.intention.IntentionAction import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.editorconfig.language.messages.EditorConfigBundle import org.jetbrains.annotations.PropertyKey -class EditorConfigIntentionTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigIntentionTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/actions/intention/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EnterInEditorConfigFileHandlerTest.kt b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EnterInEditorConfigFileHandlerTest.kt index bcc4007cf9ed..eb4cb826d1fa 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EnterInEditorConfigFileHandlerTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/codeinsight/actions/EnterInEditorConfigFileHandlerTest.kt @@ -2,9 +2,9 @@ package org.editorconfig.language.codeinsight.actions import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class EnterInEditorConfigFileHandlerTest : LightPlatformCodeInsightFixtureTestCase() { +class EnterInEditorConfigFileHandlerTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/codeinsight/actions/enter/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigGlobUtilTest.kt b/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigGlobUtilTest.kt index 02a88f8a2d65..013bf040f309 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigGlobUtilTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigGlobUtilTest.kt @@ -2,12 +2,12 @@ package org.editorconfig.language.headers import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.editorconfig.language.services.EditorConfigElementFactory import org.editorconfig.language.util.isSubcaseOf import org.junit.Test -class EditorConfigGlobUtilTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigGlobUtilTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testSrc/org/editorconfig/language/globs/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigHeaderHierarchyTest.kt b/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigHeaderHierarchyTest.kt index b94ad3a9f1fa..a0b6745d1209 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigHeaderHierarchyTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/headers/EditorConfigHeaderHierarchyTest.kt @@ -2,7 +2,7 @@ package org.editorconfig.language.headers import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.editorconfig.language.assertIterableEquals import org.editorconfig.language.psi.EditorConfigPsiFile import org.editorconfig.language.psi.EditorConfigSection @@ -10,7 +10,7 @@ import org.editorconfig.language.util.headers.EditorConfigHeaderOverrideSearcher import org.editorconfig.language.util.headers.EditorConfigOverriddenHeaderSearcher import org.editorconfig.language.util.headers.EditorConfigOverridingHeaderSearcher -class EditorConfigHeaderHierarchyTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigHeaderHierarchyTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/headers/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigErrorHighlightingTest.kt b/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigErrorHighlightingTest.kt index ef13f9a5aa01..ca5490b3ef03 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigErrorHighlightingTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigErrorHighlightingTest.kt @@ -2,9 +2,9 @@ package org.editorconfig.language.highlighting import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class EditorConfigErrorHighlightingTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigErrorHighlightingTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/highlighting/error/" diff --git a/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigInfoHighlightingTest.kt b/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigInfoHighlightingTest.kt index 5d844e6ec8db..f618f42df2e2 100644 --- a/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigInfoHighlightingTest.kt +++ b/plugins/editorconfig/test/org/editorconfig/language/highlighting/EditorConfigInfoHighlightingTest.kt @@ -2,9 +2,9 @@ package org.editorconfig.language.highlighting import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class EditorConfigInfoHighlightingTest : LightPlatformCodeInsightFixtureTestCase() { +class EditorConfigInfoHighlightingTest : BasePlatformTestCase() { override fun getTestDataPath() = "${PathManagerEx.getCommunityHomePath()}/plugins/editorconfig/testData/org/editorconfig/language/highlighting/info/" diff --git a/plugins/gradle-maven/testSources/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java b/plugins/gradle-maven/testSources/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java index 148c6c6ae228..ce3c89e7e6e7 100644 --- a/plugins/gradle-maven/testSources/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java +++ b/plugins/gradle-maven/testSources/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java @@ -4,7 +4,7 @@ package org.jetbrains.plugins.gradle.integrations.maven.codeInsight.actions; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.idea.maven.model.MavenId; import java.io.File; @@ -13,7 +13,7 @@ import java.util.Arrays; /** * @author Vladislav.Soroka */ -public class AddGradleDslDependencyActionTest extends LightPlatformCodeInsightFixtureTestCase { +public class AddGradleDslDependencyActionTest extends BasePlatformTestCase { public void testAddMavenDependencyInEmptyFile() { AddGradleDslDependencyAction.TEST_THREAD_LOCAL.set(Arrays.asList(new MavenId("testGroupId", "testArtifactId", "1.0"))); diff --git a/plugins/gradle/java/testSources/codeInsight/actions/AddGradleDslPluginActionTest.java b/plugins/gradle/java/testSources/codeInsight/actions/AddGradleDslPluginActionTest.java index a7dc1a1d9a53..7b69e385ede8 100644 --- a/plugins/gradle/java/testSources/codeInsight/actions/AddGradleDslPluginActionTest.java +++ b/plugins/gradle/java/testSources/codeInsight/actions/AddGradleDslPluginActionTest.java @@ -18,14 +18,14 @@ package org.jetbrains.plugins.gradle.codeInsight.actions; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.io.File; /** * @author Vladislav.Soroka */ -public class AddGradleDslPluginActionTest extends LightPlatformCodeInsightFixtureTestCase { +public class AddGradleDslPluginActionTest extends BasePlatformTestCase { public void testApplyPlugin() { doTest("testApplyPlugin.gradle", "java"); diff --git a/plugins/java-i18n/testSrc/com/intellij/spellchecker/inspection/LiteralExpressionTokenizerTest.java b/plugins/java-i18n/testSrc/com/intellij/spellchecker/inspection/LiteralExpressionTokenizerTest.java index acf13805764d..bdb70fd20c2b 100644 --- a/plugins/java-i18n/testSrc/com/intellij/spellchecker/inspection/LiteralExpressionTokenizerTest.java +++ b/plugins/java-i18n/testSrc/com/intellij/spellchecker/inspection/LiteralExpressionTokenizerTest.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import com.intellij.spellchecker.LiteralExpressionTokenizer; import com.intellij.spellchecker.inspections.Splitter; import com.intellij.spellchecker.tokenizer.TokenConsumer; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.Consumer; import java.util.ArrayList; @@ -29,7 +29,7 @@ import java.util.List; /** * @author yole */ -public class LiteralExpressionTokenizerTest extends LightPlatformCodeInsightFixtureTestCase { +public class LiteralExpressionTokenizerTest extends BasePlatformTestCase { private static class TokenCollector extends TokenConsumer implements Consumer { private final List myTokenTexts = new ArrayList<>(); private String myText; diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/MarkdownInjectionTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/MarkdownInjectionTest.java index aab957afbbd7..400dca0019e1 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/MarkdownInjectionTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/MarkdownInjectionTest.java @@ -3,7 +3,7 @@ package org.intellij.plugins.markdown; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.injection.LanguageGuesser; import org.intellij.plugins.markdown.lang.MarkdownFileType; import org.intellij.plugins.markdown.lang.MarkdownLanguage; @@ -12,7 +12,7 @@ import org.intellij.plugins.markdown.settings.MarkdownApplicationSettings; import java.util.Arrays; import java.util.stream.Collectors; -public class MarkdownInjectionTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownInjectionTest extends BasePlatformTestCase { @Override protected void setUp() throws Exception { diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/braces/MarkdownBraceMatcherTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/braces/MarkdownBraceMatcherTest.java index 874eb71288ee..1dc609069ec5 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/braces/MarkdownBraceMatcherTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/braces/MarkdownBraceMatcherTest.java @@ -2,11 +2,11 @@ package org.intellij.plugins.markdown.braces; import com.intellij.codeInsight.CodeInsightSettings; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.lang.MarkdownFileType; import org.jetbrains.annotations.NotNull; -public class MarkdownBraceMatcherTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownBraceMatcherTest extends BasePlatformTestCase { public void testParenBeforeIdentifier() { doTest('(', "abc", "(abc"); } diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/completion/HeaderReferenceCompletionTest.kt b/plugins/markdown/test/src/org/intellij/plugins/markdown/completion/HeaderReferenceCompletionTest.kt index 2a8a1cf25477..ce9a182f4472 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/completion/HeaderReferenceCompletionTest.kt +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/completion/HeaderReferenceCompletionTest.kt @@ -1,9 +1,9 @@ package org.intellij.plugins.markdown.completion -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.intellij.plugins.markdown.MarkdownTestingUtil -class HeaderReferenceCompletionTest : LightPlatformCodeInsightFixtureTestCase() { +class HeaderReferenceCompletionTest : BasePlatformTestCase() { override fun getTestDataPath(): String = MarkdownTestingUtil.TEST_DATA_PATH + "/completion/headerAnchor/" fun testHeader1() { diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/completion/LanguageListCompletionTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/completion/LanguageListCompletionTest.java index 76a4ad2b0bae..f18d888b1bcf 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/completion/LanguageListCompletionTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/completion/LanguageListCompletionTest.java @@ -9,7 +9,7 @@ import com.intellij.lang.Language; import com.intellij.lang.LanguageParserDefinitions; import com.intellij.openapi.fileTypes.PlainTextLanguage; import com.intellij.openapi.fileTypes.PlainTextParserDefinition; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.MarkdownTestingUtil; import org.intellij.plugins.markdown.injection.CodeFenceLanguageProvider; import org.intellij.plugins.markdown.injection.LanguageGuesser; @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -public class LanguageListCompletionTest extends LightPlatformCodeInsightFixtureTestCase { +public class LanguageListCompletionTest extends BasePlatformTestCase { @NotNull @Override diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownCodeFenceErrorHighlightingTest.kt b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownCodeFenceErrorHighlightingTest.kt index 50b95cdb42b0..2ca2123e4e39 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownCodeFenceErrorHighlightingTest.kt +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownCodeFenceErrorHighlightingTest.kt @@ -1,11 +1,11 @@ // Copyright 2000-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 file. package org.intellij.plugins.markdown.editor -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.intellij.plugins.markdown.MarkdownTestingUtil import org.intellij.plugins.markdown.settings.MarkdownApplicationSettings -class MarkdownCodeFenceErrorHighlightingTest : LightPlatformCodeInsightFixtureTestCase() { +class MarkdownCodeFenceErrorHighlightingTest : BasePlatformTestCase() { private var oldHideErrorsSetting = false override fun setUp() { diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownManipulatorTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownManipulatorTest.java index ca61f75466fb..c4ea5aa008e6 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownManipulatorTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownManipulatorTest.java @@ -18,11 +18,11 @@ import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.lang.MarkdownFileType; import org.intellij.plugins.markdown.lang.psi.impl.MarkdownCodeFenceImpl; -public class MarkdownManipulatorTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownManipulatorTest extends BasePlatformTestCase { public void testSimpleCodeFence() { doTest("```text\n" + "Runtime\n" + diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownPsiElementFactoryTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownPsiElementFactoryTest.java index 390407b78764..4a6a34fa5ba1 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownPsiElementFactoryTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownPsiElementFactoryTest.java @@ -15,13 +15,13 @@ package org.intellij.plugins.markdown.editor; import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.lang.psi.MarkdownPsiElementFactory; import org.intellij.plugins.markdown.lang.psi.impl.MarkdownCodeFenceImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class MarkdownPsiElementFactoryTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownPsiElementFactoryTest extends BasePlatformTestCase { public void testCreateNewCodeFence() { doTest("ruby", "a = 1", "```ruby\na = 1\n```"); } diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownQuoteHandlerTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownQuoteHandlerTest.java index 2ea912288853..83a940930d1a 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownQuoteHandlerTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownQuoteHandlerTest.java @@ -1,11 +1,11 @@ package org.intellij.plugins.markdown.editor; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.lang.psi.impl.MarkdownFile; import org.jetbrains.annotations.NotNull; -public class MarkdownQuoteHandlerTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownQuoteHandlerTest extends BasePlatformTestCase { private void doTest(@NotNull String text, char charToType, @NotNull String expectedResult) { final PsiFile file = myFixture.configureByText("test.md", text); assertInstanceOf(file, MarkdownFile.class); diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/enter/MarkdownEnterHandlerTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/enter/MarkdownEnterHandlerTest.java index 34e88e02ffd3..8b26e70231e9 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/enter/MarkdownEnterHandlerTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/enter/MarkdownEnterHandlerTest.java @@ -1,10 +1,10 @@ // Copyright 2000-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 file. package org.intellij.plugins.markdown.enter; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.MarkdownTestingUtil; -public class MarkdownEnterHandlerTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownEnterHandlerTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return MarkdownTestingUtil.TEST_DATA_PATH + "/enter"; diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/folding/MarkdownFoldingTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/folding/MarkdownFoldingTest.java index 68f2fe219068..629580176d07 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/folding/MarkdownFoldingTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/folding/MarkdownFoldingTest.java @@ -1,9 +1,9 @@ package org.intellij.plugins.markdown.folding; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.MarkdownTestingUtil; -public class MarkdownFoldingTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownFoldingTest extends BasePlatformTestCase { public void testOrderedList() { doTest(); } diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownEmbeddedHtmlTest.kt b/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownEmbeddedHtmlTest.kt index d79bee4d4d5c..bab86fb36d7f 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownEmbeddedHtmlTest.kt +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownEmbeddedHtmlTest.kt @@ -3,11 +3,11 @@ package org.intellij.plugins.markdown.html import com.intellij.lang.html.HTMLLanguage import com.intellij.psi.impl.DebugUtil -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import junit.framework.TestCase import org.intellij.plugins.markdown.MarkdownTestingUtil -class MarkdownEmbeddedHtmlTest : LightPlatformCodeInsightFixtureTestCase() { +class MarkdownEmbeddedHtmlTest : BasePlatformTestCase() { override fun getTestDataPath(): String { return MarkdownTestingUtil.TEST_DATA_PATH + "/html/embedded/" } diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownHtmlGenerationTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownHtmlGenerationTest.java index 338d2071856e..81cd290a244c 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownHtmlGenerationTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownHtmlGenerationTest.java @@ -1,12 +1,12 @@ package org.intellij.plugins.markdown.html; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.MarkdownTestingUtil; import org.intellij.plugins.markdown.ui.preview.MarkdownUtil; import org.jetbrains.annotations.NotNull; -public class MarkdownHtmlGenerationTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownHtmlGenerationTest extends BasePlatformTestCase { @NotNull @Override protected String getTestDataPath() { diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownPlantUMLTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownPlantUMLTest.java index d55279aef87f..fac83ff9dfbf 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownPlantUMLTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/html/MarkdownPlantUMLTest.java @@ -4,7 +4,7 @@ package org.intellij.plugins.markdown.html; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.testFramework.fixtures.TempDirTestFixture; import org.intellij.plugins.markdown.MarkdownTestingUtil; import org.intellij.plugins.markdown.settings.MarkdownSettingsConfigurable; @@ -13,7 +13,7 @@ import org.intellij.plugins.markdown.ui.preview.MarkdownUtil; import java.io.IOException; -public class MarkdownPlantUMLTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownPlantUMLTest extends BasePlatformTestCase { private static final String PLANTUML_TARGET_DIR = "plantuml"; protected TempDirTestFixture myFixture; diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/reference/LinkDestinationReferenceTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/reference/LinkDestinationReferenceTest.java index 061e0a1bf75d..a09a4a999e51 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/reference/LinkDestinationReferenceTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/reference/LinkDestinationReferenceTest.java @@ -5,11 +5,11 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiPolyVariantReference; import com.intellij.psi.PsiReference; import com.intellij.psi.impl.FakePsiElement; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.MarkdownTestingUtil; import org.jetbrains.annotations.NotNull; -public class LinkDestinationReferenceTest extends LightPlatformCodeInsightFixtureTestCase { +public class LinkDestinationReferenceTest extends BasePlatformTestCase { public static final Logger LOGGER = Logger.getInstance(LinkDestinationReferenceTest.class); diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/reference/UnresolvedLinkDestinationReferenceTest.kt b/plugins/markdown/test/src/org/intellij/plugins/markdown/reference/UnresolvedLinkDestinationReferenceTest.kt index bf42f33c55aa..8086343febd3 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/reference/UnresolvedLinkDestinationReferenceTest.kt +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/reference/UnresolvedLinkDestinationReferenceTest.kt @@ -1,10 +1,10 @@ package org.intellij.plugins.markdown.reference -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.intellij.plugins.markdown.MarkdownTestingUtil import org.intellij.plugins.markdown.lang.references.MarkdownUnresolvedFileReferenceInspection -class UnresolvedLinkDestinationReferenceTest : LightPlatformCodeInsightFixtureTestCase() { +class UnresolvedLinkDestinationReferenceTest : BasePlatformTestCase() { override fun getTestDataPath(): String = MarkdownTestingUtil.TEST_DATA_PATH + "/reference/linkDestination/" fun testUnresolvedReference() { diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/spellchecking/MarkdownSpellcheckerTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/spellchecking/MarkdownSpellcheckerTest.java index 0d302fa42ed3..769a604943fb 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/spellchecking/MarkdownSpellcheckerTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/spellchecking/MarkdownSpellcheckerTest.java @@ -1,10 +1,10 @@ package org.intellij.plugins.markdown.spellchecking; import com.intellij.spellchecker.inspections.SpellCheckingInspection; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.MarkdownTestingUtil; -public class MarkdownSpellcheckerTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownSpellcheckerTest extends BasePlatformTestCase { @Override protected void setUp() throws Exception { diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/structureView/MarkdownStructureViewTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/structureView/MarkdownStructureViewTest.java index 080968f7d837..734fa4ad0a1d 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/structureView/MarkdownStructureViewTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/structureView/MarkdownStructureViewTest.java @@ -2,14 +2,14 @@ package org.intellij.plugins.markdown.structureView; import com.intellij.openapi.ui.Queryable; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.ui.tree.TreeUtil; import org.intellij.plugins.markdown.MarkdownTestingUtil; import javax.swing.*; import javax.swing.tree.TreePath; -public class MarkdownStructureViewTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownStructureViewTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/todo/MarkdownTodoTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/todo/MarkdownTodoTest.java index 69f69784bf79..cd80eb9bcb77 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/todo/MarkdownTodoTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/todo/MarkdownTodoTest.java @@ -17,11 +17,11 @@ import com.intellij.ide.todo.TodoConfiguration; import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoAttributesUtil; import com.intellij.psi.search.TodoPattern; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.lang.MarkdownFileType; import org.jetbrains.annotations.NotNull; -public class MarkdownTodoTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownTodoTest extends BasePlatformTestCase { public void testTodo() { doTest("[//]: #a (todo comment)", 1); } diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/ui/preview/javafx/ImageRefreshFixTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/ui/preview/javafx/ImageRefreshFixTest.java index 65b53899676a..d1bb09bc076a 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/ui/preview/javafx/ImageRefreshFixTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/ui/preview/javafx/ImageRefreshFixTest.java @@ -4,11 +4,11 @@ import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.io.IOException; -public class ImageRefreshFixTest extends LightPlatformCodeInsightFixtureTestCase { +public class ImageRefreshFixTest extends BasePlatformTestCase { public void testSimple() throws IOException { final VirtualFile file = myFixture.getTempDirFixture().createFile("test.png"); diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/wrap/MarkdownWrapTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/wrap/MarkdownWrapTest.java index 1d6ff00bdeb9..67c13501a487 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/wrap/MarkdownWrapTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/wrap/MarkdownWrapTest.java @@ -4,12 +4,12 @@ package org.intellij.plugins.markdown.wrap; import com.intellij.application.options.CodeStyle; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.markdown.MarkdownTestingUtil; import org.intellij.plugins.markdown.lang.MarkdownLanguage; import org.jetbrains.annotations.NotNull; -public class MarkdownWrapTest extends LightPlatformCodeInsightFixtureTestCase { +public class MarkdownWrapTest extends BasePlatformTestCase { private boolean myOldWrap; private int myOldMargin; diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenTemplateFileProcessorTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenTemplateFileProcessorTest.java index 5842eaa96bd5..0614efc38acb 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenTemplateFileProcessorTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenTemplateFileProcessorTest.java @@ -18,7 +18,7 @@ package org.jetbrains.idea.maven.utils; import com.intellij.ide.util.projectWizard.ProjectTemplateParameterFactory; import com.intellij.platform.templates.SaveProjectAsTemplateAction; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.idea.maven.server.MavenServerManager; import java.util.Map; @@ -26,7 +26,7 @@ import java.util.Map; /** * @author Dmitry Avdeev */ -public class MavenTemplateFileProcessorTest extends LightPlatformCodeInsightFixtureTestCase { +public class MavenTemplateFileProcessorTest extends BasePlatformTestCase { private static final String TEXT = " */ -public abstract class TextMateAcceptanceTestCase extends LightPlatformCodeInsightFixtureTestCase { +public abstract class TextMateAcceptanceTestCase extends BasePlatformTestCase { private static final Set loadingBundles = newHashSet(TestUtil.MARKDOWN_TEXTMATE, TestUtil.HTML, TestUtil.LATEX, TestUtil.PHP, TestUtil.BAT, TestUtil.JAVASCRIPT); @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/YAMLBreadcrumbsTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/YAMLBreadcrumbsTest.java index cab965ff74c7..006411268fdf 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/YAMLBreadcrumbsTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/breadcrumbs/YAMLBreadcrumbsTest.java @@ -5,7 +5,7 @@ import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.CaretModel; import com.intellij.openapi.ide.CopyPasteManager; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.ui.components.breadcrumbs.Crumb; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.YAMLBundle; @@ -19,7 +19,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -public class YAMLBreadcrumbsTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLBreadcrumbsTest extends BasePlatformTestCase { private final String COPY_ACTION = YAMLBundle.message("YAMLBreadcrumbsInfoProvider.copy.key.to.clipboard"); @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLInteractiveLexingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLInteractiveLexingTest.java index eb4522be520e..5076286657cc 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLInteractiveLexingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLInteractiveLexingTest.java @@ -7,11 +7,11 @@ import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.highlighter.EditorHighlighter; import com.intellij.openapi.editor.highlighter.HighlighterIterator; import com.intellij.psi.tree.IElementType; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; /** Test interactive lexing in highlight while typing */ -public class YAMLInteractiveLexingTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLInteractiveLexingTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/editing/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLTypingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLTypingTest.java index ab86bf613253..11ac8d30777f 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLTypingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/editing/YAMLTypingTest.java @@ -5,12 +5,12 @@ import com.intellij.application.options.CodeStyle; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.ObjectUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.formatter.YAMLCodeStyleSettings; -public class YAMLTypingTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLTypingTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/editing/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/folding/YAMLFoldingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/folding/YAMLFoldingTest.java index 1835860f3085..c902b0e0634e 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/folding/YAMLFoldingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/folding/YAMLFoldingTest.java @@ -2,9 +2,9 @@ package org.jetbrains.yaml.folding; import com.intellij.openapi.application.ex.PathManagerEx; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; -public class YAMLFoldingTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLFoldingTest extends BasePlatformTestCase { public static final String RELATIVE_TEST_DATA_PATH = "/plugins/yaml/testSrc/org/jetbrains/yaml/"; public static final String TEST_DATA_PATH = PathManagerEx.getCommunityHomePath() + RELATIVE_TEST_DATA_PATH; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/YAMLFormattingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/YAMLFormattingTest.java index 42afef51fda5..b27c3c048f70 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/YAMLFormattingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/YAMLFormattingTest.java @@ -8,7 +8,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.YAMLLanguage; import org.jetbrains.yaml.formatter.YAMLCodeStyleSettings; @@ -20,7 +20,7 @@ import java.util.function.Consumer; * Answer files: {source}.{answerName}.txt * Source files: {source}.yml */ -public class YAMLFormattingTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLFormattingTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/formatting/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/YAMLHighlightingTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/YAMLHighlightingTest.java index 9bf390e880b1..ee9d63724618 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/YAMLHighlightingTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/YAMLHighlightingTest.java @@ -2,13 +2,13 @@ package org.jetbrains.yaml.highlighting; import com.intellij.openapi.application.ex.PathManagerEx; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.yaml.inspections.YAMLDuplicatedKeysInspection; import org.jetbrains.yaml.inspections.YAMLRecursiveAliasInspection; import org.jetbrains.yaml.inspections.YAMLUnresolvedAliasInspection; import org.jetbrains.yaml.inspections.YAMLUnusedAnchorInspection; -public class YAMLHighlightingTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLHighlightingTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/highlighting/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/intention/YAMLIntentionTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/intention/YAMLIntentionTest.java index a45373005341..12bbbbf0509c 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/intention/YAMLIntentionTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/intention/YAMLIntentionTest.java @@ -3,7 +3,7 @@ package org.jetbrains.yaml.intention; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.application.ex.PathManagerEx; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.inspections.YAMLDuplicatedKeysInspection; import org.jetbrains.yaml.inspections.YAMLUnusedAnchorInspection; @@ -11,7 +11,7 @@ import org.jetbrains.yaml.inspections.YAMLUnusedAnchorInspection; import java.util.List; import java.util.Optional; -public class YAMLIntentionTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLIntentionTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/intention/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/YAMLCopyReferenceTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/YAMLCopyReferenceTest.java index 91f527529425..f4eb01633c17 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/YAMLCopyReferenceTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/YAMLCopyReferenceTest.java @@ -7,7 +7,7 @@ import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.psi.YAMLFile; @@ -15,7 +15,7 @@ import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; -public class YAMLCopyReferenceTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLCopyReferenceTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/navigation/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java index c6fd13e95e79..122f11dfde5d 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java @@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.ObjectUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -17,7 +17,7 @@ import java.awt.datatransfer.StringSelection; *

* Note: some tests have different insert string to check regexp pattern */ -public class YAMLKeyPasteTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLKeyPasteTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLPasteTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLPasteTest.java index 0b02b2d18f8c..22ff99cf1670 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLPasteTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLPasteTest.java @@ -6,13 +6,13 @@ import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.ObjectUtils; import org.jetbrains.annotations.NotNull; import java.awt.datatransfer.StringSelection; -public abstract class YAMLPasteTest extends LightPlatformCodeInsightFixtureTestCase { +public abstract class YAMLPasteTest extends BasePlatformTestCase { private static final String ZERO_INDENT_SAMPLE = "key1:\n" + " subKey: val1\n" + "\n" + diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java index 201e35771639..2e099e34b419 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java @@ -4,10 +4,10 @@ package org.jetbrains.yaml.psi; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.yaml.YAMLParserDefinition; -public class YAMLScalarContentTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLScalarContentTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarLiteralEscaperTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarLiteralEscaperTest.java index c11f0dd999d9..ff554973ed71 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarLiteralEscaperTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarLiteralEscaperTest.java @@ -7,12 +7,12 @@ import com.intellij.psi.LiteralTextEscaper; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLanguageInjectionHost; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.yaml.YAMLParserDefinition; import java.util.Arrays; -public class YAMLScalarLiteralEscaperTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLScalarLiteralEscaperTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/YAMLMappingModificationTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/YAMLMappingModificationTest.java index 92317dc2403d..b9b2f18b1a08 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/YAMLMappingModificationTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/YAMLMappingModificationTest.java @@ -5,14 +5,14 @@ import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.yaml.YAMLElementGenerator; import org.jetbrains.yaml.YAMLUtil; import org.jetbrains.yaml.psi.YAMLFile; import org.jetbrains.yaml.psi.YAMLKeyValue; import org.jetbrains.yaml.psi.YAMLMapping; -public class YAMLMappingModificationTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLMappingModificationTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/psiModification/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/refactoring/rename/YamlKeyValueRenameInputValidatorTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/refactoring/rename/YamlKeyValueRenameInputValidatorTest.java index 4e83fbf4abda..df94d0afea63 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/refactoring/rename/YamlKeyValueRenameInputValidatorTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/refactoring/rename/YamlKeyValueRenameInputValidatorTest.java @@ -1,10 +1,10 @@ package org.jetbrains.yaml.refactoring.rename; import com.intellij.refactoring.rename.RenameInputValidatorEx; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; -public final class YamlKeyValueRenameInputValidatorTest extends LightPlatformCodeInsightFixtureTestCase { +public final class YamlKeyValueRenameInputValidatorTest extends BasePlatformTestCase { private static final RenameInputValidatorEx INPUT_VALIDATOR = new YamlKeyValueRenameInputValidator(); public void testInvalidNames() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLRenameTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLRenameTest.java index 5c0ff95ae90d..2ac2ccc0ab26 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLRenameTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLRenameTest.java @@ -4,13 +4,13 @@ package org.jetbrains.yaml.resolve; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.util.io.FileUtil; import com.intellij.refactoring.BaseRefactoringProcessor; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; -public class YAMLRenameTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLRenameTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLResolveTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLResolveTest.java index af7d39aecfe8..6d3883ebec74 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLResolveTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLResolveTest.java @@ -7,12 +7,12 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtilCore; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import java.util.*; -public class YAMLResolveTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLResolveTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsageViewTreeTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsageViewTreeTest.java index b2c0957c1810..6ec8e3e88913 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsageViewTreeTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsageViewTreeTest.java @@ -7,14 +7,14 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.YAMLTextUtil; import java.util.*; import java.util.stream.Collectors; -public class YAMLUsageViewTreeTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLUsageViewTreeTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsagesHighlighterTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsagesHighlighterTest.java index 35e5ddc3719b..e7611a2d042c 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsagesHighlighterTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/YAMLUsagesHighlighterTest.java @@ -10,12 +10,12 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.util.TextRange; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.containers.ContainerUtil; import java.util.*; -public class YAMLUsagesHighlighterTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLUsagesHighlighterTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/resolve/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java index 36bd1ccb8c03..1b278a9cda0a 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java @@ -9,7 +9,7 @@ import com.intellij.psi.ElementManipulator; import com.intellij.psi.ElementManipulators; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.yaml.YAMLParserDefinition; import org.jetbrains.yaml.psi.YAMLScalar; import org.jetbrains.yaml.psi.impl.YAMLPlainTextImpl; @@ -18,7 +18,7 @@ import java.io.File; import java.io.IOException; import java.util.Collection; -public class YAMLScalarConversionTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLScalarConversionTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/search/YAMLSearchEverywhereTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/search/YAMLSearchEverywhereTest.java index b045984dfb48..d127e48b29a9 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/search/YAMLSearchEverywhereTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/search/YAMLSearchEverywhereTest.java @@ -8,7 +8,7 @@ import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.DumbServiceImpl; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiElement; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.YAMLUtil; import org.jetbrains.yaml.navigation.YAMLKeyNavigationItem; @@ -18,7 +18,7 @@ import org.jetbrains.yaml.psi.YAMLPsiElement; import java.io.IOException; import java.util.List; -public class YAMLSearchEverywhereTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLSearchEverywhereTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/search/data/"; diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/structure/YAMLStructureTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/structure/YAMLStructureTest.java index 7a8bccaae9b2..2db1cf7b84da 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/structure/YAMLStructureTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/structure/YAMLStructureTest.java @@ -3,13 +3,13 @@ package org.jetbrains.yaml.structure; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.yaml.structureView.YAMLAliasResolveNodeProvider; import javax.swing.tree.TreePath; -public class YAMLStructureTest extends LightPlatformCodeInsightFixtureTestCase { +public class YAMLStructureTest extends BasePlatformTestCase { @Override protected String getTestDataPath() { return PathManagerEx.getCommunityHomePath() + "/plugins/yaml/testSrc/org/jetbrains/yaml/structure/data/"; diff --git a/python/rest/tests/com/jetbrains/rest/RestFormatterTest.kt b/python/rest/tests/com/jetbrains/rest/RestFormatterTest.kt index f772e196fb97..b9435cdb6e51 100644 --- a/python/rest/tests/com/jetbrains/rest/RestFormatterTest.kt +++ b/python/rest/tests/com/jetbrains/rest/RestFormatterTest.kt @@ -17,9 +17,9 @@ package com.jetbrains.rest import com.intellij.openapi.command.WriteCommandAction import com.intellij.psi.codeStyle.CodeStyleManager -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class RestFormatterTest : LightPlatformCodeInsightFixtureTestCase() { +class RestFormatterTest : BasePlatformTestCase() { fun `test directive`() { doTest() diff --git a/python/rest/tests/com/jetbrains/rest/RestStructureViewTest.kt b/python/rest/tests/com/jetbrains/rest/RestStructureViewTest.kt index d2915ccef856..0ef1ad5de1d0 100644 --- a/python/rest/tests/com/jetbrains/rest/RestStructureViewTest.kt +++ b/python/rest/tests/com/jetbrains/rest/RestStructureViewTest.kt @@ -3,9 +3,9 @@ package com.jetbrains.rest import com.intellij.testFramework.PlatformTestUtil import com.intellij.testFramework.PlatformTestUtil.assertTreeEqual -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class RestStructureViewTest : LightPlatformCodeInsightFixtureTestCase() { +class RestStructureViewTest : BasePlatformTestCase() { fun `test plain structure`() { doTest("-plain structure.rst\n" + diff --git a/python/rest/tests/com/jetbrains/rest/RestTitleAnnotatorTest.kt b/python/rest/tests/com/jetbrains/rest/RestTitleAnnotatorTest.kt index 9b5c8142232b..83fa454fab5d 100644 --- a/python/rest/tests/com/jetbrains/rest/RestTitleAnnotatorTest.kt +++ b/python/rest/tests/com/jetbrains/rest/RestTitleAnnotatorTest.kt @@ -1,9 +1,9 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.jetbrains.rest -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.BasePlatformTestCase -class RestTitleAnnotatorTest : LightPlatformCodeInsightFixtureTestCase() { +class RestTitleAnnotatorTest : BasePlatformTestCase() { fun `test underline match overline`() { doTest("----------------\n" + "``a_function()``\n" + diff --git a/python/rest/tests/com/jetbrains/rest/RestTodoTest.java b/python/rest/tests/com/jetbrains/rest/RestTodoTest.java index 44663bda620b..77910df022ee 100644 --- a/python/rest/tests/com/jetbrains/rest/RestTodoTest.java +++ b/python/rest/tests/com/jetbrains/rest/RestTodoTest.java @@ -17,12 +17,12 @@ package com.jetbrains.rest; import com.intellij.psi.search.PsiTodoSearchHelper; import com.intellij.psi.search.TodoItem; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author traff */ -public class RestTodoTest extends LightPlatformCodeInsightFixtureTestCase { +public class RestTodoTest extends BasePlatformTestCase { public void testTodo() { myFixture.configureByText(RestFileType.INSTANCE, ".. TODO whatever \n"); TodoItem[] items = PsiTodoSearchHelper.SERVICE.getInstance(getProject()).findTodoItems(myFixture.getFile()); diff --git a/spellchecker/testSrc/com/intellij/spellchecker/inspection/SpellcheckerInspectionTestCase.java b/spellchecker/testSrc/com/intellij/spellchecker/inspection/SpellcheckerInspectionTestCase.java index 68e5f16f6275..46be877dc05e 100644 --- a/spellchecker/testSrc/com/intellij/spellchecker/inspection/SpellcheckerInspectionTestCase.java +++ b/spellchecker/testSrc/com/intellij/spellchecker/inspection/SpellcheckerInspectionTestCase.java @@ -17,9 +17,9 @@ package com.intellij.spellchecker.inspection; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.spellchecker.inspections.SpellCheckingInspection; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; -public abstract class SpellcheckerInspectionTestCase extends LightPlatformCodeInsightFixtureTestCase { +public abstract class SpellcheckerInspectionTestCase extends BasePlatformTestCase { @Override protected boolean isCommunity() { return true; diff --git a/spellchecker/testSrc/com/intellij/spellchecker/inspector/AcceptWordAsCorrectTest.java b/spellchecker/testSrc/com/intellij/spellchecker/inspector/AcceptWordAsCorrectTest.java index 1888d00a224a..0a1f723a13f4 100644 --- a/spellchecker/testSrc/com/intellij/spellchecker/inspector/AcceptWordAsCorrectTest.java +++ b/spellchecker/testSrc/com/intellij/spellchecker/inspector/AcceptWordAsCorrectTest.java @@ -8,14 +8,14 @@ import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.spellchecker.SpellCheckerManager; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.util.Collections; import static com.intellij.spellchecker.SpellCheckerManager.DictionaryLevel.PROJECT; @SuppressWarnings("SpellCheckingInspection") -public class AcceptWordAsCorrectTest extends LightPlatformCodeInsightFixtureTestCase { +public class AcceptWordAsCorrectTest extends BasePlatformTestCase { public static final String TYPPO = "typpppo"; public static final String TEST_TXT = "test.txt"; diff --git a/spellchecker/testSrc/com/intellij/spellchecker/inspector/SuggestionTest.java b/spellchecker/testSrc/com/intellij/spellchecker/inspector/SuggestionTest.java index a087d505eac3..179a7bbee1dd 100644 --- a/spellchecker/testSrc/com/intellij/spellchecker/inspector/SuggestionTest.java +++ b/spellchecker/testSrc/com/intellij/spellchecker/inspector/SuggestionTest.java @@ -17,12 +17,12 @@ package com.intellij.spellchecker.inspector; import com.intellij.spellchecker.SpellCheckerManager; import com.intellij.spellchecker.settings.SpellCheckerSettings; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.util.List; @SuppressWarnings("SpellCheckingInspection") -public class SuggestionTest extends LightPlatformCodeInsightFixtureTestCase { +public class SuggestionTest extends BasePlatformTestCase { public static final String TYPPPO = "Typppo"; diff --git a/spellchecker/testSrc/com/intellij/spellchecker/ui/SpellCheckingEditorCustomizationTest.java b/spellchecker/testSrc/com/intellij/spellchecker/ui/SpellCheckingEditorCustomizationTest.java index 8da5940087bd..45ba8667d756 100644 --- a/spellchecker/testSrc/com/intellij/spellchecker/ui/SpellCheckingEditorCustomizationTest.java +++ b/spellchecker/testSrc/com/intellij/spellchecker/ui/SpellCheckingEditorCustomizationTest.java @@ -20,11 +20,11 @@ import com.intellij.openapi.editor.SpellCheckingEditorCustomizationProvider; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.fileTypes.PlainTextFileType; import com.intellij.spellchecker.inspections.SpellCheckingInspection; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.ui.EditorCustomization; @SuppressWarnings("SpellCheckingInspection") -public class SpellCheckingEditorCustomizationTest extends LightPlatformCodeInsightFixtureTestCase { +public class SpellCheckingEditorCustomizationTest extends BasePlatformTestCase { public void testEnabled() { doTest(true, "missspelling"); } diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomSaxParserTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomSaxParserTest.java index b481ac1c51ba..9bb77335892f 100644 --- a/xml/dom-tests/tests/com/intellij/util/xml/DomSaxParserTest.java +++ b/xml/dom-tests/tests/com/intellij/util/xml/DomSaxParserTest.java @@ -19,13 +19,13 @@ import com.intellij.lang.xml.XMLLanguage; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; import com.intellij.psi.xml.XmlFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.Nullable; /** * @author peter */ -public class DomSaxParserTest extends LightPlatformCodeInsightFixtureTestCase { +public class DomSaxParserTest extends BasePlatformTestCase { public void testGetRootTagNameWithoutNamespace() { assertData("", "root", null, null, null); diff --git a/xml/tests/src/com/intellij/codeInsight/SoftWrapTest.java b/xml/tests/src/com/intellij/codeInsight/SoftWrapTest.java index 2c74aa7f42e6..21546a9f45ad 100644 --- a/xml/tests/src/com/intellij/codeInsight/SoftWrapTest.java +++ b/xml/tests/src/com/intellij/codeInsight/SoftWrapTest.java @@ -17,12 +17,12 @@ package com.intellij.codeInsight; import com.intellij.injected.editor.EditorWindow; import com.intellij.testFramework.EditorTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author Dmitry Avdeev */ -public class SoftWrapTest extends LightPlatformCodeInsightFixtureTestCase { +public class SoftWrapTest extends BasePlatformTestCase { public void testSoftWrapInInjection() { diff --git a/xml/tests/src/com/intellij/codeInsight/XmlDocumentationTest.java b/xml/tests/src/com/intellij/codeInsight/XmlDocumentationTest.java index b8f8e416e954..618b49a739ee 100644 --- a/xml/tests/src/com/intellij/codeInsight/XmlDocumentationTest.java +++ b/xml/tests/src/com/intellij/codeInsight/XmlDocumentationTest.java @@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,7 +34,7 @@ import java.io.File; * @author maxim */ @SuppressWarnings("ConstantConditions") -public class XmlDocumentationTest extends LightPlatformCodeInsightFixtureTestCase { +public class XmlDocumentationTest extends BasePlatformTestCase { public void testXmlDoc() { doOneTest("1.xml", "display-name", false, "web-app_2_3.dtd"); diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java index 98032a709ee6..47a4b7244eab 100644 --- a/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java +++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java @@ -19,7 +19,7 @@ import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.javaee.ExternalResourceManagerExImpl; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.containers.ContainerUtil; import java.io.File; @@ -29,7 +29,7 @@ import java.util.List; /** * @author Dmitry Avdeev */ -public class XmlSmartCompletionTest extends LightPlatformCodeInsightFixtureTestCase { +public class XmlSmartCompletionTest extends BasePlatformTestCase { public void testCompletion() { doTest(new String[]{"testCompletion.xml", "test.xsd"}, "b"); diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagTest.java index 92db7f55b0a5..ee8aafee8188 100644 --- a/xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagTest.java +++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagTest.java @@ -17,12 +17,12 @@ package com.intellij.codeInsight.completion; import com.intellij.ide.highlighter.XmlFileType; import com.intellij.openapi.fileTypes.FileType; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author Dennis.Ushakov */ -public abstract class XmlSyncTagTest extends LightPlatformCodeInsightFixtureTestCase { +public abstract class XmlSyncTagTest extends BasePlatformTestCase { @Override protected void setUp() throws Exception { super.setUp(); diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java index 913783192d05..fe50f69bec4f 100644 --- a/xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java +++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java @@ -22,12 +22,12 @@ import com.intellij.ide.highlighter.HtmlFileType; import com.intellij.ide.highlighter.XmlFileType; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.formatter.xml.HtmlCodeStyleSettings; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; /** * @author Dmitry Avdeev */ -public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCase { +public class XmlTypedHandlersTest extends BasePlatformTestCase { public void testClosingTag() { doTest("<", '/', ""); } diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlInspectionsTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlInspectionsTest.java index 74417564ac8d..830577a8e783 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlInspectionsTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlInspectionsTest.java @@ -21,14 +21,14 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.ide.highlighter.HtmlFileType; import com.intellij.ide.highlighter.XmlFileType; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.io.File; /** * @author Dmitry Avdeev */ -public class XmlInspectionsTest extends LightPlatformCodeInsightFixtureTestCase { +public class XmlInspectionsTest extends BasePlatformTestCase { public void testDefaultAttributeValue() { myFixture.enableInspections(new XmlDefaultAttributeValueInspection()); diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlSimpleHighlightingTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlSimpleHighlightingTest.java index 8f764830c251..895a64e21a88 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlSimpleHighlightingTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlSimpleHighlightingTest.java @@ -2,10 +2,10 @@ package com.intellij.codeInsight.daemon; import com.intellij.ide.highlighter.XmlFileType; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.xml.util.CheckXmlFileWithXercesValidatorInspection; -public class XmlSimpleHighlightingTest extends LightPlatformCodeInsightFixtureTestCase { +public class XmlSimpleHighlightingTest extends BasePlatformTestCase { public void testCannotFindDeclaration() { checkValidation("\n" + diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/CollapseTagTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/CollapseTagTest.java index 8db30f708b56..91a6512cf80b 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/CollapseTagTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/CollapseTagTest.java @@ -19,14 +19,14 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.ide.highlighter.XmlFileType; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.xml.util.CheckTagEmptyBodyInspection; import com.intellij.xml.util.CollapseTagIntention; /** * @author Dmitry Avdeev */ -public class CollapseTagTest extends LightPlatformCodeInsightFixtureTestCase{ +public class CollapseTagTest extends BasePlatformTestCase { public void testAvailable() { PsiFile file = myFixture.configureByText(XmlFileType.INSTANCE, " "); diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/RealFetchTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/RealFetchTest.java index c7c82d9334ab..83710ef1d1eb 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/RealFetchTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/RealFetchTest.java @@ -8,8 +8,7 @@ import com.intellij.javaee.ExternalResourceManager; import com.intellij.javaee.ExternalResourceManagerExImpl; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.xml.XmlBundle; import java.util.List; @@ -17,7 +16,7 @@ import java.util.List; /** * @author Dmitry Avdeev */ -public class RealFetchTest extends LightPlatformCodeInsightFixtureTestCase { +public class RealFetchTest extends BasePlatformTestCase { public void testFetchDtd() { final String url = "http://java.sun.com/dtd/preferences.dtd"; diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/XmlQuickFixTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/XmlQuickFixTest.java index 91838e2ee9ba..f08f1e694b4b 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/XmlQuickFixTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/XmlQuickFixTest.java @@ -9,11 +9,11 @@ import com.intellij.openapi.fileTypes.PlainTextLanguage; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLanguageInjectionHost; import com.intellij.psi.xml.XmlFile; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.plugins.intelliLang.inject.LanguageInjectionSupport; import org.intellij.plugins.intelliLang.inject.TemporaryPlacesRegistry; -public class XmlQuickFixTest extends LightPlatformCodeInsightFixtureTestCase { +public class XmlQuickFixTest extends BasePlatformTestCase { public void testEscapeAmpersandInInjected() { XmlFile file = (XmlFile)myFixture.configureByText(XmlFileType.INSTANCE, "\"/>"); diff --git a/xml/tests/src/com/intellij/codeInspection/htmlInspections/HtmlMissingClosingTagInspectionTest.java b/xml/tests/src/com/intellij/codeInspection/htmlInspections/HtmlMissingClosingTagInspectionTest.java index 323813c0e30a..4eb5123fba3a 100644 --- a/xml/tests/src/com/intellij/codeInspection/htmlInspections/HtmlMissingClosingTagInspectionTest.java +++ b/xml/tests/src/com/intellij/codeInspection/htmlInspections/HtmlMissingClosingTagInspectionTest.java @@ -23,7 +23,7 @@ import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.ide.highlighter.HtmlFileType; import com.intellij.openapi.project.Project; import com.intellij.profile.codeInspection.ProjectInspectionProfileManager; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; import org.junit.Assert; @@ -34,7 +34,7 @@ import java.util.stream.Collectors; /** * @author Bas Leijdekkers */ -public class HtmlMissingClosingTagInspectionTest extends LightPlatformCodeInsightFixtureTestCase { +public class HtmlMissingClosingTagInspectionTest extends BasePlatformTestCase { public void testImgElement() { highlightTest(""); diff --git a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java index e09a566a7aca..16b268692169 100644 --- a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java +++ b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java @@ -19,7 +19,7 @@ import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.javaee.ExternalResourceManagerEx; import com.intellij.javaee.XMLCatalogConfigurable; import com.intellij.javaee.XMLCatalogManager; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import org.apache.xml.resolver.CatalogManager; import java.io.File; @@ -31,7 +31,7 @@ import java.util.Vector; * @author Dmitry Avdeev */ @SuppressWarnings("UseOfObsoleteCollectionType") -public class XMLCatalogManagerTest extends LightPlatformCodeInsightFixtureTestCase { +public class XMLCatalogManagerTest extends BasePlatformTestCase { public void testCatalogManager() throws Exception { XMLCatalogManager manager = getManager(); diff --git a/xml/tests/src/com/intellij/xml/XmlEntityManagerCachingTest.java b/xml/tests/src/com/intellij/xml/XmlEntityManagerCachingTest.java index 4e0120879aed..a1a2bb6b8231 100644 --- a/xml/tests/src/com/intellij/xml/XmlEntityManagerCachingTest.java +++ b/xml/tests/src/com/intellij/xml/XmlEntityManagerCachingTest.java @@ -17,7 +17,7 @@ package com.intellij.xml; import com.intellij.javaee.ExternalResourceManagerExImpl; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.xml.util.CheckXmlFileWithXercesValidatorInspection; import java.io.File; @@ -25,7 +25,7 @@ import java.io.File; /** * @author ibessonov */ -public class XmlEntityManagerCachingTest extends LightPlatformCodeInsightFixtureTestCase { +public class XmlEntityManagerCachingTest extends BasePlatformTestCase { public void testXmlEntityManagerCaching() { ExternalResourceManagerExImpl.registerResourceTemporarily("http://dl.google.com/gwt/DTD/xhtml.ent", diff --git a/xml/tests/src/com/intellij/xml/XmlFoldingTest.java b/xml/tests/src/com/intellij/xml/XmlFoldingTest.java index 88c56a659239..7383ca8f4e40 100644 --- a/xml/tests/src/com/intellij/xml/XmlFoldingTest.java +++ b/xml/tests/src/com/intellij/xml/XmlFoldingTest.java @@ -16,11 +16,11 @@ package com.intellij.xml; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.io.File; -public class XmlFoldingTest extends LightPlatformCodeInsightFixtureTestCase { +public class XmlFoldingTest extends BasePlatformTestCase { public void testTagFolding() { doTest(); } diff --git a/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java b/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java index 437e9516573a..02a5423f16df 100644 --- a/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java +++ b/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java @@ -18,14 +18,14 @@ package com.intellij.xml.actions; import com.intellij.javaee.ExternalResourceManagerExImpl; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; -import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.BasePlatformTestCase; import java.io.File; /** * @author Dmitry Avdeev */ -public class GenerateXmlTagTest extends LightPlatformCodeInsightFixtureTestCase { +public class GenerateXmlTagTest extends BasePlatformTestCase { public void testGenerate() { myFixture.configureByFile("web-app_2_5.xsd");