Spring/spring-plugin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* replaced @EasyMock@ with @Mockito@

Browse Source 
git-svn-id: svn+ssh://svn.synyx.de/var/svn/synyx/opensource/hera/trunk@8545 5a64d73e-33d6-4ccc-9058-23f8668ecac9
This commit is contained in:
Oliver Gierke
2010-01-11 14:40:26 +00:00
parent 7984449b0b
commit efb58730e3
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/pom.xml
View File

@@ -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>

17
core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java
View File

@@ -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<?>);