Fix bug in makeCVSAware that rendered the method useless

bug 33023, from Masato Tezuka

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@153623 13f79535-47bb-0310-9956-ffa450edef68

Author: Stephen Colebourne

project.xml

@@ -155,12 +155,15 @@
   </developers>
 
   <contributors>
+    <contributor>
+      <name>Jason Anderson</name>
+    </contributor>
     <contributor>
       <name>Alban Peignier</name>
       <email>alban.peignier at free.fr</email>
     </contributor>
     <contributor>
-      <name>Jason Anderson</name>
+      <name>Masato Tezuka</name>
     </contributor>
   </contributors>
 

src/java/org/apache/commons/io/filefilter/FileFilterUtils.java

@@ -24,11 +24,12 @@
  * every class you use.
  * 
  * @since Commons IO 1.0
- * @version $Revision: 1.8 $ $Date: 2004/02/23 04:37:57 $
+ * @version $Id$
  * 
  * @author Henri Yandell
  * @author Stephen Colebourne
  * @author Jeremias Maerki
+ * @author Masato Tezuka
  */
 public class FileFilterUtils {
 
@@ -156,20 +157,21 @@ public static IOFileFilter asFileFilter(FilenameFilter filter) {
     //-----------------------------------------------------------------------
 
     /* Constructed on demand and then cached */
-    private static IOFileFilter cvsFilter = null;
+    private static IOFileFilter cvsFilter;
 
     /**
-     * Resturns an IOFileFilter that ignores CVS directories. You may optionally
+     * Returns an IOFileFilter that ignores CVS directories. You may optionally
      * pass in an existing IOFileFilter in which case it is extended to exclude
      * CVS directories.
-     * @param filter IOFileFilter to modify, null if a new IOFileFilter
+     * @param filter IOFileFilter to wrap, null if a new IOFileFilter
      * should be created
      * @return the requested (combined) filter
+     * @since 1.1 (method existed but had bug in 1.0)
      */
     public static IOFileFilter makeCVSAware(IOFileFilter filter) {
         if (cvsFilter == null) {
-            cvsFilter = andFileFilter(directoryFileFilter(), 
-                notFileFilter(nameFileFilter("CVS")));
+            cvsFilter = notFileFilter(
+                andFileFilter(directoryFileFilter(), nameFileFilter("CVS")));
         }
         if (filter == null) {
             return cvsFilter;

src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java

@@ -17,14 +17,16 @@
 
 import java.io.File;
 
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.testtools.FileBasedTestCase;
+
 /**
- * Used to test an unknown FileFilter
+ * Used to test FileFilterUtils.
  */
-public class FileFilterTestCase extends TestCase {
+public class FileFilterTestCase extends FileBasedTestCase {
 
     public FileFilterTestCase(String name) {
         super(name);
@@ -39,9 +41,11 @@ public static TestSuite suite() {
     }
 
     public void setUp() {
+        getTestDirectory().mkdirs();
     }
 
-    public void tearDown() {
+    public void tearDown() throws Exception {
+        FileUtils.deleteDirectory(getTestDirectory());
     }
 
     public void assertFiltering(IOFileFilter filter, File file, boolean expected) throws Exception {
@@ -226,6 +230,32 @@ public void testWildcard() throws Exception {
         }
     }
 
-
+    public void testMakeCVSAware() throws Exception {
+        IOFileFilter filter1 = FileFilterUtils.makeCVSAware(null);
+        IOFileFilter filter2 = FileFilterUtils.makeCVSAware(FileFilterUtils
+            .nameFileFilter("test-file1.txt"));
+
+        File file = new File(getTestDirectory(), "CVS");
+        file.mkdirs();
+        assertFiltering(filter1, file, false);
+        assertFiltering(filter2, file, false);
+        FileUtils.deleteDirectory(file);
+
+        file = new File(getTestDirectory(), "test-file1.txt");
+        createFile(file, 0);
+        assertFiltering(filter1, file, true);
+        assertFiltering(filter2, file, true);
+
+        file = new File(getTestDirectory(), "test-file2.log");
+        createFile(file, 0);
+        assertFiltering(filter1, file, true);
+        assertFiltering(filter2, file, false);
+
+        file = new File(getTestDirectory(), "CVS");
+        createFile(file, 0);
+        assertFiltering(filter1, file, true);
+        assertFiltering(filter2, file, false);
+    }
+         
 }