(camel) branch main updated: (chores) camel-mail: separate test setup from execution

[orpiske]

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

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new ca35770f8af (chores) camel-mail: separate test setup from execution
ca35770f8af is described below

commit ca35770f8afe9d69c4f92c50f22a2ea82e9795cd
Author: Otavio R. Piske <angusyo...@gmail.com>
AuthorDate: Sun May 19 19:28:29 2024 +0200

    (chores) camel-mail: separate test setup from execution
    
    Also wait more time before kicking off the test
    
    Signed-off-by: Otavio R. Piske <angusyo...@gmail.com>
---
 .../camel/component/mail/MailDisconnectTest.java   | 27 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git 
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
 
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
index 46a23116126..647dfbfc60f 100644
--- 
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
+++ 
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser;
 import org.apache.camel.component.mail.Mailbox.Protocol;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit5.CamelTestSupport;
+import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -33,13 +35,19 @@ import org.junit.jupiter.api.Test;
 public class MailDisconnectTest extends CamelTestSupport {
     private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", 
"secret");
 
-    private CountDownLatch latch = new CountDownLatch(5);
+    private int expectedCount = 5;
+    private CountDownLatch latch = new CountDownLatch(expectedCount);
 
-    @Test
-    public void testDisconnect() throws Exception {
+    void waitForConnections() {
+        Awaitility.await().until(() -> 
context.getRoute("mail-disconnect").getUptimeMillis() > 1000);
+    }
+
+    @BeforeEach
+    void setup() {
         Mailbox.clearAll();
+
         MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMessageCount(5);
+        mock.expectedMessageCount(expectedCount);
 
         // send 5 mails with some delay so we do multiple polls with 
disconnect between
         template.sendBodyAndHeader(jones.uriPrefix(Protocol.smtp), "A Bla 
bla", "Subject", "Hello A");
@@ -48,8 +56,14 @@ public class MailDisconnectTest extends CamelTestSupport {
         template.sendBodyAndHeader(jones.uriPrefix(Protocol.smtp), "D Bla 
bla", "Subject", "Hello D");
         template.sendBodyAndHeader(jones.uriPrefix(Protocol.smtp), "E Bla 
bla", "Subject", "Hello E");
 
+        waitForConnections();
+    }
+
+    @Test
+    public void testDisconnect() throws Exception {
         if (!latch.await(2500, TimeUnit.MILLISECONDS)) {
-            Assertions.fail("Not all messages were received as expected");
+            Assertions.fail("Not all messages were received as expected: " + 
(expectedCount - latch.getCount())
+                            + " message(s) missing");
         }
 
         MockEndpoint.assertIsSatisfied(context);
@@ -59,7 +73,8 @@ public class MailDisconnectTest extends CamelTestSupport {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from(jones.uriPrefix(Protocol.imap) + 
"&disconnect=true&initialDelay=100&delay=100")
+                from(jones.uriPrefix(Protocol.imap) + 
"&disconnect=true&initialDelay=100&delay=500")
+                        .routeId("mail-disconnect")
                         .process(e -> latch.countDown())
                         .to("mock:result");
             }