diff --git a/java/compiler/tests/com/intellij/compiler/artifacts/ArtifactsTestCase.java b/java/compiler/tests/com/intellij/compiler/artifacts/ArtifactsTestCase.java index 80473a19dd08..283d36c58cb3 100644 --- a/java/compiler/tests/com/intellij/compiler/artifacts/ArtifactsTestCase.java +++ b/java/compiler/tests/com/intellij/compiler/artifacts/ArtifactsTestCase.java @@ -38,7 +38,7 @@ import com.intellij.packaging.impl.artifacts.PlainArtifactType; import com.intellij.packaging.impl.elements.ManifestFileUtil; import com.intellij.packaging.ui.ArtifactEditor; import com.intellij.packaging.ui.ManifestFileConfiguration; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.testFramework.PsiTestUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -49,7 +49,7 @@ import java.util.*; /** * @author nik */ -public abstract class ArtifactsTestCase extends IdeaTestCase { +public abstract class ArtifactsTestCase extends JavaProjectTestCase { protected boolean mySetupModule; protected ArtifactManager getArtifactManager() { @@ -98,7 +98,7 @@ public abstract class ArtifactsTestCase extends IdeaTestCase { public static void renameFile(final VirtualFile file, final String newName) { try { - WriteAction.runAndWait(() -> file.rename(IdeaTestCase.class, newName)); + WriteAction.runAndWait(() -> file.rename(JavaProjectTestCase.class, newName)); } catch (IOException e) { throw new RuntimeException(e); diff --git a/java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java b/java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java index 7b8ceb0b0212..0b2d7e82584f 100644 --- a/java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java +++ b/java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java @@ -36,7 +36,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -public abstract class BaseConfigurationTestCase extends IdeaTestCase { +public abstract class BaseConfigurationTestCase extends JavaProjectTestCase { private final List myModulesToDispose = new ArrayList<>(); @Override diff --git a/java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/DirectoryIndexRestoreTest.java b/java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/DirectoryIndexRestoreTest.java index b78b2ccb727d..1c41c3c6d0b6 100644 --- a/java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/DirectoryIndexRestoreTest.java +++ b/java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/DirectoryIndexRestoreTest.java @@ -8,10 +8,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.testFramework.IdeaTestCase; -import com.intellij.testFramework.PlatformTestCase; -import com.intellij.testFramework.PsiTestUtil; -import com.intellij.testFramework.VfsTestUtil; +import com.intellij.testFramework.*; import java.io.File; import java.io.IOException; @@ -19,7 +16,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @PlatformTestCase.WrapInCommand -public class DirectoryIndexRestoreTest extends IdeaTestCase { +public class DirectoryIndexRestoreTest extends JavaProjectTestCase { private VirtualFile myTempVFile; private String myTestDirPath; diff --git a/java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/ProjectLibrariesTest.java b/java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/ProjectLibrariesTest.java index 119ebb844604..1ef0491a8e8d 100644 --- a/java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/ProjectLibrariesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/ProjectLibrariesTest.java @@ -28,14 +28,14 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import java.util.Arrays; /** * @author dsl */ -public class ProjectLibrariesTest extends IdeaTestCase { +public class ProjectLibrariesTest extends JavaProjectTestCase { private VirtualFile myRoot; private Library myLib; diff --git a/java/java-tests/testSrc/com/intellij/java/openapi/vfs/changes/PsiChangeTrackerTest.java b/java/java-tests/testSrc/com/intellij/java/openapi/vfs/changes/PsiChangeTrackerTest.java index ce934227a986..f9e1e8367412 100644 --- a/java/java-tests/testSrc/com/intellij/java/openapi/vfs/changes/PsiChangeTrackerTest.java +++ b/java/java-tests/testSrc/com/intellij/java/openapi/vfs/changes/PsiChangeTrackerTest.java @@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.util.PsiFilter; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import java.io.File; import java.util.HashMap; @@ -33,7 +33,7 @@ import java.util.Map; /** * @author Konstantin Bulenkov */ -public class PsiChangeTrackerTest extends IdeaTestCase { +public class PsiChangeTrackerTest extends JavaProjectTestCase { private PsiFile myOriginalFile; private PsiFile myChangedFile; diff --git a/java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java b/java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java index 30c5b62a0fb6..cfdb667b3995 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiClass; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.testFramework.PsiTestUtil; import java.io.File; @@ -30,7 +30,7 @@ import java.io.File; /** * @author max */ -public class ClassFileUnderSourceRootTest extends IdeaTestCase { +public class ClassFileUnderSourceRootTest extends JavaProjectTestCase { @Override protected void setUp() throws Exception { super.setUp(); diff --git a/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java b/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java index 908706e287af..f898e783a493 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java @@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.testFramework.PsiTestUtil; import java.io.File; @@ -36,7 +36,7 @@ import java.io.File; /** * @author dsl */ -public class ExportingModulesTest extends IdeaTestCase { +public class ExportingModulesTest extends JavaProjectTestCase { public void test1() { final String rootPath = PathManagerEx.getTestDataPath().replace(File.separatorChar, '/') + "/moduleRootManager/exportedModules/"; final VirtualFile testRoot = LocalFileSystem.getInstance().refreshAndFindFileByPath(rootPath); diff --git a/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java b/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java index f4454db92bfb..09f54d40602a 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java @@ -23,14 +23,14 @@ import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.testFramework.PsiTestUtil; import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; -public class ManagingContentRootFoldersTest extends IdeaTestCase { +public class ManagingContentRootFoldersTest extends JavaProjectTestCase { private VirtualFile root; private ContentEntry entry; private ModifiableRootModel myModel; diff --git a/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootsTest.java b/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootsTest.java index c14a41bc80b1..e274febec963 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootsTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootsTest.java @@ -23,7 +23,7 @@ import com.intellij.openapi.roots.impl.ModuleRootManagerImpl; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.testFramework.PsiTestUtil; import org.jdom.Element; import org.jdom.JDOMException; @@ -32,7 +32,7 @@ import java.io.IOException; import static com.intellij.testFramework.assertions.Assertions.assertThat; -public class ManagingContentRootsTest extends IdeaTestCase { +public class ManagingContentRootsTest extends JavaProjectTestCase { private VirtualFile dir; @Override diff --git a/java/testFramework/src/com/intellij/execution/ExecutionTestCase.java b/java/testFramework/src/com/intellij/execution/ExecutionTestCase.java index 286754c49b03..3a172651d228 100644 --- a/java/testFramework/src/com/intellij/execution/ExecutionTestCase.java +++ b/java/testFramework/src/com/intellij/execution/ExecutionTestCase.java @@ -29,7 +29,7 @@ import java.io.File; import java.util.Arrays; import java.util.List; -public abstract class ExecutionTestCase extends IdeaTestCase { +public abstract class ExecutionTestCase extends JavaProjectTestCase { private OutputChecker myChecker; private int myTimeout; private static File ourOutputRoot; diff --git a/java/testFramework/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java b/java/testFramework/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java index 96e41c4a5f63..674ca97335c2 100644 --- a/java/testFramework/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java +++ b/java/testFramework/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java @@ -19,7 +19,7 @@ import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.testFramework.PsiTestUtil; import org.jetbrains.annotations.NotNull; @@ -29,7 +29,7 @@ import java.util.*; /** * @author nik */ -public abstract class FrameworkSupportProviderTestCase extends IdeaTestCase { +public abstract class FrameworkSupportProviderTestCase extends JavaProjectTestCase { private FrameworkSupportModelBase myFrameworkSupportModel; private Map myConfigurables; private Map myNodes; diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java index 787125a9aded..714562eba836 100644 --- a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java @@ -2,7 +2,8 @@ package com.intellij.testFramework; /** - * @author mike + * @deprecated name of this class may be confusing, extend {@link JavaProjectTestCase} instead */ +@Deprecated public abstract class IdeaTestCase extends JavaProjectTestCase { } diff --git a/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java b/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java index 8ecec2dbce80..50705f13a190 100644 --- a/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java @@ -42,7 +42,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -public abstract class ModuleTestCase extends IdeaTestCase { +public abstract class ModuleTestCase extends JavaProjectTestCase { protected final Collection myModulesToDispose = new ArrayList<>(); @Override diff --git a/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java index 2d1f8f7d101d..97b2df7ec2e7 100644 --- a/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java @@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable; import java.io.File; @SuppressWarnings({"HardCodedStringLiteral", "ConstantConditions", "JUnitTestCaseInProductSource"}) -@NonNls public abstract class TestSourceBasedTestCase extends IdeaTestCase { +@NonNls public abstract class TestSourceBasedTestCase extends JavaProjectTestCase { private File myTempDirectory; @Override diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/build/GenerateAntTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/build/GenerateAntTest.java index 94defe7f1e2f..df0916b1ff6f 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/build/GenerateAntTest.java +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/build/GenerateAntTest.java @@ -25,7 +25,7 @@ import com.intellij.psi.XmlElementFactory; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlTag; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.testFramework.PsiTestUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.idea.devkit.build.ant.BuildJarTarget; @@ -33,7 +33,7 @@ import org.jetbrains.idea.devkit.build.ant.BuildJarTarget; import java.io.PrintWriter; import java.io.StringWriter; -public class GenerateAntTest extends IdeaTestCase { +public class GenerateAntTest extends JavaProjectTestCase { public void testP1() throws Exception { final VirtualFile parent = myModule.getModuleFile().getParent(); assertNotNull(parent); diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java index e95eb45f9c37..2f73077a6ab6 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java @@ -6,14 +6,14 @@ import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.testFramework.PsiTestUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import java.io.File; -public abstract class Eclipse2ModulesTest extends IdeaTestCase { +public abstract class Eclipse2ModulesTest extends JavaProjectTestCase { @NonNls protected static final String DEPEND_MODULE_NAME = "ws-internals"; private String myDependantModulePath = "ws-internals"; diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java index b093c65ef7cc..528164fc44e3 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java @@ -18,7 +18,7 @@ import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import org.jdom.Element; import org.jdom.JDOMException; import org.jetbrains.annotations.NotNull; @@ -31,7 +31,7 @@ import java.io.IOException; import static com.intellij.testFramework.assertions.Assertions.assertThat; -public class EclipseClasspathTest extends IdeaTestCase { +public class EclipseClasspathTest extends JavaProjectTestCase { @Override protected void setUp() throws Exception { super.setUp(); diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java index 02fcc4279b12..5ea1735c4fb1 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import org.jdom.Element; import org.jdom.JDOMException; import org.jetbrains.annotations.NotNull; @@ -33,7 +33,7 @@ import java.nio.file.Paths; import static com.intellij.testFramework.assertions.Assertions.assertThat; -public class EclipseEmlTest extends IdeaTestCase { +public class EclipseEmlTest extends JavaProjectTestCase { @Override protected void setUp() throws Exception { super.setUp(); diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java index bd9862058a70..753753690e6c 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.project.IntelliJProjectConfiguration; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import org.jdom.Element; @@ -34,7 +34,7 @@ import java.nio.file.Paths; import static com.intellij.testFramework.assertions.Assertions.assertThat; -public class EclipseImlTest extends IdeaTestCase { +public class EclipseImlTest extends JavaProjectTestCase { @Override protected void setUp() throws Exception { super.setUp(); diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseVarsTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseVarsTest.java index 2eb37283bfed..729335cc7538 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseVarsTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseVarsTest.java @@ -6,12 +6,12 @@ import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import org.jetbrains.annotations.NonNls; import java.io.File; -public abstract class EclipseVarsTest extends IdeaTestCase { +public abstract class EclipseVarsTest extends JavaProjectTestCase { @NonNls private static final String VARIABLE = "variable"; @NonNls private static final String SRCVARIABLE = "srcvariable"; diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java index 1f458cbf6fa6..bba487fa4df3 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java @@ -18,14 +18,14 @@ package org.jetbrains.idea.maven.execution; import com.google.common.collect.ImmutableMap; import com.intellij.configurationStore.XmlSerializer; import com.intellij.openapi.options.ConfigurationException; -import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.JavaProjectTestCase; import org.jdom.Element; import org.jetbrains.idea.maven.project.MavenGeneralSettings; import org.jetbrains.idea.maven.server.MavenServerManager; import java.util.Arrays; -public class MavenRunConfigurationTest extends IdeaTestCase { +public class MavenRunConfigurationTest extends JavaProjectTestCase { @Override protected void tearDown() throws Exception { try {