Skip to content

Commit efb5873

Browse files
committed
* replaced @easymock@ with @mockito@
git-svn-id: svn+ssh://svn.synyx.de/var/svn/synyx/opensource/hera/trunk@8545 5a64d73e-33d6-4ccc-9058-23f8668ecac9
1 parent 7984449 commit efb5873

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

core/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@
4646
<version>1.2.15</version>
4747
<scope>test</scope>
4848
</dependency>
49+
4950
<dependency>
50-
<groupId>org.easymock</groupId>
51-
<artifactId>easymock</artifactId>
52-
<version>2.5.2</version>
51+
<groupId>org.mockito</groupId>
52+
<artifactId>mockito-all</artifactId>
53+
<version>1.8.2</version>
5354
<scope>test</scope>
5455
</dependency>
5556
</dependencies>

core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package org.synyx.hera.core.support;
22

3-
import static org.easymock.EasyMock.*;
43
import static org.junit.Assert.*;
4+
import static org.mockito.Mockito.*;
55

66
import java.util.HashMap;
77
import java.util.List;
88
import java.util.Map;
99

1010
import org.junit.Before;
1111
import org.junit.Test;
12+
import org.junit.runner.RunWith;
13+
import org.mockito.Mock;
14+
import org.mockito.runners.MockitoJUnitRunner;
1215
import org.springframework.context.ApplicationContext;
1316
import org.springframework.core.Ordered;
1417

@@ -18,17 +21,18 @@
1821
*
1922
* @author Oliver Gierke - gierke@synyx.de
2023
*/
24+
@RunWith(MockitoJUnitRunner.class)
2125
public class BeanListFactoryBeanUnitTest {
2226

2327
private BeanListFactoryBean<Ordered> factory;
28+
29+
@Mock
2430
private ApplicationContext context;
2531

2632

2733
@Before
2834
public void setUp() {
2935

30-
context = createNiceMock(ApplicationContext.class);
31-
3236
factory = new BeanListFactoryBean<Ordered>();
3337
factory.setApplicationContext(context);
3438
factory.setType(Ordered.class);
@@ -46,9 +50,7 @@ public void regardsOrderOfBeans() throws Exception {
4650
beans.put("first", first);
4751
beans.put("second", second);
4852

49-
expect(context.getBeansOfType(Ordered.class)).andReturn(beans)
50-
.anyTimes();
51-
replay(context);
53+
when(context.getBeansOfType(Ordered.class)).thenReturn(beans);
5254

5355
Object result = factory.getObject();
5456
assertTrue(result instanceof List<?>);
@@ -63,9 +65,8 @@ public void regardsOrderOfBeans() throws Exception {
6365
@Test
6466
public void returnsEmptyListIfNoBeansFound() throws Exception {
6567

66-
expect(context.getBeansOfType(Ordered.class)).andReturn(
68+
when(context.getBeansOfType(Ordered.class)).thenReturn(
6769
new HashMap<String, Ordered>());
68-
replay(context);
6970

7071
Object result = factory.getObject();
7172
assertTrue(result instanceof List<?>);

0 commit comments

Comments
 (0)