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 2021/11/24 14:16:17 UTC
[camel] branch main updated: (chores) camel-rabbitmq: replace Thread.sleep with Awaitility in tests
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 f4c7766 (chores) camel-rabbitmq: replace Thread.sleep with Awaitility in tests
f4c7766 is described below
commit f4c77660c2edfd8daafb459308d4815b7a7389ae
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Nov 24 14:15:06 2021 +0100
(chores) camel-rabbitmq: replace Thread.sleep with Awaitility in tests
---
.../component/rabbitmq/integration/RabbitMQConsumerReplyToIT.java | 5 +++--
.../rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIT.java | 6 +++---
.../camel/component/rabbitmq/integration/RabbitMQProducerIT.java | 6 ++++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerReplyToIT.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerReplyToIT.java
index b775006..22fc4cc 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerReplyToIT.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerReplyToIT.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.rabbitmq.integration;
import java.io.IOException;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeoutException;
@@ -28,6 +29,7 @@ import com.rabbitmq.client.DefaultConsumer;
import com.rabbitmq.client.Envelope;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.rabbitmq.services.ConnectionProperties;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -87,9 +89,8 @@ public class RabbitMQConsumerReplyToIT extends AbstractRabbitMQIT {
}
private void assertThatBodiesReceivedIn(final List<String> received, final String... expected) throws InterruptedException {
- Thread.sleep(500);
+ Awaitility.await().atMost(Duration.ofSeconds(1)).untilAsserted(() -> assertListSize(received, expected.length));
- assertListSize(received, expected.length);
for (String body : expected) {
assertEquals(body, received.get(0));
}
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIT.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIT.java
index ffe0f1f..778be72 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIT.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.rabbitmq.integration;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
@@ -32,6 +33,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.rabbitmq.services.ConnectionProperties;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -112,9 +114,7 @@ public class RabbitMQDeadLetterRoutingKeyIT extends AbstractRabbitMQIT {
deadLetterChannel.basicConsume("dlq", true, new DeadLetterRoutingKeyConsumer(received, routingKey));
- Thread.sleep(500);
-
- assertListSize(received, 1);
+ Awaitility.await().atMost(Duration.ofSeconds(1)).untilAsserted(() -> assertListSize(received, 1));
assertEquals("rk1", routingKey.toString());
}
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java
index 0f6a34e..a44d38a 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.rabbitmq.integration;
import java.io.IOException;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -35,6 +36,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.test.infra.rabbitmq.services.ConnectionProperties;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -190,8 +192,8 @@ public class RabbitMQProducerIT extends AbstractRabbitMQIT {
templateNotAllowCustomHeaders.sendBodyAndHeaders("new message", headers);
- Thread.sleep(500);
- assertEquals("new message", received.get(0));
+ Awaitility.await().atMost(Duration.ofSeconds(1))
+ .untilAsserted(() -> assertEquals("new message", received.get(0)));
assertTrue(receivedHeaders.containsKey(RabbitMQConstants.EXCHANGE_NAME));
assertFalse(receivedHeaders.containsKey(CUSTOM_HEADER));
}