From 0376f019a9a6a1825b2fa1e5559ccf2be6e9b3cb Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 7 May 2013 15:34:24 +0400 Subject: [PATCH] cleanup: obsolete CvsFileFilter removed --- .../intellij/refactoring/CopyClassTest.java | 5 ++-- .../refactoring/ExtractSuperClassTest.java | 2 +- .../refactoring/MoveClassAndFileTest.java | 6 ++--- .../intellij/refactoring/MoveClassTest.java | 3 +-- .../refactoring/MoveClassToInnerTest.java | 3 ++- .../intellij/refactoring/SafeDeleteTest.java | 3 ++- .../inline/InlineMethodMultifileTest.java | 3 ++- .../InlineToAnonymousClassMultifileTest.java | 4 ++-- .../refactoring/MultiFileTestCase.java | 2 +- .../com/intellij/openapi/vfs/VfsUtilTest.java | 2 +- .../vfs/local/LocalFileSystemTest.java | 2 +- .../testFramework/PlatformTestUtil.java | 24 ++++++------------- .../move/GroovyMoveMembersTest.groovy | 2 +- .../move/GroovyMoveScriptTest.java | 2 +- .../move/GroovyMoveTestBase.groovy | 2 +- 15 files changed, 28 insertions(+), 37 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java index 8c619e86fccb..3c6d9fd754f5 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java @@ -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); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java index 1541af66adec..47754632a760 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java @@ -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); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java index b91a6e19e846..46c64079984e 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java @@ -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]; diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java index 4c4a4980a76d..bcaabef58603 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java @@ -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{ diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java index 72005dbb59d6..3b894f767ce0 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java @@ -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 { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java index 27d78094281e..44f927fa87ba 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java @@ -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); } }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java index af19fc3349b0..9d46f072f338 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java @@ -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); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java index ff5424fbc45a..de5a9af59284 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java @@ -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); } } diff --git a/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java b/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java index b21347be5491..dc18d322d9ed 100644 --- a/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java +++ b/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java @@ -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); } } diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java index 5a3235ecce35..537ebc214e25 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java @@ -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) { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java index 0f778308a365..1f96c15b1164 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java @@ -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 { diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java index 24c8f2e3733b..b14bdd7beb9e 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java @@ -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 void registerExtension(final ExtensionPointName 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()) { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveMembersTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveMembersTest.groovy index 76abb878aa72..014a799aebf8 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveMembersTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveMembersTest.groovy @@ -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); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java index f37d061f8bd0..84cbb69ec4d0 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java @@ -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); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveTestBase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveTestBase.groovy index 0e12f9a2c8db..4f6bdabfa7ef 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveTestBase.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveTestBase.groovy @@ -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)