From efb58730e3e3814cc82818af6d2a1d8ecba6b601 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Mon, 11 Jan 2010 14:40:26 +0000
Subject: [PATCH] * replaced @EasyMock@ with @Mockito@

git-svn-id: svn+ssh://svn.synyx.de/var/svn/synyx/opensource/hera/trunk@8545 5a64d73e-33d6-4ccc-9058-23f8668ecac9
---
 core/pom.xml                                    |  7 ++++---
 .../support/BeanListFactoryBeanUnitTest.java    | 17 +++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 4e67711..54abfea 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -46,10 +46,11 @@
 			<version>1.2.15</version>
 			<scope>test</scope>
 		</dependency>
+        
 		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>2.5.2</version>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.8.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java b/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java
index 17ac8f6..cbb5a57 100644
--- a/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java
+++ b/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java
@@ -1,7 +1,7 @@
 package org.synyx.hera.core.support;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.util.HashMap;
 import java.util.List;
@@ -9,6 +9,9 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.Ordered;
 
@@ -18,17 +21,18 @@ import org.springframework.core.Ordered;
  * 
  * @author Oliver Gierke - gierke@synyx.de
  */
+@RunWith(MockitoJUnitRunner.class)
 public class BeanListFactoryBeanUnitTest {
 
     private BeanListFactoryBean<Ordered> factory;
+
+    @Mock
     private ApplicationContext context;
 
 
     @Before
     public void setUp() {
 
-        context = createNiceMock(ApplicationContext.class);
-
         factory = new BeanListFactoryBean<Ordered>();
         factory.setApplicationContext(context);
         factory.setType(Ordered.class);
@@ -46,9 +50,7 @@ public class BeanListFactoryBeanUnitTest {
         beans.put("first", first);
         beans.put("second", second);
 
-        expect(context.getBeansOfType(Ordered.class)).andReturn(beans)
-                .anyTimes();
-        replay(context);
+        when(context.getBeansOfType(Ordered.class)).thenReturn(beans);
 
         Object result = factory.getObject();
         assertTrue(result instanceof List<?>);
@@ -63,9 +65,8 @@ public class BeanListFactoryBeanUnitTest {
     @Test
     public void returnsEmptyListIfNoBeansFound() throws Exception {
 
-        expect(context.getBeansOfType(Ordered.class)).andReturn(
+        when(context.getBeansOfType(Ordered.class)).thenReturn(
                 new HashMap<String, Ordered>());
-        replay(context);
 
         Object result = factory.getObject();
         assertTrue(result instanceof List<?>);