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

cleanup: obsolete CvsFileFilter removed

Browse Source
This commit is contained in:
nik
2013-05-07 15:35:04 +04:00
parent 5ced5ea98b
commit 0376f019a9
15 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java
+2 -3
View File
@@ -18,7 +18,6 @@ package com.intellij.refactoring;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.CodeInsightTestCase;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
@@ -101,7 +100,7 @@ public class CopyClassTest extends CodeInsightTestCase {
String rootAfter = root + "/after";
VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/'));
myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting();
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir, PlatformTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
public void testPackageHierarchy() throws Exception {
@@ -126,6 +125,6 @@ public class CopyClassTest extends CodeInsightTestCase {
String rootAfter = root + "/after";
VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/'));
myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting();
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir, PlatformTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
}
java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java
+1 -1
View File
@@ -203,6 +203,6 @@ public class ExtractSuperClassTest extends RefactoringTestCase {
String rootAfter = getRoot() + "/after";
VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/'));
myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting();
IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER);
IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
}
java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java
+3 -3
View File
@@ -22,7 +22,6 @@ package com.intellij.refactoring;
import com.intellij.JavaTestUtil;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
@@ -30,6 +29,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.move.moveFilesOrDirectories.JavaMoveFilesOrDirectoriesHandler;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.PsiTestUtil;
import java.io.File;
@@ -60,10 +60,10 @@ public class MoveClassAndFileTest extends RefactoringTestCase {
String rootAfter = root + "/after";
VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/'));
myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting();
IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
private void performAction(String newPackageName, String fileName, String... classNames) throws Exception{
private void performAction(String newPackageName, String fileName, String... classNames) {
final PsiElement[] elements = new PsiElement[classNames.length + 1];
for(int i = 0; i < classNames.length; i++){
String className = classNames[i];
java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java
+1 -2
View File
@@ -17,7 +17,6 @@ package com.intellij.refactoring;
import com.intellij.JavaTestUtil;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
@@ -103,7 +102,7 @@ public class MoveClassTest extends RefactoringTestCase {
String rootAfter = root + "/after";
VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/'));
myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting();
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir, PlatformTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
private void performAction(String[] classNames, String newPackageName) throws Exception{
java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import com.intellij.psi.search.ProjectScope;
import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.containers.MultiMap;
@@ -132,7 +133,7 @@ public class MoveClassToInnerTest extends RefactoringTestCase {
String rootAfter = getRoot() + "/after";
VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/'));
myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting();
IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
private VirtualFile prepareTest() throws Exception {
java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java
+2 -1
View File
@@ -11,6 +11,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.PlatformTestUtil;
import org.jetbrains.annotations.NonNls;
import java.io.File;
@@ -163,7 +164,7 @@ public class SafeDeleteTest extends MultiFileTestCase {
@Override
public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
SafeDeleteTest.this.performAction(qClassName);
IdeaTestUtil.assertDirectoriesEqual(rootAfter, myRootBefore, IdeaTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootAfter, myRootBefore);
}
});
}
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.refactoring.MockInlineMethodOptions;
import com.intellij.refactoring.RefactoringTestCase;
import com.intellij.refactoring.util.InlineUtil;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.PsiTestUtil;
import java.io.File;
@@ -61,6 +62,6 @@ public class InlineMethodMultifileTest extends RefactoringTestCase {
String rootAfter = getRoot() + "/after";
VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/'));
myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting();
IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
}
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java
+2 -2
View File
@@ -16,7 +16,6 @@
package com.intellij.refactoring.inline;
import com.intellij.JavaTestUtil;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
@@ -25,6 +24,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import com.intellij.psi.search.ProjectScope;
import com.intellij.refactoring.RefactoringTestCase;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.containers.MultiMap;
@@ -68,6 +68,6 @@ public class InlineToAnonymousClassMultifileTest extends RefactoringTestCase {
String rootAfter = getRoot() + "/after";
VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/'));
myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting();
IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
}
java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java
+1 -1
View File
@@ -63,7 +63,7 @@ public abstract class MultiFileTestCase extends CodeInsightTestCase {
FileDocumentManager.getInstance().saveAllDocuments();
if (myDoCompare) {
PlatformTestUtil.assertDirectoriesEqual(rootAfter, rootDir, PlatformTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootAfter, rootDir);
}
}
platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class VfsUtilTest extends PlatformLangTestCase {
final VirtualFileFilter fileFilter = new VirtualFileFilter() {
@Override
public boolean accept(VirtualFile file) {
return PlatformTestUtil.CVS_FILE_FILTER.accept(file) && !file.getName().endsWith(".new");
return !file.getName().endsWith(".new");
}
};
for (VirtualFile child : children) {
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java
+1 -1
View File
@@ -137,7 +137,7 @@ public class LocalFileSystemTest extends PlatformLangTestCase {
final String newName = "dir";
final VirtualFile dirCopy = dirToCopy.copy(this, toVDir, newName);
assertEquals(newName, dirCopy.getName());
PlatformTestUtil.assertDirectoriesEqual(toVDir, fromVDir, null);
PlatformTestUtil.assertDirectoriesEqual(toVDir, fromVDir);
}
public void testUnicodeNames() throws Exception {
platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
+7 -17
View File
@@ -64,7 +64,6 @@ import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.InvocationEvent;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.StringWriter;
import java.text.DecimalFormat;
@@ -83,7 +82,6 @@ import static org.junit.Assert.assertNotNull;
@SuppressWarnings("UseOfSystemOutOrSystemErr")
public class PlatformTestUtil {
public static final boolean COVERAGE_ENABLED_BUILD = "true".equals(System.getProperty("idea.coverage.enabled.build"));
public static final CvsVirtualFileFilter CVS_FILE_FILTER = new CvsVirtualFileFilter();
public static <T> void registerExtension(final ExtensionPointName<T> name, final T t, final Disposable parentDisposable) {
registerExtension(Extensions.getRootArea(), name, t, parentDisposable);
@@ -598,6 +596,10 @@ public class PlatformTestUtil {
return map;
}
public static void assertDirectoriesEqual(VirtualFile dirAfter, VirtualFile dirBefore) throws IOException {
assertDirectoriesEqual(dirAfter, dirBefore, null);
}
@SuppressWarnings("UnsafeVfsRecursion")
public static void assertDirectoriesEqual(VirtualFile dirAfter, VirtualFile dirBefore, @Nullable VirtualFileFilter fileFilter) throws IOException {
FileDocumentManager.getInstance().saveAllDocuments();
@@ -701,8 +703,8 @@ public class PlatformTestUtil {
try {
tempDirectory1 = PlatformTestCase.createTempDir("tmp1");
tempDirectory2 = PlatformTestCase.createTempDir("tmp2");
ZipUtil.extract(jarFile1, tempDirectory1, CVS_FILE_FILTER);
ZipUtil.extract(jarFile2, tempDirectory2, CVS_FILE_FILTER);
ZipUtil.extract(jarFile1, tempDirectory1, null);
ZipUtil.extract(jarFile2, tempDirectory2, null);
}
finally {
jarFile2.close();
@@ -723,7 +725,7 @@ public class PlatformTestUtil {
dirBefore.refresh(false, true);
}
});
assertDirectoriesEqual(dirAfter, dirBefore, CVS_FILE_FILTER);
assertDirectoriesEqual(dirAfter, dirBefore);
}
public static void assertElementsEqual(final Element expected, final Element actual) throws IOException {
@@ -738,18 +740,6 @@ public class PlatformTestUtil {
return writer.getBuffer().toString();
}
public static class CvsVirtualFileFilter implements VirtualFileFilter, FilenameFilter {
@Override
public boolean accept(VirtualFile file) {
return !file.isDirectory() || !"CVS".equals(file.getName());
}
@Override
public boolean accept(File dir, String name) {
return !name.contains("CVS");
}
}
public static String getCommunityPath() {
final String homePath = PathManager.getHomePath();
if (new File(homePath, "community").exists()) {
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveMembersTest.groovy
+1 -1
View File
@@ -107,7 +107,7 @@ public class GroovyMoveMembersTest extends LightCodeInsightFixtureTestCase {
//final File expectedDir = new File(getTestDataPath() + getTestName(true) + "/after");
performAction(sourceClassName, targetClassName, memberIndices);
try {
PlatformTestUtil.assertDirectoriesEqual(expectedDir, actualDir, VirtualFileFilter.ALL);
PlatformTestUtil.assertDirectoriesEqual(expectedDir, actualDir);
}
catch (IOException e) {
throw new RuntimeException(e);
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class GroovyMoveScriptTest extends LightCodeInsightFixtureTestCase {
VirtualFileManager.getInstance().syncRefresh();
try {
PlatformTestUtil.assertDirectoriesEqual(expectedRoot, actualRoot, VirtualFileFilter.ALL);
PlatformTestUtil.assertDirectoriesEqual(expectedRoot, actualRoot);
}
catch (IOException e) {
throw new RuntimeException(e);
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveTestBase.groovy
+1 -1
View File
@@ -43,7 +43,7 @@ public abstract class GroovyMoveTestBase extends JavaCodeInsightFixtureTestCase
VirtualFile rootDir2 = localFileSystem.findFileByPath(rootAfter.replace(File.separatorChar, '/' as char));
PostprocessReformattingAspect.getInstance(myFixture.project).doPostponedFormatting();
localFileSystem.refresh(false)
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir, PlatformTestUtil.CVS_FILE_FILTER);
PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir);
}
abstract boolean perform(VirtualFile root, String moveTo, String... names)