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

migration from EasyMock to Mockito

Browse Source
This commit is contained in:
Will Schipp
2013-02-06 13:45:18 -05:00
committed by Dave Syer
parent a06f4ad389
commit 7e1e66d677
78 changed files with 772 additions and 1279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java
View File

@@ -20,6 +20,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -32,7 +34,6 @@ import javax.jms.MessageListener;
import javax.jms.Session;
import org.aopalliance.aop.Advice;
import org.easymock.EasyMock;
import org.junit.Test;
import org.springframework.batch.repeat.interceptor.RepeatOperationsInterceptor;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
@@ -54,21 +55,18 @@ public class BatchMessageListenerContainerTests {
}
});
Session session = EasyMock.createNiceMock(Session.class);
MessageConsumer consumer = EasyMock.createMock(MessageConsumer.class);
Message message = EasyMock.createMock(Message.class);
Session session = mock(Session.class);
MessageConsumer consumer = mock(MessageConsumer.class);
Message message = mock(Message.class);
// Expect two calls to consumer (chunk size)...
EasyMock.expect(session.getTransacted()).andReturn(true).anyTimes();
EasyMock.expect(consumer.receive(1000)).andReturn(message).times(2);
EasyMock.replay(consumer, session);
when(session.getTransacted()).thenReturn(true);
when(session.getTransacted()).thenReturn(true);
when(consumer.receive(1000)).thenReturn(message);
boolean received = doExecute(session, consumer);
assertTrue("Message not received", received);
EasyMock.verify(consumer);
}
@Test
@@ -77,22 +75,18 @@ public class BatchMessageListenerContainerTests {
template.setCompletionPolicy(new SimpleCompletionPolicy(2));
container = getContainer(template);
Session session = EasyMock.createMock(Session.class);
MessageConsumer consumer = EasyMock.createMock(MessageConsumer.class);
Session session = mock(Session.class);
MessageConsumer consumer = mock(MessageConsumer.class);
Message message = null;
// Expect one call to consumer (chunk size is 2 but terminates on
// first)...
EasyMock.expect(consumer.receive(1000)).andReturn(message);
EasyMock.expect(session.getTransacted()).andReturn(false);
EasyMock.replay(consumer, session);
when(consumer.receive(1000)).thenReturn(message);
when(session.getTransacted()).thenReturn(false);
boolean received = doExecute(session, consumer);
assertFalse("Message not received", received);
EasyMock.verify(consumer, session);
}
@Test
@@ -137,7 +131,7 @@ public class BatchMessageListenerContainerTests {
}
private BatchMessageListenerContainer getContainer(RepeatTemplate template) {
ConnectionFactory connectionFactory = EasyMock.createMock(ConnectionFactory.class);
ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
// Yuck: we need to turn these method in base class to no-ops because the invoker is a private class
// we can't create for test purposes...
BatchMessageListenerContainer container = new BatchMessageListenerContainer() {
@@ -167,27 +161,23 @@ public class BatchMessageListenerContainerTests {
}
});
Session session = EasyMock.createMock(Session.class);
MessageConsumer consumer = EasyMock.createMock(MessageConsumer.class);
Message message = EasyMock.createMock(Message.class);
Session session = mock(Session.class);
MessageConsumer consumer = mock(MessageConsumer.class);
Message message = mock(Message.class);
if (expectGetTransactionCount>0) {
EasyMock.expect(session.getTransacted()).andReturn(true).times(expectGetTransactionCount);
when(session.getTransacted()).thenReturn(true);
}
// Expect only one call to consumer (chunk size is 2, but first one
// rolls back terminating batch)...
EasyMock.expect(consumer.receive(1000)).andReturn(message).anyTimes();
when(consumer.receive(1000)).thenReturn(message);
if (expectRollback) {
session.rollback();
EasyMock.expectLastCall();
}
EasyMock.replay(session, consumer, message);
boolean received = doExecute(session, consumer);
EasyMock.verify(session, consumer, message);
return received;
}