From e1d0e6374e9592a0c758bdd6a8422b2dc1c9fdfb Mon Sep 17 00:00:00 2001 From: erik Date: Thu, 10 Jul 2008 13:21:25 +0000 Subject: [PATCH] Replaced easymock by mockito. --- pom.xml | 19 ++-- .../org/wamblee/io/DirectoryMonitorTest.java | 87 ++++++++--------- .../org/wamblee/observer/ObservableTest.java | 57 +++++------ .../org/wamblee/test/EasyMockMatchers.java | 54 ----------- .../java/org/wamblee/test/ResettableMock.java | 95 +++++++++++++++++++ .../system/container/ContainerTest.java | 51 ++++------ .../system/graph/CompositeEdgeFilterTest.java | 36 ++----- .../org/wamblee/system/graph/GraphTest.java | 16 ++-- 8 files changed, 206 insertions(+), 209 deletions(-) delete mode 100644 support/general/src/test/java/org/wamblee/test/EasyMockMatchers.java create mode 100644 support/general/src/test/java/org/wamblee/test/ResettableMock.java diff --git a/pom.xml b/pom.xml index 52758f75..659fb8f0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,18 +31,6 @@ 2.2 test - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - org.apache.derby derby @@ -63,6 +51,13 @@ mysql-connector-java test + + org.mockito + mockito-core + 1.3 + test + +