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:30 UTC
[camel] branch main updated (206af22ea7c -> dfcf9983c02)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 206af22ea7c Camel-Hashicorp-vault: Add support for Delete Secret Operation
new b1f0ff73d3a (chores) camel-aws-xray: remove a few calls to Thread.sleep
new dfcf9983c02 (chores) camel-aws2-s3: remove a few calls to Thread.sleep
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-aws/camel-aws-xray/pom.xml | 5 +++++
.../aws/xray/CamelAwsXRayTestSupport.java | 13 ++++++------
.../aws/xray/SpringAwsXRaySimpleRouteTest.java | 7 +++++--
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 ++++++++++++----------
7 files changed, 45 insertions(+), 24 deletions(-)
[camel] 01/02: (chores) camel-aws-xray: remove a few calls to Thread.sleep
Posted by or...@apache.org.
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 b1f0ff73d3aced847da046060abd1b4cffe60761
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Jun 15 13:55:57 2022 +0200
(chores) camel-aws-xray: remove a few calls to Thread.sleep
---
components/camel-aws/camel-aws-xray/pom.xml | 5 +++++
.../camel/component/aws/xray/CamelAwsXRayTestSupport.java | 13 ++++++-------
.../component/aws/xray/SpringAwsXRaySimpleRouteTest.java | 7 +++++--
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/components/camel-aws/camel-aws-xray/pom.xml b/components/camel-aws/camel-aws-xray/pom.xml
index e93c35752f0..7424437b9b1 100644
--- a/components/camel-aws/camel-aws-xray/pom.xml
+++ b/components/camel-aws/camel-aws-xray/pom.xml
@@ -103,6 +103,11 @@
<artifactId>log4j-slf4j-impl</artifactId>
<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-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
index df6ed2bed9e..114138dcbf1 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
@@ -21,6 +21,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace;
@@ -29,6 +30,8 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import static org.awaitility.Awaitility.await;
+
public class CamelAwsXRayTestSupport extends CamelTestSupport {
protected FakeAWSDaemon socketListener = new FakeAWSDaemon();
@@ -87,13 +90,9 @@ public class CamelAwsXRayTestSupport extends CamelTestSupport {
}
protected void verify() {
- try {
- // give the socket listener a bit time to receive the data and transform it to Java objects
- Thread.sleep(500);
- } catch (InterruptedException iEx) {
- // ignore
- }
- Map<String, TestTrace> receivedData = socketListener.getReceivedData();
+ Map<String, TestTrace> receivedData = await().atMost(500, TimeUnit.MILLISECONDS)
+ .until(socketListener::getReceivedData, v -> v.size() == testData.size());
+
TestUtils.checkData(receivedData, testData);
}
}
diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
index 54423f612bb..7cf39175aa2 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws.xray;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
@@ -29,6 +30,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -82,8 +84,9 @@ public class SpringAwsXRaySimpleRouteTest extends CamelSpringTestSupport {
.withSegment(TestDataBuilder.createSegment("dude"))
.withSegment(TestDataBuilder.createSegment("car")));
- Thread.sleep(2000);
+ Map<String, TestTrace> receivedData = await().atMost(2, TimeUnit.SECONDS)
+ .until(socketListener::getReceivedData, v -> v.size() == testData.size());
- TestUtils.checkData(socketListener.getReceivedData(), testData);
+ TestUtils.checkData(receivedData, testData);
}
}
[camel] 02/02: (chores) camel-aws2-s3: remove a few calls to Thread.sleep
Posted by or...@apache.org.
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