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 3456edb757a79a743270cf9c0c11d790bb24e035
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Fri Sep 2 13:14:13 2022 +0200
(chores) camel-jms: avoid triggering the test before the consumer has
connected
---
.../component/jms/JmsInOutFixedReplyQueueTimeoutTest.java | 10 ++++++++++
...tFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java | 5 ++---
...msRequestReplyProcessRepliesConcurrentUsingThreadsTest.java | 10 ++++++++++
.../apache/camel/component/jms/TwoConsumerOnSameTopicTest.java | 7 +++++++
.../camel/component/jms/async/AsyncConsumerInOutTest.java | 10 ++++++++++
.../camel/component/jms/issues/JmsInOutExclusiveTopicTest.java | 10 ++++++++++
6 files changed, 49 insertions(+), 3 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
index f2cb71e20a0..ab466e6d029 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
@@ -23,6 +23,8 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.builder.RouteBuilder;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
@@ -33,6 +35,12 @@ public class JmsInOutFixedReplyQueueTimeoutTest extends
AbstractJMSTest {
protected final String componentName = "activemq";
+ @BeforeEach
+ void waitForConnections() {
+ Awaitility.await().until(() ->
context.getRoute("route-1").getUptimeMillis() > 200);
+ Awaitility.await().until(() ->
context.getRoute("route-2").getUptimeMillis() > 200);
+ }
+
@Test
public void testOk() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
@@ -65,11 +73,13 @@ public class JmsInOutFixedReplyQueueTimeoutTest extends
AbstractJMSTest {
return new RouteBuilder() {
public void configure() {
from("direct:JmsInOutFixedReplyQueueTimeoutTest")
+ .routeId("route-1")
.to(ExchangePattern.InOut,
"activemq:queue:JmsInOutFixedReplyQueueTimeoutTest?replyTo=queue:JmsInOutFixedReplyQueueTimeoutTestReply&requestTimeout=2000")
.to("mock:result");
from("activemq:queue:JmsInOutFixedReplyQueueTimeoutTest")
+ .routeId("route-2")
.choice()
.when(body().isEqualTo("World"))
.log("Sleeping for 4 sec to force a timeout")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
index 13f838dddff..a4ee96ad008 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
@@ -21,9 +21,6 @@ import java.time.Duration;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
-/**
- *
- */
public class JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest
extends JmsInOutFixedReplyQueueTimeoutTest {
@Override
@@ -31,11 +28,13 @@ public class
JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest exten
return new RouteBuilder() {
public void configure() {
from("direct:JmsInOutFixedReplyQueueTimeoutTest")
+ .routeId("route-1")
.to(ExchangePattern.InOut,
"activemq:queue:JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest?replyTo=queue:JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTestReply&useMessageIDAsCorrelationID=true&requestTimeout=2000")
.to("mock:result");
from("activemq:queue:JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest")
+ .routeId("route-2")
.choice().when(body().isEqualTo("World"))
.log("Sleeping for 4 sec to force a timeout")
.delay(Duration.ofSeconds(4).toMillis()).endChoice().end()
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
index 2991ec6880a..8bfe8473dab 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.jms;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,6 +31,12 @@ public class
JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest extends Abs
protected final String componentName = "activemq";
+ @BeforeEach
+ void waitForConnections() {
+ Awaitility.await().until(() ->
context.getRoute("route-1").getUptimeMillis() > 200);
+ Awaitility.await().until(() ->
context.getRoute("route-2").getUptimeMillis() > 200);
+ }
+
@Test
public void testRequestReplyWithConcurrent() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -56,10 +64,12 @@ public class
JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest extends Abs
@Override
public void configure() {
from("activemq:queue:JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest")
+ .routeId("route-1")
.log("request - ${body}")
.transform(body().prepend("Bye "));
from("seda:start")
+ .routeId("route-2")
.setExchangePattern(ExchangePattern.InOut)
.to("activemq:queue:JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest")
.log("reply - ${body}")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
index 550c6109308..fbcd3a97598 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.jms;
import org.apache.camel.builder.RouteBuilder;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -108,6 +109,12 @@ public class TwoConsumerOnSameTopicTest extends
AbstractPersistentJMSTest {
}
}
+ @BeforeEach
+ void waitForConnections() {
+ Awaitility.await().until(() -> context.getRoute("a").getUptimeMillis()
> 200);
+ Awaitility.await().until(() -> context.getRoute("a").getUptimeMillis()
> 200);
+ }
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
index 4517224f54f..6d41c455cfb 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
@@ -22,12 +22,20 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
@Timeout(30)
public class AsyncConsumerInOutTest extends AbstractJMSTest {
+ @BeforeEach
+ void waitForConnections() {
+ Awaitility.await().until(() ->
context.getRoute("route-1").getUptimeMillis() > 200);
+ Awaitility.await().until(() ->
context.getRoute("route-2").getUptimeMillis() > 200);
+ }
+
@Test
public void testAsyncJmsConsumer() throws Exception {
// Hello World is received first despite its send last
@@ -62,6 +70,7 @@ public class AsyncConsumerInOutTest extends AbstractJMSTest {
public void configure() {
// enable async in only mode on the consumer
from("activemq:queue:AsyncConsumerInOutTest.start?asyncConsumer=true")
+ .routeId("route-1")
.choice()
.when(body().contains("Camel"))
.to("async:camel?delay=2000")
@@ -72,6 +81,7 @@ public class AsyncConsumerInOutTest extends AbstractJMSTest {
.to("mock:result");
from("activemq:queue:AsyncConsumerInOutTest.camel")
+ .routeId("route-2")
.to("log:camel")
.transform(constant("Bye Camel"));
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicTest.java
index a996a1c3a8e..f2cd6f8315f 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicTest.java
@@ -18,12 +18,20 @@ package org.apache.camel.component.jms.issues;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOutExclusiveTopicTest extends AbstractJMSTest {
+ @BeforeEach
+ void waitForConnections() {
+ Awaitility.await().until(() ->
context.getRoute("route-1").getUptimeMillis() > 200);
+ Awaitility.await().until(() ->
context.getRoute("route-2").getUptimeMillis() > 200);
+ }
+
@Test
public void testJmsInOutExclusiveTopicTest() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
@@ -44,10 +52,12 @@ public class JmsInOutExclusiveTopicTest extends
AbstractJMSTest {
return new RouteBuilder() {
public void configure() {
from("direct:start")
+ .routeId("route-1")
.to("activemq:topic:news?replyToType=Exclusive&replyTo=queue:JmsInOutExclusiveTopicTest.reply")
.to("mock:result");
from("activemq:topic:news?disableReplyTo=true")
+ .routeId("route-2")
.transform(body().prepend("Bye "))
.process(exchange -> {
String replyTo =
exchange.getIn().getHeader("JMSReplyTo", String.class);
