X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fio%2FDirectoryMonitorTest.java;h=12db916e78a9ea8615b6c4e1b7cc8d4b8b6bbfb1;hb=c6dd7d29643a8e4a6ec11088ecb5ab9f58845e0b;hp=835c696305fcd35825c03b70b3b55a412c34077f;hpb=6f8bb575523e672b9f8797e543f7c59d15db7253;p=utils

diff --git a/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java b/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java
index 835c6963..12db916e 100644
--- a/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java
+++ b/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java
@@ -12,14 +12,14 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 package org.wamblee.io;
 
-import org.apache.oro.io.AwkFilenameFilter;
-import org.easymock.EasyMock;
-
+import static org.mockito.Mockito.*;
 import junit.framework.TestCase;
 
+import org.apache.oro.io.AwkFilenameFilter;
+
 public class DirectoryMonitorTest extends TestCase {
 
 	private static final String REGEX = "^.*\\.txt$";
@@ -27,6 +27,7 @@ public class DirectoryMonitorTest extends TestCase {
 
 	private TestData _data;
 	private DirectoryMonitor.Listener _listener;
+
 	private DirectoryMonitor _monitor;
 
 	@Override
@@ -34,7 +35,7 @@ public class DirectoryMonitorTest extends TestCase {
 		super.setUp();
 		_data = new TestData(this);
 		_data.clean();
-		_listener = EasyMock.createStrictMock(DirectoryMonitor.Listener.class);
+		_listener = mock(DirectoryMonitor.Listener.class);
 		_monitor = new DirectoryMonitor(_data.getRoot(), new AwkFilenameFilter(
 				REGEX), _listener);
 	}
@@ -42,89 +43,79 @@ public class DirectoryMonitorTest extends TestCase {
 	public void testEmptyDir() {
 		// Nothing is expected to be called.
 		for (int i = 0; i < 10; i++) {
-			EasyMock.replay(_listener);
 			_monitor.poll();
-			EasyMock.verify(_listener);
-			EasyMock.reset(_listener);
+			verifyNoMoreInteractions(_listener);
 		}
 	}
 
 	public void testFileCreated() {
-		_listener.fileCreated(_data.getFile(FILE1));
-		EasyMock.replay(_listener);
 		_data.createFile(FILE1, "hello");
 		_monitor.poll();
-		EasyMock.verify(_listener);
+		verify(_listener).fileCreated(_data.getFile(FILE1));
 	}
 
 	public void testFileDeleted() {
 		_data.createFile(FILE1, "hello");
 		_monitor.poll();
-
-		EasyMock.reset(_listener);
+		reset(_listener);
 
 		_data.deleteFile(FILE1);
-		_listener.fileDeleted(_data.getFile(FILE1));
-		EasyMock.replay(_listener);
 		_monitor.poll();
-		EasyMock.verify(_listener);
+
+		verify(_listener).fileDeleted(_data.getFile(FILE1));
+		verifyNoMoreInteractions(_listener);
 	}
-	
-	public void testFileChanged() throws InterruptedException { 
+
+	public void testFileChanged() throws InterruptedException {
 		_data.createFile(FILE1, "hello");
 		_monitor.poll();
-		EasyMock.reset(_listener);
-		
+		reset(_listener);
+
 		Thread.sleep(2000);
 		_data.deleteFile(FILE1);
 		_data.createFile(FILE1, "bla");
-		
-		_listener.fileChanged(_data.getFile(FILE1));
-		EasyMock.replay(_listener);
+
 		_monitor.poll();
-		EasyMock.verify(_listener);
+		verify(_listener).fileChanged(_data.getFile(FILE1));
+		verifyNoMoreInteractions(_listener);
 	}
-	
+
 	public void testFileFilterIsUsed() {
-		_monitor.poll(); 
-		
+		_monitor.poll();
+
 		_data.createFile("file.xml", "hello");
-		EasyMock.replay(_listener); 
 		_monitor.poll();
-		EasyMock.verify(_listener);
+		verifyNoMoreInteractions(_listener);
 	}
-	
-	public void testDirectoryIsIgnored() { 
+
+	public void testDirectoryIsIgnored() {
 		_monitor.poll();
 		_data.createDir(FILE1);
-		EasyMock.replay(_listener); 
 		_monitor.poll();
-		EasyMock.verify(_listener);
+		verifyNoMoreInteractions(_listener);
 	}
-	
+
 	public void testExceptionsWIllLeadToRepeatedNotifications() { 
 		_monitor.poll();
 		_data.createFile(FILE1, "hello");
 		
-		_listener.fileCreated(_data.getFile(FILE1));
-		EasyMock.expectLastCall().andThrow(new RuntimeException());
-		EasyMock.replay(_listener);
+		stubVoid(_listener).toThrow(new RuntimeException()).on().
+		 fileCreated(_data.getFile(FILE1));
+		
 		try { 
 		    _monitor.poll();
 		} catch (RuntimeException e) { 
-			EasyMock.verify(_listener);
-			EasyMock.reset(_listener);
+			reset(_listener); 
 			
-			// polling again should lead to the same filecreated call. 
-			// this time no exception is thrown. 
+			// polling again should lead to the same filecreated call.
+			// this time no exception is thrown.
 			
-			_listener.fileCreated(_data.getFile(FILE1));
-			EasyMock.replay(_listener);
 			_monitor.poll();
-			EasyMock.verify(_listener);
+			verify(_listener).fileCreated(_data.getFile(FILE1));
+			verifyNoMoreInteractions(_listener);
 			return; 
 		}
-		fail(); // should not get here. 
+		fail(); // should not get here.
 		
 	
 	}