From c67320e7bc59f5d882c6adc2f370d10ca9d57ff1 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sat, 23 Aug 2014 09:46:34 -0400 Subject: [PATCH] DSL: Mail Polish - Add SearchTerm (lambda) To Test --- .../integration/dsl/test/mail/MailTests.java | 13 +++++++++++++ .../dsl/test/mail/PoorMansMailServer.java | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/mail/MailTests.java b/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/mail/MailTests.java index 2da2a56..05d4433 100644 --- a/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/mail/MailTests.java +++ b/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/mail/MailTests.java @@ -24,8 +24,11 @@ import static org.junit.Assert.assertTrue; import java.util.Properties; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage.RecipientType; +import javax.mail.search.FromTerm; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -190,6 +193,7 @@ public class MailTests { public IntegrationFlow imapMailFlow() { return IntegrationFlows .from(Mail.imapInboundAdapter("imap://user:pw@localhost:" + imapPort + "/INBOX") + .searchTermStrategy((f,l) -> new FromTerm(fromAddress())) .javaMailProperties(p -> p.put("mail.debug", "true")), e -> e.autoStartup(true) .poller(Pollers.fixedDelay(1000))) @@ -197,6 +201,15 @@ public class MailTests { .get(); } + private InternetAddress fromAddress() { + try { + return new InternetAddress("bar@baz"); + } + catch (AddressException e) { + throw new RuntimeException(e); + } + } + } } diff --git a/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/mail/PoorMansMailServer.java b/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/mail/PoorMansMailServer.java index e7517a2..9caaf07 100644 --- a/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/mail/PoorMansMailServer.java +++ b/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/mail/PoorMansMailServer.java @@ -209,12 +209,12 @@ public class PoorMansMailServer { @Override protected MailHandler mailHandler(Socket socket) { - return new Pop3Handler(socket); + return new ImapHandler(socket); } - public class Pop3Handler extends MailHandler { + public class ImapHandler extends MailHandler { - public Pop3Handler(Socket socket) { + public ImapHandler(Socket socket) { super(socket); } @@ -246,7 +246,7 @@ public class PoorMansMailServer { write("* OK [UNSEEN 1]"); write(tag + "OK EXAMINE completed"); } - else if (line.endsWith("SEARCH NOT (FLAGGED) ALL")) { + else if (line.endsWith("SEARCH FROM bar@baz ALL")) { write("* SEARCH 1 1"); write(tag + "OK SEARCH completed"); }