You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/06/09 13:28:40 UTC
[camel] branch main updated: (chores) camel-mail: removed usages of Thread.sleep
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 e6e631c4bf2 (chores) camel-mail: removed usages of Thread.sleep
e6e631c4bf2 is described below
commit e6e631c4bf2f6743166f46fe2ac5f15750502f56
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jun 9 14:37:46 2022 +0200
(chores) camel-mail: removed usages of Thread.sleep
---
components/camel-mail/pom.xml | 5 +++++
.../camel/component/mail/MailCommitOnCompletionTest.java | 8 +++++---
.../camel/component/mail/MailConsumerIdleMessageTest.java | 1 -
.../org/apache/camel/component/mail/MailCopyToTest.java | 8 +++++---
.../org/apache/camel/component/mail/MailFetchSizeTest.java | 11 +++++++----
.../MailIdempotentRepositoryDuplicateNotRemoveTest.java | 8 +++++---
.../mail/MailIdempotentRepositoryDuplicateTest.java | 8 +++++---
.../camel/component/mail/MailIdempotentRepositoryTest.java | 8 +++++---
.../org/apache/camel/component/mail/MailMoveToTest.java | 13 +++++++------
9 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index c9c56d143cb..b4ba7f3208f 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -112,6 +112,11 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
index fc8450c254b..d6853b488fa 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.mail;
+import java.util.concurrent.TimeUnit;
+
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.Store;
@@ -28,6 +30,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.jvnet.mock_javamail.Mailbox;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
@@ -53,9 +56,8 @@ public class MailCommitOnCompletionTest extends CamelTestSupport {
mock.assertIsSatisfied();
// wait a bit because delete is on completion
- Thread.sleep(500);
-
- assertEquals(0, mailbox.size());
+ await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(0, mailbox.size()));
}
private void prepareMailbox() throws Exception {
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
index e12188692be..32b4fcadde2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
@@ -31,7 +31,6 @@ public class MailConsumerIdleMessageTest extends CamelTestSupport {
@Test
public void testConsumeIdleMessages() throws Exception {
- Thread.sleep(110);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(2);
assertMockEndpointsSatisfied();
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
index cc2ac9e4348..e7b48d96369 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.mail;
+import java.util.concurrent.TimeUnit;
+
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.Store;
@@ -24,6 +26,7 @@ import javax.mail.internet.MimeMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -50,9 +53,8 @@ public class MailCopyToTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
// windows need a little slack
- Thread.sleep(500);
-
- assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount());
+ Awaitility.await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount()));
assertEquals(5, Mailbox.get("backup-jones@localhost").getNewMessageCount());
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
index 6bdeee44c01..34f436839f8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.mail;
+import java.util.concurrent.TimeUnit;
+
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.Store;
@@ -24,6 +26,7 @@ import javax.mail.internet.MimeMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -54,8 +57,8 @@ public class MailFetchSizeTest extends CamelTestSupport {
mock.setResultWaitTime(2000L);
mock.assertIsSatisfied();
- Thread.sleep(500);
- assertEquals(3, mailbox.size());
+ Awaitility.await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(3, mailbox.size()));
// reset mock to assert the next batch of 2 messages polled
mock.reset();
@@ -65,8 +68,8 @@ public class MailFetchSizeTest extends CamelTestSupport {
mock.setResultWaitTime(3000L);
mock.assertIsSatisfied();
- Thread.sleep(500);
- assertEquals(1, mailbox.size());
+ Awaitility.await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(1, mailbox.size()));
// reset mock to assert the last message polled
mock.reset();
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
index d4a2a34c034..827f8e85720 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.mail;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -42,9 +45,8 @@ public class MailIdempotentRepositoryDuplicateNotRemoveTest extends MailIdempote
assertMockEndpointsSatisfied();
// windows need a little slack
- Thread.sleep(500);
-
- assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount());
+ Awaitility.await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount()));
// they are not removed so we should have all 5 in the repo now
assertEquals(5, myRepo.getCacheSize());
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
index 861160fb8b6..691f39c5704 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.mail;
+import java.util.concurrent.TimeUnit;
+
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.Store;
@@ -26,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -63,9 +66,8 @@ public class MailIdempotentRepositoryDuplicateTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
// windows need a little slack
- Thread.sleep(500);
-
- assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount());
+ Awaitility.await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount()));
// they are removed on confirm
assertEquals(1, myRepo.getCacheSize());
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
index fee1436be7b..ecb3f5fde43 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.mail;
+import java.util.concurrent.TimeUnit;
+
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.Store;
@@ -26,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -59,9 +62,8 @@ public class MailIdempotentRepositoryTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
// windows need a little slack
- Thread.sleep(500);
-
- assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount());
+ Awaitility.await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount()));
// they get deleted after processing by default so we should be back to
// 0
assertEquals(0, myRepo.getCacheSize());
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
index 84c13181c68..6ed9fcf1ecd 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.mail;
+import java.util.concurrent.TimeUnit;
+
import javax.mail.Flags;
import javax.mail.Folder;
import javax.mail.Message;
@@ -26,6 +28,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -52,9 +55,8 @@ public class MailMoveToTest extends CamelTestSupport {
mock.expectedMessageCount(5);
assertMockEndpointsSatisfied();
- Thread.sleep(500);
-
- assertEquals(0, Mailbox.get("jones@localhost").size());
+ Awaitility.await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(0, Mailbox.get("jones@localhost").size()));
assertEquals(0, Mailbox.get("jones@localhost").getNewMessageCount());
assertEquals(5, Mailbox.get("moveToFolder-jones@localhost").getNewMessageCount());
@@ -71,9 +73,8 @@ public class MailMoveToTest extends CamelTestSupport {
mock.expectedMessageCount(5);
assertMockEndpointsSatisfied();
- Thread.sleep(500);
-
- assertEquals(0, Mailbox.get("jones2@localhost").size());
+ Awaitility.await().atMost(500, TimeUnit.MILLISECONDS)
+ .untilAsserted(() -> assertEquals(0, Mailbox.get("jones2@localhost").size()));
assertEquals(0, Mailbox.get("jones2@localhost").getNewMessageCount());
assertEquals(5, Mailbox.get("moveToFolder-jones2@localhost").getNewMessageCount());