[Japi-cvs] SF.net SVN: japi:[1271] libs/util/trunk/src

[<aki...@us...>]

Revision: 1271
          http://japi.svn.sourceforge.net/japi/?rev=1271&view=rev
Author:   akirschbaum
Date:     2009-04-04 19:20:27 +0000 (Sat, 04 Apr 2009)

Log Message:
-----------
Fix EndingFileFilter.

Modified Paths:
--------------
    libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java

Added Paths:
-----------
    libs/util/trunk/src/tst/test/net/sf/japi/util/filter/
    libs/util/trunk/src/tst/test/net/sf/japi/util/filter/file/
    libs/util/trunk/src/tst/test/net/sf/japi/util/filter/file/EndingFileFilterTest.java

Modified: libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java	2009-03-22 13:46:23 UTC (rev 1270)
+++ libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java	2009-04-04 19:20:27 UTC (rev 1271)
@@ -86,7 +86,6 @@
                 ret |= fileName.endsWith(ending);
             }
         }
-        ret = acceptDirectories ? pathname.isDirectory() : !pathname.isDirectory();
         if (acceptDirectories) {
             ret |= pathname.isDirectory();
         } else {

Added: libs/util/trunk/src/tst/test/net/sf/japi/util/filter/file/EndingFileFilterTest.java
===================================================================
--- libs/util/trunk/src/tst/test/net/sf/japi/util/filter/file/EndingFileFilterTest.java	                        (rev 0)
+++ libs/util/trunk/src/tst/test/net/sf/japi/util/filter/file/EndingFileFilterTest.java	2009-04-04 19:20:27 UTC (rev 1271)
@@ -0,0 +1,60 @@
+package test.net.sf.japi.util.filter.file;
+
+import java.io.File;
+import java.io.FileFilter;
+import net.sf.japi.util.filter.file.EndingFileFilter;
+import org.junit.Assert;
+import org.junit.Test;
+
+/** Test for {@link EndingFileFilter}.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class EndingFileFilterTest {
+
+    /** Test case for {@link EndingFileFilter#accept(File)}. */
+    @Test
+    public void testAccept() {
+        final File file1 = new File("test.abc");
+        checkFileFilter(new boolean[] {true,false,true,false,}, file1, ".abc", ".def", ".ghi");
+        checkFileFilter(new boolean[] {false,true,false,true,}, file1, ".def", ".ghi");
+
+        final File dir1 = new File("test.abc") {
+            /** The serial version UID. */
+            private static final long serialVersionUID = 1;
+
+            /** {@inheritDoc} */
+            @Override
+            public boolean isDirectory() {
+                return true;
+            }
+        };
+        checkFileFilter(new boolean[] {false,false,true,true,}, dir1, ".abc", ".def", ".ghi");
+        checkFileFilter(new boolean[] {false,false,true,true,}, dir1, ".def", ".ghi");
+    }
+
+    /** Checks that {@link EndingFileFilter#accept(File)} returns the expected result.
+     * @param expectedResults the expected results from accept(File)
+     * @param file the file to pass to accept(File)
+     * @param endings parameter for EndingFileFilter constructor
+     */
+    private static void checkFileFilter(final boolean[] expectedResults, final File file, final String... endings) {
+        Assert.assertEquals(4, expectedResults.length);
+        checkFileFilter(false, false, expectedResults[0], file, endings);
+        checkFileFilter(false, true, expectedResults[1], file, endings);
+        checkFileFilter(true, false, expectedResults[2], file, endings);
+        checkFileFilter(true, true, expectedResults[3], file, endings);
+    }
+
+    /** Checks that {@link EndingFileFilter#accept(File)} returns the expected result.
+     * @param acceptDirectories parameter for EndingFileFilter constructor
+     * @param negate parameter for EndingFileFilter constructor
+     * @param expectedResult the expected result of accept(File)
+     * @param file the file to pass to accept(File)
+     * @param endings parameter for EndingFileFilter constructor
+     */
+    private static void checkFileFilter(final boolean acceptDirectories, final boolean negate, final boolean expectedResult, final File file, final String... endings) {
+        final FileFilter fileFilter = new EndingFileFilter(acceptDirectories, negate, "description", endings);
+        Assert.assertEquals(expectedResult, fileFilter.accept(file));
+    }
+
+} // class EndingFileFilterTest


Property changes on: libs/util/trunk/src/tst/test/net/sf/japi/util/filter/file/EndingFileFilterTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.