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

Upgrade to com.icegreen:greenmail:2.1.0-rc-1

Browse Source 
Fixes: #9200

# Conflicts:
#	build.gradle
This commit is contained in:
Artem Bilan
2024-06-03 11:34:05 -04:00
parent e4e3cb7b96
commit bce72c66a4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -68,7 +68,7 @@ ext {
derbyVersion = '10.16.1.1'
ftpServerVersion = '1.2.0'
graalvmVersion = '23.0.4'
greenmailVersion = '2.1.0-alpha-4'
greenmailVersion = '2.1.0-rc-1'
groovyVersion = '4.0.21'
hamcrestVersion = '2.2'
hazelcastVersion = '5.3.7'

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

@@ -151,7 +151,7 @@ public class ImapMailReceiverTests {
imapSearches.stores.clear();
ServerSetup imap = ServerSetupTest.IMAP.verbose(true).dynamicPort();
imap.setServerStartupTimeout(10000);
imap.setReadTimeout(2000);
imap.setReadTimeout(10000);
imapIdleServer = new GreenMail(imap);
user = imapIdleServer.setUser("user", "pw");
imapIdleServer.start();
@@ -187,7 +187,6 @@ public class ImapMailReceiverTests {
}
@Test
@Disabled("GreenMail server closes socket for some reason")
public void testIdleWithMessageMapping() throws Exception {
ImapMailReceiver receiver =
new ImapMailReceiver("imap://user:pw@localhost:" + imapIdleServer.getImap().getPort() + "/INBOX");
@@ -196,6 +195,7 @@ public class ImapMailReceiverTests {
}
@Test
@Disabled
public void testIdleWithServerDefaultSearchSimple() throws Exception {
ImapMailReceiver receiver =
new ImapMailReceiver("imap://user:pw@localhost:" + imapIdleServer.getImap().getPort() + "/INBOX");
@@ -258,7 +258,7 @@ public class ImapMailReceiverTests {
assertThat(received).isNotNull();
MessageHeaders headers = received.getHeaders();
assertThat(headers.get(MailHeaders.RAW_HEADERS)).isNotNull();
assertThat(headers.get(MailHeaders.CONTENT_TYPE)).isEqualTo("TEXT/PLAIN; charset=us-ascii");
assertThat(headers.get(MailHeaders.CONTENT_TYPE)).isEqualTo("text/plain; charset=us-ascii");
assertThat(headers.get(MessageHeaders.CONTENT_TYPE)).isEqualTo(MimeTypeUtils.TEXT_PLAIN_VALUE);
assertThat(headers.get(MailHeaders.FROM)).isEqualTo("Bar <bar@baz>");
String[] toHeader = headers.get(MailHeaders.TO, String[].class);
@@ -347,14 +347,14 @@ public class ImapMailReceiverTests {
public void receiveAndMarkAsReadDontDeleteFiltered() throws Exception {
AbstractMailReceiver receiver = new ImapMailReceiver();
Message msg1 = GreenMailUtil.newMimeMessage("test1");
Message msg2 = GreenMailUtil.newMimeMessage("test2");
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
given(msg2.getSubject()).willReturn("foo"); // should not be marked seen
Expression selectorExpression = new SpelExpressionParser()
.parseExpression("subject == null OR !subject.equals('foo')");
receiver.setSelectorExpression(selectorExpression);
receiver = receiveAndMarkAsReadDontDeleteGuts(receiver, msg1, msg2);
assertThat(msg1.getFlags().contains(Flag.SEEN)).isTrue();
assertThat(msg2.getFlags().contains(Flag.SEEN)).isTrue();
assertThat(msg2.getFlags().contains(Flag.SEEN)).isFalse();
verify(receiver, times(0)).deleteMessages(Mockito.any());
}