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 c1f0d07e0d3 (chores) camel-jms: removed a few Thread.sleep in tests
c1f0d07e0d3 is described below
commit c1f0d07e0d3245df3f2704526e43407a90942a35
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Jun 27 17:57:27 2022 +0200
(chores) camel-jms: removed a few Thread.sleep in tests
---
.../java/org/apache/camel/component/jms/JmsAutoStartupTest.java | 8 +++++---
.../org/apache/camel/component/jms/JmsMultipleConsumersTest.java | 3 ---
.../component/jms/issues/JmsAnotherCustomJMSReplyToTest.java | 6 ++++--
.../camel/component/jms/issues/JmsReplyToLoopIssueTest.java | 9 +++++----
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
index 94f96bd712a..a87f3ba1641 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.jms;
+import java.util.concurrent.TimeUnit;
+
import javax.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
@@ -23,6 +25,7 @@ import org.apache.camel.Service;
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.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -45,9 +48,8 @@ public class JmsAutoStartupTest extends CamelTestSupport {
template.sendBody("activemq:queue:foo", "Hello World");
- Thread.sleep(2000);
-
- assertMockEndpointsSatisfied();
+ Awaitility.await().atMost(2, TimeUnit.SECONDS)
+ .untilAsserted(() -> assertMockEndpointsSatisfied());
mock.reset();
mock.expectedBodiesReceived("Hello World");
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
index 8c1fbbfd36c..938b077ddef 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
@@ -41,9 +41,6 @@ public class JmsMultipleConsumersTest extends
CamelTestSupport {
});
context.start();
- // give it a bit time to setup both topic listeners
- Thread.sleep(2000);
-
getMockEndpoint("mock:foo").expectedMessageCount(1);
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:result").expectedMessageCount(0);
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
index 20b6bac8063..d264964f8f8 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.jms.issues;
+import java.util.concurrent.TimeUnit;
+
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.TextMessage;
@@ -27,6 +29,7 @@ import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import org.springframework.jms.core.JmsTemplate;
@@ -58,8 +61,7 @@ public class JmsAnotherCustomJMSReplyToTest extends
CamelTestSupport {
// send reply
template.sendBody("activemq:" + replyTo.toString(), "My name is
Arnio");
- Thread.sleep(2000);
- assertMockEndpointsSatisfied();
+ Awaitility.await().atMost(2, TimeUnit.SECONDS).untilAsserted(() ->
assertMockEndpointsSatisfied());
}
@Override
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToLoopIssueTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToLoopIssueTest.java
index bb86cfdd3dd..4adb84bce5a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToLoopIssueTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToLoopIssueTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.camel.component.jms.issues;
+import java.util.concurrent.TimeUnit;
+
import javax.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -29,7 +32,7 @@ import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
public class JmsReplyToLoopIssueTest extends CamelTestSupport {
@Test
- public void testReplyToLoopIssue() throws Exception {
+ public void testReplyToLoopIssue() {
getMockEndpoint("mock:foo").expectedBodiesReceived("World");
getMockEndpoint("mock:bar").expectedBodiesReceived("Bye World");
getMockEndpoint("mock:done").expectedBodiesReceived("World");
@@ -37,9 +40,7 @@ public class JmsReplyToLoopIssueTest extends CamelTestSupport
{
template.sendBodyAndHeader("direct:start", "World", "JMSReplyTo",
"queue:bar");
// sleep a little to ensure we do not do endless loop
- Thread.sleep(250);
-
- assertMockEndpointsSatisfied();
+ Awaitility.await().atMost(250, TimeUnit.MILLISECONDS).untilAsserted(()
-> assertMockEndpointsSatisfied());
}
@Override
