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

INT-3253: Eliminate EasyMock Dependency

Browse Source 
JIRA: https://jira.springsource.org/browse/INT-3253

INT-3253 Polishing

Use the mockito test runner to initialize the mocks.
This commit is contained in:
Artem Bilan
2014-01-02 12:52:33 +02:00
committed by Gary Russell
parent f9e0bef434
commit 0be6ade8f8
7 changed files with 233 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceivingMessageSourceTests.java
View File

@@ -23,23 +23,24 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import javax.mail.internet.MimeMessage;
import org.easymock.EasyMock;
import org.junit.Test;
import org.mockito.Mockito;
/**
* @author Jonas Partner
* @author Mark Fisher
* @author Gary Russell
* @author Artem Bilan
*/
public class MailReceivingMessageSourceTests {
@Test
public void testPolling() {
StubMailReceiver mailReceiver = new StubMailReceiver();
MimeMessage message1 = EasyMock.createMock(MimeMessage.class);
MimeMessage message2 = EasyMock.createMock(MimeMessage.class);
MimeMessage message3 = EasyMock.createMock(MimeMessage.class);
MimeMessage message4 = EasyMock.createMock(MimeMessage.class);
MimeMessage message1 = Mockito.mock(MimeMessage.class);
MimeMessage message2 = Mockito.mock(MimeMessage.class);
MimeMessage message3 = Mockito.mock(MimeMessage.class);
MimeMessage message4 = Mockito.mock(MimeMessage.class);
mailReceiver.messages.add(new javax.mail.Message[] { message1 });
mailReceiver.messages.add(new javax.mail.Message[] { message2, message3 });

17
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java
View File

@@ -22,8 +22,8 @@ import static org.junit.Assert.assertTrue;
import javax.mail.internet.MimeMessage;
import org.easymock.EasyMock;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -36,6 +36,7 @@ import org.springframework.messaging.support.GenericMessage;
/**
* @author Mark Fisher
* @author Artem Bilan
*/
public class MailToStringTransformerParserTests {
@@ -45,14 +46,13 @@ public class MailToStringTransformerParserTests {
"mailToStringTransformerParserTests.xml", this.getClass());
MessageChannel input = new BeanFactoryChannelResolver(context).resolveDestination("input");
PollableChannel output = (PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
MimeMessage mimeMessage = EasyMock.createNiceMock(MimeMessage.class);
EasyMock.expect(mimeMessage.getContent()).andReturn("hello");
EasyMock.replay(mimeMessage);
MimeMessage mimeMessage = Mockito.mock(MimeMessage.class);
Mockito.when(mimeMessage.getContent()).thenReturn("hello");
input.send(new GenericMessage<javax.mail.Message>(mimeMessage));
Message<?> result = output.receive(0);
assertNotNull(result);
assertEquals("hello", result.getPayload());
EasyMock.verify(mimeMessage);
Mockito.verify(mimeMessage).getContent();
}
@Test
@@ -61,14 +61,13 @@ public class MailToStringTransformerParserTests {
"mailToStringTransformerWithinChain.xml", this.getClass());
MessageChannel input = new BeanFactoryChannelResolver(context).resolveDestination("input");
PollableChannel output = (PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
MimeMessage mimeMessage = EasyMock.createNiceMock(MimeMessage.class);
EasyMock.expect(mimeMessage.getContent()).andReturn("foo");
EasyMock.replay(mimeMessage);
MimeMessage mimeMessage = Mockito.mock(MimeMessage.class);
Mockito.when(mimeMessage.getContent()).thenReturn("foo");
input.send(new GenericMessage<javax.mail.Message>(mimeMessage));
Message<?> result = output.receive(0);
assertNotNull(result);
assertEquals("FOO!!!", result.getPayload());
EasyMock.verify(mimeMessage);
Mockito.verify(mimeMessage).getContent();
}
@Test(expected = BeanDefinitionStoreException.class)