svn commit: r1022804 - in /commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor: AbstractMonitorTestCase.java FileAlterationObserverTestCase.java

[ni...@apache.org]

Author: niallp
Date: Fri Oct 15 01:10:15 2010
New Revision: 1022804

URL: http://svn.apache.org/viewvc?rev=1022804&view=rev
Log:
Additional tests

Modified:
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java?rev=1022804&r1=1022803&r2=1022804&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java Fri Oct 15 01:10:15 2010
@@ -86,6 +86,7 @@ public abstract class AbstractMonitorTes
     protected void createObserver(File file, FileFilter fileFilter) {
         observer = new FileAlterationObserver(file, fileFilter);
         observer.addListener(listener);
+        observer.addListener(new FileAlterationListenerAdaptor());
         try {
             observer.initialize();
         } catch (Exception e) {

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java?rev=1022804&r1=1022803&r2=1022804&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java Fri Oct 15 01:10:15 2010
@@ -18,8 +18,10 @@ package org.apache.commons.io.monitor;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.Iterator;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.CanReadFileFilter;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 
 /**
@@ -44,6 +46,46 @@ public class FileAlterationObserverTestC
     }
 
     /**
+     * Test add/remove listeners.
+     */
+    public void testAddRemoveListeners() {
+        FileAlterationObserver observer = new FileAlterationObserver("/foo");
+        // Null Listener
+        observer.addListener(null);
+        assertFalse("Listeners[1]", observer.getListeners().iterator().hasNext());
+        observer.removeListener(null);
+        assertFalse("Listeners[2]", observer.getListeners().iterator().hasNext());
+
+        // Add Listener
+        FileAlterationListenerAdaptor listener = new FileAlterationListenerAdaptor();
+        observer.addListener(listener);
+        Iterator<FileAlterationListener> it = observer.getListeners().iterator();
+        assertTrue("Listeners[3]", it.hasNext());
+        assertEquals("Added", listener, it.next());
+        assertFalse("Listeners[4]", it.hasNext());
+
+        // Remove Listener
+        observer.removeListener(listener);
+        assertFalse("Listeners[5]", observer.getListeners().iterator().hasNext());
+    }
+
+    /**
+     * Test toString().
+     */
+    public void testToString() {
+        File file = new File("/foo");
+        FileAlterationObserver observer = null;
+
+        observer = new FileAlterationObserver(file);
+        assertEquals("FileAlterationObserver[file='\\foo', listeners=0]", observer.toString());
+  
+        observer = new FileAlterationObserver(file, CanReadFileFilter.CAN_READ);
+        assertEquals("FileAlterationObserver[file='\\foo', CanReadFileFilter, listeners=0]", observer.toString());
+
+        assertEquals(file, observer.getDirectory());
+  }
+
+    /**
      * Test checkAndNotify() method
      */
     public void testDirectory() {