[james-project] 26/27: JAMES-2979 reuse oneHundredMailsShouldBeWellReceived for implementing mailsShouldBeWellReceived

[btellier]

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit b5410122d67093f50ff946d2c6c81e1a390672a1
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Fri Dec 6 11:50:42 2019 +0100

    JAMES-2979 reuse oneHundredMailsShouldBeWellReceived for implementing 
mailsShouldBeWellReceived
---
 .../org/apache/james/MailsShouldBeWellReceived.java    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git 
a/server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
 
b/server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
index e06e1b5..45f71fc 100644
--- 
a/server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
+++ 
b/server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
@@ -62,9 +62,20 @@ interface MailsShouldBeWellReceived {
             .addDomain(DOMAIN)
             .addUser(JAMES_USER, PASSWORD);
 
+        MailboxProbeImpl mailboxProbe = 
server.getProbe(MailboxProbeImpl.class);
+        mailboxProbe.createMailbox("#private", JAMES_USER, 
DefaultMailboxes.INBOX);
+
+        Port smtpPort = server.getProbe(SmtpGuiceProbe.class).getSmtpPort();
+        String message = 
Resources.toString(Resources.getResource("eml/htmlMail.eml"), 
StandardCharsets.UTF_8);
+
         try (SMTPMessageSender sender = new 
SMTPMessageSender(Domain.LOCALHOST.asString())) {
-            sender.connect(JAMES_SERVER_HOST, 
server.getProbe(SmtpGuiceProbe.class).getSmtpPort())
-                .sendMessage("b...@any.com", JAMES_USER);
+            Mono.fromRunnable(
+                Throwing.runnable(() -> {
+                    sender.connect(JAMES_SERVER_HOST, smtpPort);
+                    sendUniqueMessage(sender, message);
+                }))
+                .subscribeOn(Schedulers.elastic())
+                .block();
         }
 
         CALMLY_AWAIT.until(() -> 
server.getProbe(SpoolerProbe.class).processingFinished());
@@ -73,8 +84,9 @@ interface MailsShouldBeWellReceived {
             reader.connect(JAMES_SERVER_HOST, 
server.getProbe(ImapGuiceProbe.class).getImapPort())
                 .login(JAMES_USER, PASSWORD)
                 .select(IMAPMessageReader.INBOX)
-                .awaitMessage(CALMLY_AWAIT);
+                .awaitMessageCount(CALMLY_AWAIT, 1);
         }
+
     }
 
     @Test


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org