This is an automated email from the ASF dual-hosted git repository.
gnodet 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 c5d06bf2e251 Remove redundant Awaitility wrapping around MockEndpoint
assertions
c5d06bf2e251 is described below
commit c5d06bf2e2511031869470ed28d167e4a5b9498c
Author: Guillaume Nodet <[email protected]>
AuthorDate: Thu Jul 9 14:07:16 2026 +0200
Remove redundant Awaitility wrapping around MockEndpoint assertions
MockEndpoint.assertIsSatisfied() already uses an internal CountDownLatch
that waits up to 10 seconds by default, making Awaitility wrapping
redundant for positive assertions within that timeout window.
Replace redundant Awaitility await().atMost().untilAsserted() calls with
direct assertIsSatisfied() calls across 25 test files. For timeouts
exceeding 10 seconds, use setResultWaitTime() or the static
assertIsSatisfied(context, timeout, unit) variant.
Co-authored-by: Guillaume Nodet <[email protected]>
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../java/org/apache/camel/component/ChatScriptComponentIT.java | 5 +----
.../component/aws2/kinesis/integration/KinesisConsumerIT.java | 7 +++----
.../aws2/kinesis/integration/KinesisConsumerResumeIT.java | 7 +++----
.../camel/component/aws2/s3/integration/S3ConsumerIT.java | 3 +--
.../component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java | 6 +-----
.../aws2/s3/integration/S3ConsumerMaxMessagesPerPollIT.java | 3 +--
.../component/aws2/s3/integration/S3StreamUploadTimeoutIT.java | 3 +--
.../aws2/s3/integration/S3StreamUploadTimestampTimeoutIT.java | 3 +--
.../camel/component/file/watch/FileWatchComponentTest.java | 4 +---
.../file/remote/integration/FromFtpUseListFalseIT.java | 9 ++-------
.../camel/component/jms/JmsProducerWithJMSHeaderTest.java | 4 +---
.../camel/component/jms/integration/JmsDurableTopicIT.java | 4 ++--
.../jms/integration/issues/JmsAnotherCustomJMSReplyToIT.java | 5 +----
.../kafka/integration/KafkaConsumerAsyncManualCommitIT.java | 9 +++------
.../KafkaConsumerAutoInstResumeRouteStrategyIT.java | 7 +++----
.../apache/camel/component/mina/MinaSpringMultipleUDPTest.java | 9 ++-------
.../component/netty/NettyConsumerClientModeReconnectTest.java | 3 +--
.../camel/component/sjms/SjmsConnectionRecoveryTest.java | 6 ++----
.../test/java/org/apache/camel/component/snmp/TrapTest.java | 7 +------
.../java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java | 7 +++----
.../org/apache/camel/processor/DelayerWhileShutdownTest.java | 4 +---
.../camel/processor/RecipientListParallelStreamingTest.java | 8 ++------
.../java/org/apache/camel/processor/SagaRemoveHeadersTest.java | 7 +------
.../throttle/concurrent/ConcurrentRequestsThrottlerTest.java | 10 +++-------
.../camel/processor/throttle/requests/ThrottlerTest.java | 10 +++-------
25 files changed, 44 insertions(+), 106 deletions(-)
diff --git
a/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
b/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
index 80cb589677ec..1ac14e6c8dda 100644
---
a/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
+++
b/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component;
-import java.time.Duration;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.builder.RouteBuilder;
@@ -31,7 +29,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
public class ChatScriptComponentIT extends CamelTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(ChatScriptComponentIT.class);
@@ -43,7 +40,7 @@ public class ChatScriptComponentIT extends CamelTestSupport {
public void testChatScript() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- Awaitility.await().atMost(Duration.ofSeconds(2)).untilAsserted(() ->
MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
index 1fb155b3dc88..6417abab60bd 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
@@ -44,7 +44,6 @@ import software.amazon.awssdk.services.kinesis.KinesisClient;
import static
org.apache.camel.test.infra.aws2.clients.KinesisUtils.createStream;
import static org.apache.camel.test.infra.aws2.clients.KinesisUtils.putRecords;
-import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -118,11 +117,11 @@ public class KinesisConsumerIT extends CamelTestSupport {
@DisplayName("Tests that the component can produce messages to AWS
Kinesis")
@Timeout(value = 2, unit = TimeUnit.MINUTES)
@Test
- void testProduceMessages() {
+ void testProduceMessages() throws Exception {
result.expectedMessageCount(messageCount);
- await().atMost(1, TimeUnit.MINUTES)
- .untilAsserted(() -> result.assertIsSatisfied());
+ result.setResultWaitTime(60000);
+ result.assertIsSatisfied();
assertEquals(messageCount, receivedMessages.size());
String partitionKey = null;
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
index 1e4da5ba2de8..18cf1fa1c0d2 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
@@ -55,7 +55,6 @@ import
software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
import static
org.apache.camel.test.infra.aws2.clients.KinesisUtils.createStream;
import static
org.apache.camel.test.infra.aws2.clients.KinesisUtils.deleteStream;
import static org.apache.camel.test.infra.aws2.clients.KinesisUtils.putRecords;
-import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -188,11 +187,11 @@ public class KinesisConsumerResumeIT extends
CamelTestSupport {
@DisplayName("Tests that the component can resume messages from AWS
Kinesis")
@Timeout(value = 3, unit = TimeUnit.MINUTES)
@Test
- void testProduceMessages() {
+ void testProduceMessages() throws Exception {
result.expectedMessageCount(expectedCount);
- await().atMost(2, TimeUnit.MINUTES)
- .untilAsserted(() -> result.assertIsSatisfied());
+ result.setResultWaitTime(120000);
+ result.assertIsSatisfied();
assertEquals(expectedCount, receivedMessages.size());
for (KinesisData data : receivedMessages) {
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIT.java
index 1316638118e3..193108ebc6eb 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIT.java
@@ -69,8 +69,7 @@ public class S3ConsumerIT extends Aws2S3Base {
}
});
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
// in-progress should remove keys when complete
AWS2S3Endpoint s3 = (AWS2S3Endpoint)
context.getRoute("s3consumer").getEndpoint();
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
index 63cece15f0ae..ef3cd825fd06 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.aws2.s3.integration;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -25,7 +23,6 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,8 +47,7 @@ public class S3ConsumerIgnoreBodyIT extends Aws2S3Base {
}
});
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
Assertions.assertNull(result.getExchanges().get(0).getMessage().getBody());
}
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerMaxMessagesPerPollIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerMaxMessagesPerPollIT.java
index d342c7f051d3..470ed19ee1f9 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerMaxMessagesPerPollIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerMaxMessagesPerPollIT.java
@@ -69,8 +69,7 @@ public class S3ConsumerMaxMessagesPerPollIT extends
Aws2S3Base {
}
});
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
// in-progress should remove keys when complete
AWS2S3Endpoint s3 = (AWS2S3Endpoint)
context.getRoute("s3consumer").getEndpoint();
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
index 3fb218267eae..e04f20ba7353 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
@@ -52,8 +52,7 @@ public class S3StreamUploadTimeoutIT extends Aws2S3Base {
template.sendBody("direct:stream1", "Andrea\n");
}
- Awaitility.await().atMost(11, TimeUnit.SECONDS)
- .untilAsserted(() ->
MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context, 11, TimeUnit.SECONDS);
Awaitility.await().atMost(11, TimeUnit.SECONDS)
.untilAsserted(() -> {
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimestampTimeoutIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimestampTimeoutIT.java
index 4776391db205..65a62a7e2638 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimestampTimeoutIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimestampTimeoutIT.java
@@ -57,8 +57,7 @@ public class S3StreamUploadTimestampTimeoutIT extends
Aws2S3Base {
long afterUpload = System.currentTimeMillis();
- Awaitility.await().atMost(11, TimeUnit.SECONDS)
- .untilAsserted(() ->
MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context, 11, TimeUnit.SECONDS);
Awaitility.await().atMost(11, TimeUnit.SECONDS)
.untilAsserted(() -> {
diff --git
a/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTest.java
b/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTest.java
index fc0c3696d40e..2fc816b875fe 100644
---
a/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTest.java
+++
b/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTest.java
@@ -22,12 +22,10 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.UUID;
-import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.watch.constants.FileEventEnum;
import org.apache.camel.component.mock.MockEndpoint;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -100,7 +98,7 @@ public class FileWatchComponentTest extends
FileWatchComponentTestBase {
As such, we have to be lenient checking for the expected number of
exchanges received.
*/
all.expectedMinimumMessageCount(8); // 2 directories, 6 files
- Awaitility.await().atMost(2, TimeUnit.SECONDS).untilAsserted(() ->
all.assertIsSatisfied());
+ all.assertIsSatisfied();
onlyTxtAnywhere.expectedMessageCount(3); // 3 txt files
onlyTxtAnywhere.assertIsSatisfied();
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpUseListFalseIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpUseListFalseIT.java
index 3c0daf91a9a1..4afa13b095de 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpUseListFalseIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpUseListFalseIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.file.remote.integration;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
@@ -26,8 +24,6 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.awaitility.Awaitility.await;
-
/**
* Unit test to poll a fixed file from the FTP server without using the list
command.
*/
@@ -55,14 +51,13 @@ public class FromFtpUseListFalseIT extends
FtpServerTestSupport {
}
@Test
- public void testUseListFalse() {
+ public void testUseListFalse() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World from FTPServer");
// just allow to poll a few more times, but we should only get the file
// once
- await().atMost(2, TimeUnit.SECONDS)
- .untilAsserted(() -> mock.assertIsSatisfied());
+ mock.assertIsSatisfied();
}
@Override
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
index 0d872aa4e6f4..c1ea7d5a9abd 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.core.CamelContextExtension;
import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Tag;
@@ -203,8 +202,7 @@ public class JmsProducerWithJMSHeaderTest extends
AbstractJMSTest {
assertNotNull(bar, "Should be a message on queue");
template.send("activemq:queue:fooJmsProducerWithJMSHeaderTest?preserveMessageQos=true",
bar);
- Awaitility.await().atMost(5, TimeUnit.SECONDS)
- .untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsDurableTopicIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsDurableTopicIT.java
index aa3344c10740..dd5f22d9830a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsDurableTopicIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsDurableTopicIT.java
@@ -47,12 +47,12 @@ public class JmsDurableTopicIT extends
AbstractPersistentJMSTest {
}
@Test
- public void testDurableTopic() {
+ public void testDurableTopic() throws Exception {
final CompletableFuture<Object> future =
template.asyncSendBody("activemq:topic:JmsDurableTopicTest", "Hello World");
final Object request = assertDoesNotThrow(() -> future.get(5,
TimeUnit.SECONDS));
assertNotNull(request);
- Awaitility.await().atMost(6, TimeUnit.SECONDS).untilAsserted(() ->
MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsAnotherCustomJMSReplyToIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsAnotherCustomJMSReplyToIT.java
index 4689932bc0e5..830bc8dfa8e5 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsAnotherCustomJMSReplyToIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsAnotherCustomJMSReplyToIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.jms.integration.issues;
-import java.util.concurrent.TimeUnit;
-
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Queue;
import jakarta.jms.TextMessage;
@@ -32,7 +30,6 @@ import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.core.CamelContextExtension;
import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -69,7 +66,7 @@ public class JmsAnotherCustomJMSReplyToIT extends
AbstractJMSTest {
// send reply
template.sendBody("activemq:" + replyTo.getQueueName(), "My name is
Arnio");
- Awaitility.await().atMost(5, TimeUnit.SECONDS).untilAsserted(() ->
MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
index 32b34155aaa3..0d45195830c2 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.kafka.integration;
import java.util.List;
import java.util.Properties;
-import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
@@ -33,7 +32,6 @@ import
org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -114,7 +112,7 @@ public class KafkaConsumerAsyncManualCommitIT extends
BaseKafkaTestSupport {
@DisplayName("Tests that LAST_RECORD_BEFORE_COMMIT header includes a
value")
@Order(1)
@Test
- void testLastRecordBeforeCommitHeader() {
+ void testLastRecordBeforeCommitHeader() throws Exception {
MockEndpoint to =
contextExtension.getMockEndpoint(KafkaTestUtil.MOCK_RESULT);
to.expectedMessageCount(5);
@@ -128,7 +126,7 @@ public class KafkaConsumerAsyncManualCommitIT extends
BaseKafkaTestSupport {
producer.send(data);
}
- Awaitility.await().atMost(10, TimeUnit.SECONDS).untilAsserted(() ->
to.assertIsSatisfied()); // changed to 10 sec for CAMEL-20722
+ to.assertIsSatisfied();
List<Exchange> exchangeList = to.getExchanges();
assertEquals(5, exchangeList.size());
@@ -166,8 +164,7 @@ public class KafkaConsumerAsyncManualCommitIT extends
BaseKafkaTestSupport {
to.expectedMessageCount(3);
to.expectedBodiesReceivedInAnyOrder("message-5", "message-6",
"message-7");
- Awaitility.await().atMost(5, TimeUnit.SECONDS)
- .untilAsserted(() -> to.assertIsSatisfied());
+ to.assertIsSatisfied();
assertEquals(0, failCount, "There should have been 0 commit failures");
}
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAutoInstResumeRouteStrategyIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAutoInstResumeRouteStrategyIT.java
index 545e8d594b91..95e996be96e3 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAutoInstResumeRouteStrategyIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAutoInstResumeRouteStrategyIT.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.kafka.integration;
import java.time.Duration;
import java.util.Collections;
import java.util.Properties;
-import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -30,7 +29,6 @@ import
org.apache.camel.processor.resume.TransientResumeStrategy;
import
org.apache.camel.processor.resume.kafka.KafkaResumeStrategyConfigurationBuilder;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -66,11 +64,12 @@ public class KafkaConsumerAutoInstResumeRouteStrategyIT
extends BaseKafkaTestSup
@Test
@Timeout(value = 30)
- public void testOffsetIsBeingChecked() {
+ public void testOffsetIsBeingChecked() throws Exception {
MockEndpoint mock =
contextExtension.getMockEndpoint(KafkaTestUtil.MOCK_RESULT);
mock.expectedMessageCount(10);
- Awaitility.await().atMost(25, TimeUnit.SECONDS).untilAsserted(() ->
mock.assertIsSatisfied());
+ mock.setResultWaitTime(25000);
+ mock.assertIsSatisfied();
}
@AfterEach
diff --git
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java
index ca84d22b9235..cab796d11126 100644
---
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java
+++
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java
@@ -16,16 +16,12 @@
*/
package org.apache.camel.component.mina;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.awaitility.Awaitility.await;
-
/**
*
*/
@@ -40,7 +36,7 @@ public class MinaSpringMultipleUDPTest extends
CamelSpringTestSupport {
}
@Test
- public void testMinaSpringProtobufEndpoint() {
+ public void testMinaSpringProtobufEndpoint() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedMessageCount(7);
@@ -49,7 +45,6 @@ public class MinaSpringMultipleUDPTest extends
CamelSpringTestSupport {
}
// Sleep for awhile to let the messages go through.
- await().atMost(3, TimeUnit.SECONDS)
- .untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReconnectTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReconnectTest.java
index 0e31de032640..8ca9f80bb796 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReconnectTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReconnectTest.java
@@ -75,8 +75,7 @@ public class NettyConsumerClientModeReconnectTest extends
BaseNettyTest {
LOG.info(">>> routing done");
- Awaitility.await().atMost(5, TimeUnit.SECONDS)
- .untilAsserted(() ->
MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context);
} finally {
LOG.info(">>> shutting down Netty server");
diff --git
a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsConnectionRecoveryTest.java
b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsConnectionRecoveryTest.java
index 0750aa063441..d79dfd4b3191 100644
---
a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsConnectionRecoveryTest.java
+++
b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsConnectionRecoveryTest.java
@@ -133,8 +133,7 @@ public class SjmsConnectionRecoveryTest extends
CamelTestSupport {
// Phase 1: verify normal consumption (also confirms consumer is fully
started)
mock.expectedMessageCount(1);
template.sendBody(SJMS_QUEUE_NAME, "before-failure");
- await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(() -> mock.assertIsSatisfied());
+ mock.assertIsSatisfied();
mock.reset();
// Phase 2: simulate a transient JMS connection exception.
@@ -168,8 +167,7 @@ public class SjmsConnectionRecoveryTest extends
CamelTestSupport {
// Phase 5: verify messages are consumed after recovery.
mock.expectedMessageCount(1);
template.sendBody(SJMS_QUEUE_NAME, "after-failure");
- await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(() -> mock.assertIsSatisfied());
+ mock.assertIsSatisfied();
}
@Override
diff --git
a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
index 723dc468cc36..7784d33844d7 100644
---
a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
+++
b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.snmp;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
@@ -26,7 +24,6 @@ import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
@@ -69,9 +66,7 @@ public class TrapTest extends SnmpTestSupport {
MockEndpoint mock = getMockEndpoint("mock:resultV" + version);
mock.expectedMessageCount(1);
- // wait a bit
- Awaitility.await().atMost(2, TimeUnit.SECONDS)
- .untilAsserted(() -> mock.assertIsSatisfied());
+ mock.assertIsSatisfied();
Message in = mock.getReceivedExchanges().get(0).getIn();
Assertions.assertTrue(in instanceof SnmpMessage, "Expected received
object 'SnmpMessage.class'. Got: " + in.getClass());
diff --git
a/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java
b/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java
index 27d517028c02..4c5ac054be03 100644
---
a/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java
+++
b/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.zeebe;
-import java.time.Duration;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.CamelContext;
@@ -39,7 +39,6 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -78,7 +77,7 @@ class ZeebeConsumerIT extends CamelTestSupport {
MockEndpoint workerMock = getMockEndpoint("mock:jobWorker");
workerMock.expectedMinimumMessageCount(1);
- Awaitility.await().atMost(Duration.ofSeconds(30)).untilAsserted(() ->
MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
List<Exchange> exchanges = workerMock.getExchanges();
for (Exchange exchange : exchanges) {
@@ -108,7 +107,7 @@ class ZeebeConsumerIT extends CamelTestSupport {
MockEndpoint workerMock = getMockEndpoint("mock:jobWorker_JSON");
workerMock.expectedMinimumMessageCount(1);
- Awaitility.await().atMost(Duration.ofSeconds(30)).untilAsserted(() ->
MockEndpoint.assertIsSatisfied(context));
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
List<Exchange> exchanges = workerMock.getExchanges();
for (Exchange exchange : exchanges) {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
index fb42ab2cd86d..9dc2fe981ce9 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -46,8 +45,7 @@ public class DelayerWhileShutdownTest extends
ContextTestSupport {
assertTrue(shortRouteStarted.await(5, TimeUnit.SECONDS),
"Short-delay route should have started processing within 5
seconds");
- await().atMost(5, TimeUnit.SECONDS)
- .untilAsserted(() -> assertMockEndpointsSatisfied());
+ assertMockEndpointsSatisfied();
}
@Override
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelStreamingTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelStreamingTest.java
index f6f4e7ca90cb..a860d8da2630 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelStreamingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelStreamingTest.java
@@ -16,15 +16,11 @@
*/
package org.apache.camel.processor;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import static org.awaitility.Awaitility.await;
-
public class RecipientListParallelStreamingTest extends ContextTestSupport {
@Test
@@ -34,7 +30,7 @@ public class RecipientListParallelStreamingTest extends
ContextTestSupport {
template.sendBodyAndHeader("direct:start", "Hello World", "foo",
"direct:a,direct:b,direct:c");
- await().atMost(10, TimeUnit.SECONDS).untilAsserted(() ->
mock.assertIsSatisfied());
+ mock.assertIsSatisfied();
}
@Test
@@ -44,7 +40,7 @@ public class RecipientListParallelStreamingTest extends
ContextTestSupport {
template.sendBodyAndHeader("direct:streaming", "Hello World", "foo",
"direct:a,direct:b,direct:c");
- await().atMost(10, TimeUnit.SECONDS).untilAsserted(() ->
mock.assertIsSatisfied());
+ mock.assertIsSatisfied();
}
@Override
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SagaRemoveHeadersTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SagaRemoveHeadersTest.java
index c690d8bc8540..7e0eb8d701e7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SagaRemoveHeadersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SagaRemoveHeadersTest.java
@@ -16,16 +16,12 @@
*/
package org.apache.camel.processor;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.saga.InMemorySagaService;
import org.junit.jupiter.api.Test;
-import static org.awaitility.Awaitility.await;
-
/**
* Tests that saga coordination survives removeHeaders("*") in a sub-route.
The coordinator ID is stored internally in
* ExchangeExtension, so it is resilient to header removal.
@@ -55,8 +51,7 @@ public class SagaRemoveHeadersTest extends ContextTestSupport
{
// expected
}
- await().atMost(5, TimeUnit.SECONDS)
- .untilAsserted(() -> assertMockEndpointsSatisfied());
+ assertMockEndpointsSatisfied();
}
@Override
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ConcurrentRequestsThrottlerTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ConcurrentRequestsThrottlerTest.java
index 75a4822b947b..2f5566c33077 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ConcurrentRequestsThrottlerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ConcurrentRequestsThrottlerTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.ThrottlerRejectedExecutionException;
import org.apache.camel.support.SynchronizationAdapter;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
@@ -96,18 +95,15 @@ public class ConcurrentRequestsThrottlerTest extends
ContextTestSupport {
try {
MockEndpoint resultEndpoint =
resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
sendMessagesWithHeaderExpression(executor, resultEndpoint, 2,
MESSAGE_COUNT);
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(resultEndpoint::assertIsSatisfied);
+ resultEndpoint.assertIsSatisfied();
resultEndpoint.reset();
sendMessagesWithHeaderExpression(executor, resultEndpoint, 4,
MESSAGE_COUNT);
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(resultEndpoint::assertIsSatisfied);
+ resultEndpoint.assertIsSatisfied();
resultEndpoint.reset();
sendMessagesWithHeaderExpression(executor, resultEndpoint, 2,
MESSAGE_COUNT);
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(resultEndpoint::assertIsSatisfied);
+ resultEndpoint.assertIsSatisfied();
resultEndpoint.reset();
sendMessagesWithHeaderExpression(executor, resultEndpoint, 4,
MESSAGE_COUNT);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerTest.java
index 7a3489356fec..dd05a3e0871f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerTest.java
@@ -25,7 +25,6 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.ThrottlerRejectedExecutionException;
-import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
@@ -108,18 +107,15 @@ public class ThrottlerTest extends ContextTestSupport {
try {
MockEndpoint resultEndpoint =
resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
sendMessagesWithHeaderExpression(executor, resultEndpoint, 5,
INTERVAL, MESSAGE_COUNT);
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(resultEndpoint::assertIsSatisfied);
+ resultEndpoint.assertIsSatisfied();
resultEndpoint.reset();
sendMessagesWithHeaderExpression(executor, resultEndpoint, 10,
INTERVAL, MESSAGE_COUNT);
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(resultEndpoint::assertIsSatisfied);
+ resultEndpoint.assertIsSatisfied();
resultEndpoint.reset();
sendMessagesWithHeaderExpression(executor, resultEndpoint, 5,
INTERVAL, MESSAGE_COUNT);
- Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(resultEndpoint::assertIsSatisfied);
+ resultEndpoint.assertIsSatisfied();
resultEndpoint.reset();
sendMessagesWithHeaderExpression(executor, resultEndpoint, 10,
INTERVAL, MESSAGE_COUNT);
