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

INT-2846: ImapMailReceiverTests: fix OS newLine

Browse Source 
* Add `trim()` to the actual value
* Remove '\n' from expected value
* Remove redundant Mocks

JIRA: https://jira.springsource.org/browse/INT-2846
This commit is contained in:
Artem Bilan
2012-12-03 12:40:21 +02:00
parent 2d6239edd1
commit 24bdd39790
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
View File

@@ -74,6 +74,7 @@ import com.sun.mail.imap.IMAPMessage;
/** /**
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* @author Gary Russell * @author Gary Russell
* @author Artem Bilan
*/ */
public class ImapMailReceiverTests { public class ImapMailReceiverTests {
@@ -622,13 +623,7 @@ public class ImapMailReceiverTests {
Folder folder = mock(Folder.class); Folder folder = mock(Folder.class);
when(folder.exists()).thenReturn(true); when(folder.exists()).thenReturn(true);
when(folder.isOpen()).thenReturn(true); when(folder.isOpen()).thenReturn(true);
final AtomicBoolean closed = new AtomicBoolean();
doAnswer(new Answer<Object> (){
public Object answer(InvocationOnMock invocation) throws Throwable {
closed.set(true);
return null;
}
}).when(folder).close(Mockito.anyBoolean());
IMAPMessage message = mock(IMAPMessage.class); IMAPMessage message = mock(IMAPMessage.class);
when(folder.search((SearchTerm) Mockito.any())).thenReturn(new Message[]{message}); when(folder.search((SearchTerm) Mockito.any())).thenReturn(new Message[]{message});
when(store.getFolder(Mockito.any(URLName.class))).thenReturn(folder); when(store.getFolder(Mockito.any(URLName.class))).thenReturn(folder);
@@ -637,20 +632,6 @@ public class ImapMailReceiverTests {
df.setPropertyValue("store", store); df.setPropertyValue("store", store);
receiver.afterPropertiesSet(); receiver.afterPropertiesSet();
Multipart multiPart = mock(Multipart.class);
when(multiPart.getCount()).thenReturn(1);
when(message.getContent()).thenReturn(multiPart);
final BodyPart bodyPart = mock(BodyPart.class);
doAnswer(new Answer<Object>(){
public Object answer(InvocationOnMock invocation) throws Throwable {
if (closed.get()) {
throw new IOException("Folder is closed");
}
return bodyPart;
}
}).when(multiPart).getBodyPart(Mockito.anyInt());
when(bodyPart.getContent()).thenReturn("bar");
doAnswer(new Answer<Object> () { doAnswer(new Answer<Object> () {
public Object answer(InvocationOnMock invocation) throws Throwable { public Object answer(InvocationOnMock invocation) throws Throwable {
@@ -661,7 +642,7 @@ public class ImapMailReceiverTests {
}).when(message).writeTo(Mockito.any(OutputStream.class)); }).when(message).writeTo(Mockito.any(OutputStream.class));
Message[] messages = receiver.receive(); Message[] messages = receiver.receive();
Object content = messages[0].getContent(); Object content = messages[0].getContent();
assertEquals("bar\n", ((Multipart) content).getBodyPart(0).getContent()); assertEquals("bar", ((Multipart) content).getBodyPart(0).getContent().toString().trim());
assertSame(folder, messages[0].getFolder()); assertSame(folder, messages[0].getFolder());
} }