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/15 13:38:32 UTC
[camel] 02/02: (chores) camel-aws2-s3: remove a few calls to 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
commit dfcf9983c023c67e31db7abf99f31dcb1dcd61ac
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Jun 15 14:13:04 2022 +0200
(chores) camel-aws2-s3: remove a few calls to Thread.sleep
---
components/camel-aws/camel-aws2-s3/pom.xml | 6 ++++++
.../aws2/s3/integration/S3ConsumerIT.java | 7 +++++--
.../s3/integration/S3ConsumerIgnoreBodyIT.java | 7 +++++--
.../s3/integration/S3StreamUploadTimeoutIT.java | 24 ++++++++++++----------
4 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/components/camel-aws/camel-aws2-s3/pom.xml b/components/camel-aws/camel-aws2-s3/pom.xml
index aad6b271905..c4c358b8c53 100644
--- a/components/camel-aws/camel-aws2-s3/pom.xml
+++ b/components/camel-aws/camel-aws2-s3/pom.xml
@@ -81,5 +81,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
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 ff10bd0bd1b..c043b63078d 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
@@ -16,6 +16,8 @@
*/
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;
@@ -23,6 +25,7 @@ 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.Test;
public class S3ConsumerIT extends Aws2S3Base {
@@ -64,8 +67,8 @@ public class S3ConsumerIT extends Aws2S3Base {
}
});
- Thread.sleep(10000);
- assertMockEndpointsSatisfied();
+ Awaitility.await().atMost(10, TimeUnit.SECONDS)
+ .untilAsserted(() -> assertMockEndpointsSatisfied());
}
@Override
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 6767b586184..24c90ca3e55 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,6 +16,8 @@
*/
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;
@@ -23,6 +25,7 @@ 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.Assert;
import org.junit.jupiter.api.Test;
@@ -47,8 +50,8 @@ public class S3ConsumerIgnoreBodyIT extends Aws2S3Base {
}
});
- Thread.sleep(10000);
- assertMockEndpointsSatisfied();
+ Awaitility.await().atMost(10, TimeUnit.SECONDS)
+ .untilAsserted(() -> assertMockEndpointsSatisfied());
Assert.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/S3StreamUploadTimeoutIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
index d07ea499cf8..608d3b47fd9 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
@@ -17,15 +17,16 @@
package org.apache.camel.component.aws2.s3.integration;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.component.aws2.s3.AWS2S3Operations;
import org.apache.camel.component.mock.MockEndpoint;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.s3.model.S3Object;
@@ -47,19 +48,20 @@ public class S3StreamUploadTimeoutIT extends Aws2S3Base {
template.sendBody("direct:stream1", "Andrea\n");
}
- Thread.sleep(11000);
- assertMockEndpointsSatisfied();
+ Awaitility.await().atMost(11, TimeUnit.SECONDS)
+ .untilAsserted(() -> assertMockEndpointsSatisfied());
- Exchange ex = template.request("direct:listObjects", new Processor() {
+ Awaitility.await().atMost(11, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ Exchange ex = template.request("direct:listObjects", this::process);
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listObjects);
- }
- });
+ List<S3Object> resp = ex.getMessage().getBody(List.class);
+ assertEquals(1, resp.size());
+ });
+ }
- List<S3Object> resp = ex.getMessage().getBody(List.class);
- assertEquals(1, resp.size());
+ private void process(Exchange exchange) {
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listObjects);
}
@Override