MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

tests: deprecate IdeaTestCase and use JavaProjectTestCase instead

Browse Source 
Name of IdeaTestCase is unclear and sometimes it was used in tests which aren't related to Java so it's better to use JavaProjectTestCase instead.

GitOrigin-RevId: 4617eb52ae01d810e6e0b6810af84a4e96f3bfcc
This commit is contained in:
nik
2019-05-17 19:15:16 +03:00
committed by intellij-monorepo-bot
parent c9e0f758a0
commit 05e0f7a809
21 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/tests/com/intellij/compiler/artifacts/ArtifactsTestCase.java
+3 -3
View File
@@ -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);
java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java
+1 -1
View File
@@ -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<Module> myModulesToDispose = new ArrayList<>();
@Override
java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/DirectoryIndexRestoreTest.java
+2 -5
View File
@@ -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;
java/java-tests/testSrc/com/intellij/java/openapi/roots/impl/ProjectLibrariesTest.java
+2 -2
View File
@@ -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;
java/java-tests/testSrc/com/intellij/java/openapi/vfs/changes/PsiChangeTrackerTest.java
+2 -2
View File
@@ -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;
java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java
Vendored
+2 -2
View File
@@ -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();
java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java
+2 -2
View File
@@ -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);
java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java
+2 -2
View File
@@ -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;
java/java-tests/testSrc/com/intellij/roots/ManagingContentRootsTest.java
+2 -2
View File
@@ -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
java/testFramework/src/com/intellij/execution/ExecutionTestCase.java
+1 -1
View File
@@ -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;
java/testFramework/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderTestCase.java
+2 -2
View File
@@ -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<FrameworkType, FrameworkSupportInModuleConfigurable> myConfigurables;
private Map<FrameworkType, FrameworkSupportNode> myNodes;
java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
+2 -1
View File
@@ -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 {
}
java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java
+1 -1
View File
@@ -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<Module> myModulesToDispose = new ArrayList<>();
@Override
java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java
+1 -1
View File
@@ -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
plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/build/GenerateAntTest.java
+2 -2
View File
@@ -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);
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java
+2 -2
View File
@@ -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";
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java
+2 -2
View File
@@ -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();
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java
+2 -2
View File
@@ -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();
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java
+2 -2
View File
@@ -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();
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseVarsTest.java
+2 -2
View File
@@ -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";
plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationTest.java
+2 -2
View File
@@ -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 {