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 76050abf307c Use per-class queue names in JMS tests to prevent shared
broker interference (#22138)
76050abf307c is described below
commit 76050abf307c1bfb1093b38214cad5bd76cd3264
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Mar 20 09:57:00 2026 +0100
Use per-class queue names in JMS tests to prevent shared broker
interference (#22138)
Tests sharing an embedded Artemis broker with hardcoded queue names (inbox,
outbox, DLQ, etc.) can interfere with each other during parallel execution.
Append the test class simple name to each queue name so each test class uses
its own isolated queues.
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../jms/JmsComponentTransactedCacheLevelNameTest.java | 6 +++---
.../camel/component/jms/async/AsyncJmsInOutTest.java | 4 ++--
.../integration/issues/JmsTypeConverterIssueIT.java | 4 ++--
.../spring/issues/JmsSpringValidatorIT.java | 4 ++--
.../integration/spring/tx/JmsToJmsTransactedIT.java | 13 +++++++++----
.../spring/tx/async/AsyncEndpointJmsTXIT.java | 4 ++--
.../spring/tx/async/AsyncEndpointJmsTXMulticastIT.java | 4 ++--
.../tx/async/AsyncEndpointJmsTXRecipientListIT.java | 4 ++--
.../spring/tx/async/AsyncEndpointJmsTXRollback2IT.java | 4 ++--
.../spring/tx/async/AsyncEndpointJmsTXRollbackIT.java | 4 ++--
.../tx/async/AsyncEndpointJmsTXRoutingSlipIT.java | 4 ++--
.../tx/async/AsyncEndpointJmsTXTryCatchFinallyIT.java | 4 ++--
.../spring/tx/async/AsyncEndpointJmsTXWireTapIT.java | 4 ++--
.../component/jms/validator/JmsValidatorTest.java | 18 +++++++++---------
.../integration/spring/issues/JmsSpringValidatorIT.xml | 14 +++++++-------
.../apache/camel/itest/issues/RemoveEndpointsTest.java | 6 +++---
.../org/apache/camel/itest/jms/JmsJettyAsyncTest.java | 4 ++--
17 files changed, 55 insertions(+), 50 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTransactedCacheLevelNameTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTransactedCacheLevelNameTest.java
index 92bf8066ea04..203437dff73a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTransactedCacheLevelNameTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTransactedCacheLevelNameTest.java
@@ -63,8 +63,8 @@ public class JmsComponentTransactedCacheLevelNameTest extends
AbstractJMSTest {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- template.sendBody("activemq:queue:foo", "Hello World");
- template.sendBody("activemq:queue:foo", "Bye World");
+
template.sendBody("activemq:queue:foo.JmsComponentTransactedCacheLevelNameTest",
"Hello World");
+
template.sendBody("activemq:queue:foo.JmsComponentTransactedCacheLevelNameTest",
"Bye World");
MockEndpoint.assertIsSatisfied(context);
@@ -83,7 +83,7 @@ public class JmsComponentTransactedCacheLevelNameTest extends
AbstractJMSTest {
return new RouteBuilder() {
@Override
public void configure() {
- from("activemq:queue:foo?transacted=true")
+
from("activemq:queue:foo.JmsComponentTransactedCacheLevelNameTest?transacted=true")
.process(exchange -> {
JmsMessage jms = exchange.getIn(JmsMessage.class);
assertNotNull(jms);
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
index cd8dc2fdbe9d..eaee6a3ffd5c 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
@@ -85,10 +85,10 @@ public class AsyncJmsInOutTest extends AbstractJMSTest {
from("seda:start")
// we can only send at fastest the 100 msg in 5 sec
due the delay
.delay(50)
- .to(ExchangePattern.InOut, "activemq:queue:bar")
+ .to(ExchangePattern.InOut,
"activemq:queue:bar.AsyncJmsInOutTest")
.to("mock:result");
- from("activemq:queue:bar")
+ from("activemq:queue:bar.AsyncJmsInOutTest")
.log("Using ${threadName} to process ${body}")
// we can only process at fastest the 100 msg in 5 sec
due the delay
.delay(50)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsTypeConverterIssueIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsTypeConverterIssueIT.java
index 4a5db671bb33..4bc8af8c1e39 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsTypeConverterIssueIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsTypeConverterIssueIT.java
@@ -76,7 +76,7 @@ public class JmsTypeConverterIssueIT extends AbstractJMSTest {
getMockEndpoint("mock:portalxml").expectedMessageCount(1);
getMockEndpoint("mock:historyxml").expectedMessageCount(1);
- template.sendBody("activemq:queue:inbox", "<?xml
version=\"1.0\"?><agent id=\"123\"></agent>");
+ template.sendBody("activemq:queue:inbox.JmsTypeConverterIssueIT",
"<?xml version=\"1.0\"?><agent id=\"123\"></agent>");
MockEndpoint.assertIsSatisfied(context);
}
@@ -86,7 +86,7 @@ public class JmsTypeConverterIssueIT extends AbstractJMSTest {
return new RouteBuilder() {
@Override
public void configure() {
- from("activemq:queue:inbox")
+ from("activemq:queue:inbox.JmsTypeConverterIssueIT")
.setProperty(Exchange.CHARSET_NAME, constant("UTF-8"))
.setHeader("agentId", xpath("/agent/@id"))
.process(new FixateHeaderValuesProcessor())
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.java
index 353fb0c6fdfb..9212484c9169 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.java
@@ -37,7 +37,7 @@ public class JmsSpringValidatorIT extends SpringJMSBasic {
getMockEndpoint("mock:finally").expectedMessageCount(1);
String body = "<?xml version=\"1.0\"?>\n<p>Hello world!</p>";
- template.sendBody("jms:queue:inbox", body);
+ template.sendBody("jms:queue:inbox.JmsSpringValidatorIT", body);
MockEndpoint.assertIsSatisfied(context);
}
@@ -49,7 +49,7 @@ public class JmsSpringValidatorIT extends SpringJMSBasic {
getMockEndpoint("mock:finally").expectedMessageCount(1);
String body = "<?xml version=\"1.0\"?>\n<foo>Kaboom</foo>";
- template.sendBody("jms:queue:inbox", body);
+ template.sendBody("jms:queue:inbox.JmsSpringValidatorIT", body);
MockEndpoint.assertIsSatisfied(context);
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java
index 0da4420f14a7..a6bce9e58b77 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jms.integration.spring.tx;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
@@ -39,9 +40,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
@Tags({ @Tag("not-parallel"), @Tag("spring"), @Tag("tx") })
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-@Isolated("Uses a shared DLQ queue name and embedded VM broker")
+@Isolated("Uses an embedded VM broker")
public final class JmsToJmsTransactedIT extends CamelSpringTestSupport {
+ private static final String DLQ_NAME = "DLQ." +
JmsToJmsTransactedIT.class.getSimpleName();
private static final int MAX_DELIVERY_ATTEMPTS = 3;
@Order(0)
@@ -52,9 +54,12 @@ public final class JmsToJmsTransactedIT extends
CamelSpringTestSupport {
ArtemisVMService svc = new ArtemisVMService();
svc.customConfiguration(cfg -> {
cfg.getAddressSettings().values()
- .forEach(s ->
s.setMaxDeliveryAttempts(MAX_DELIVERY_ATTEMPTS));
+ .forEach(s -> {
+ s.setMaxDeliveryAttempts(MAX_DELIVERY_ATTEMPTS);
+ s.setDeadLetterAddress(SimpleString.of(DLQ_NAME));
+ });
cfg.addQueueConfiguration(
-
QueueConfiguration.of("DLQ").setRoutingType(RoutingType.ANYCAST));
+
QueueConfiguration.of(DLQ_NAME).setRoutingType(RoutingType.ANYCAST));
});
return svc;
}
@@ -149,7 +154,7 @@ public final class JmsToJmsTransactedIT extends
CamelSpringTestSupport {
MockEndpoint.assertIsSatisfied(context);
// it should be moved to DLQ in JMS broker
- Object body = consumer.receiveBody("activemq:queue:DLQ", 10000);
+ Object body = consumer.receiveBody("activemq:queue:" + DLQ_NAME,
10000);
assertEquals("Hello World", body);
}
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXIT.java
index 2748f891e2f3..74871837b044 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXIT.java
@@ -45,7 +45,7 @@ public class AsyncEndpointJmsTXIT extends
AbstractSpringJMSITSupport {
getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
- template.sendBody("activemq:queue:inbox", "Hello Camel");
+ template.sendBody("activemq:queue:inbox.AsyncEndpointJmsTXIT", "Hello
Camel");
MockEndpoint.assertIsSatisfied(context);
@@ -60,7 +60,7 @@ public class AsyncEndpointJmsTXIT extends
AbstractSpringJMSITSupport {
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("activemq:queue:inbox")
+ from("activemq:queue:inbox.AsyncEndpointJmsTXIT")
.transacted()
.to("mock:before")
.to("log:before")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXMulticastIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXMulticastIT.java
index dd4e3d2675f1..431254bae38e 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXMulticastIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXMulticastIT.java
@@ -45,7 +45,7 @@ public class AsyncEndpointJmsTXMulticastIT extends
AbstractSpringJMSITSupport {
getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
- template.sendBody("activemq:queue:inbox", "Hello Camel");
+
template.sendBody("activemq:queue:inbox.AsyncEndpointJmsTXMulticastIT", "Hello
Camel");
MockEndpoint.assertIsSatisfied(context);
@@ -60,7 +60,7 @@ public class AsyncEndpointJmsTXMulticastIT extends
AbstractSpringJMSITSupport {
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("activemq:queue:inbox")
+ from("activemq:queue:inbox.AsyncEndpointJmsTXMulticastIT")
.transacted()
.to("mock:before")
.to("log:before")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRecipientListIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRecipientListIT.java
index 4027ab8d5b17..3fcad480f0e8 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRecipientListIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRecipientListIT.java
@@ -45,7 +45,7 @@ public class AsyncEndpointJmsTXRecipientListIT extends
AbstractSpringJMSITSuppor
getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
- template.sendBody("activemq:queue:inbox", "Hello Camel");
+
template.sendBody("activemq:queue:inbox.AsyncEndpointJmsTXRecipientListIT",
"Hello Camel");
MockEndpoint.assertIsSatisfied(context);
@@ -60,7 +60,7 @@ public class AsyncEndpointJmsTXRecipientListIT extends
AbstractSpringJMSITSuppor
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("activemq:queue:inbox")
+ from("activemq:queue:inbox.AsyncEndpointJmsTXRecipientListIT")
.transacted()
.to("mock:before")
.to("log:before")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRollback2IT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRollback2IT.java
index a75fd961693b..fb984a488c57 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRollback2IT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRollback2IT.java
@@ -50,7 +50,7 @@ public class AsyncEndpointJmsTXRollback2IT extends
AbstractSpringJMSITSupport {
getMockEndpoint("mock:after").expectedBodiesReceived("Hi Camel", "Hi
Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
- template.sendBody("activemq:queue:inbox", "Hello Camel");
+
template.sendBody("activemq:queue:inbox.AsyncEndpointJmsTXRollback2IT", "Hello
Camel");
MockEndpoint.assertIsSatisfied(context);
@@ -65,7 +65,7 @@ public class AsyncEndpointJmsTXRollback2IT extends
AbstractSpringJMSITSupport {
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("activemq:queue:inbox")
+ from("activemq:queue:inbox.AsyncEndpointJmsTXRollback2IT")
.transacted()
.to("mock:before")
.to("log:before")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRollbackIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRollbackIT.java
index d7f82bfd29b0..91befb744fbe 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRollbackIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRollbackIT.java
@@ -49,7 +49,7 @@ public class AsyncEndpointJmsTXRollbackIT extends
AbstractSpringJMSITSupport {
getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel", "Bye
Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
- template.sendBody("activemq:queue:inbox", "Hello Camel");
+ template.sendBody("activemq:queue:inbox.AsyncEndpointJmsTXRollbackIT",
"Hello Camel");
MockEndpoint.assertIsSatisfied(context);
@@ -64,7 +64,7 @@ public class AsyncEndpointJmsTXRollbackIT extends
AbstractSpringJMSITSupport {
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("activemq:queue:inbox")
+ from("activemq:queue:inbox.AsyncEndpointJmsTXRollbackIT")
.transacted()
.to("mock:before")
.to("log:before")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRoutingSlipIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRoutingSlipIT.java
index 06bc750f3802..be2c11bfc5e2 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRoutingSlipIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXRoutingSlipIT.java
@@ -46,7 +46,7 @@ public class AsyncEndpointJmsTXRoutingSlipIT extends
AbstractSpringJMSITSupport
getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
- template.sendBody("activemq:queue:inbox", "Hello Camel");
+
template.sendBody("activemq:queue:inbox.AsyncEndpointJmsTXRoutingSlipIT",
"Hello Camel");
MockEndpoint.assertIsSatisfied(context);
@@ -61,7 +61,7 @@ public class AsyncEndpointJmsTXRoutingSlipIT extends
AbstractSpringJMSITSupport
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("activemq:queue:inbox")
+ from("activemq:queue:inbox.AsyncEndpointJmsTXRoutingSlipIT")
.transacted()
.to("mock:before")
.to("log:before")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXTryCatchFinallyIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXTryCatchFinallyIT.java
index 854da85945aa..f6370cbb6c6e 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXTryCatchFinallyIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXTryCatchFinallyIT.java
@@ -48,7 +48,7 @@ public class AsyncEndpointJmsTXTryCatchFinallyIT extends
AbstractSpringJMSITSupp
getMockEndpoint("mock:catch").expectedMessageCount(0);
getMockEndpoint("mock:finally").expectedBodiesReceived("Bye Camel");
- template.sendBody("activemq:queue:inbox", "Hello Camel");
+
template.sendBody("activemq:queue:inbox.AsyncEndpointJmsTXTryCatchFinallyIT",
"Hello Camel");
MockEndpoint.assertIsSatisfied(context);
@@ -63,7 +63,7 @@ public class AsyncEndpointJmsTXTryCatchFinallyIT extends
AbstractSpringJMSITSupp
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("activemq:queue:inbox")
+
from("activemq:queue:inbox.AsyncEndpointJmsTXTryCatchFinallyIT")
.transacted()
.to("mock:before")
.to("log:before")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXWireTapIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXWireTapIT.java
index 44196c2534a4..805ce3b6025e 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXWireTapIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/async/AsyncEndpointJmsTXWireTapIT.java
@@ -45,7 +45,7 @@ public class AsyncEndpointJmsTXWireTapIT extends
AbstractSpringJMSITSupport {
getMockEndpoint("mock:tap").expectedBodiesReceived("Hi Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
- template.sendBody("activemq:queue:inbox", "Hello Camel");
+ template.sendBody("activemq:queue:inbox.AsyncEndpointJmsTXWireTapIT",
"Hello Camel");
MockEndpoint.assertIsSatisfied(context);
@@ -60,7 +60,7 @@ public class AsyncEndpointJmsTXWireTapIT extends
AbstractSpringJMSITSupport {
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("activemq:queue:inbox")
+ from("activemq:queue:inbox.AsyncEndpointJmsTXWireTapIT")
.transacted()
.process(exchange ->
assertTrue(exchange.isTransacted(), "Exchange should be transacted"))
.to("async:bye:camel")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/validator/JmsValidatorTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/validator/JmsValidatorTest.java
index c1463fa1d614..9adfc8452500 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/validator/JmsValidatorTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/validator/JmsValidatorTest.java
@@ -44,7 +44,7 @@ public class JmsValidatorTest extends AbstractJMSTest {
getMockEndpoint("mock:finally").expectedMessageCount(1);
String body = "<?xml version=\"1.0\"?>\n<p>Hello world!</p>";
- template.sendBody("jms:queue:inbox", body);
+ template.sendBody("jms:queue:inbox.JmsValidatorTest", body);
MockEndpoint.assertIsSatisfied(context);
}
@@ -56,7 +56,7 @@ public class JmsValidatorTest extends AbstractJMSTest {
getMockEndpoint("mock:finally").expectedMessageCount(1);
String body = "<?xml version=\"1.0\"?>\n<foo>Kaboom</foo>";
- template.sendBody("jms:queue:inbox", body);
+ template.sendBody("jms:queue:inbox.JmsValidatorTest", body);
MockEndpoint.assertIsSatisfied(context);
}
@@ -66,20 +66,20 @@ public class JmsValidatorTest extends AbstractJMSTest {
return new RouteBuilder() {
@Override
public void configure() {
- from("jms:queue:inbox")
+ from("jms:queue:inbox.JmsValidatorTest")
.convertBodyTo(String.class)
.doTry()
.to("validator:file:src/test/resources/org/apache/camel/component/jms/validator/JmsValidatorTestSchema.xsd")
- .to("jms:queue:valid")
+ .to("jms:queue:valid.JmsValidatorTest")
.doCatch(ValidationException.class)
- .to("jms:queue:invalid")
+ .to("jms:queue:invalid.JmsValidatorTest")
.doFinally()
- .to("jms:queue:finally")
+ .to("jms:queue:finally.JmsValidatorTest")
.end();
- from("jms:queue:valid").to("mock:valid");
- from("jms:queue:invalid").to("mock:invalid");
- from("jms:queue:finally").to("mock:finally");
+ from("jms:queue:valid.JmsValidatorTest").to("mock:valid");
+ from("jms:queue:invalid.JmsValidatorTest").to("mock:invalid");
+ from("jms:queue:finally.JmsValidatorTest").to("mock:finally");
}
};
}
diff --git
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.xml
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.xml
index e8d2f718123f..104f5db176f2 100644
---
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.xml
+++
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.xml
@@ -35,32 +35,32 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from uri="jms:queue:inbox"/>
+ <from uri="jms:queue:inbox.JmsSpringValidatorIT"/>
<!-- enforce the body as a String to let it be easier to work with
-->
<convertBodyTo type="String"/>
<doTry>
<to
uri="validator:file:src/test/resources/org/apache/camel/component/jms/validator/JmsValidatorTestSchema.xsd"/>
- <to uri="jms:queue:valid"/>
+ <to uri="jms:queue:valid.JmsSpringValidatorIT"/>
<doCatch>
<exception>org.apache.camel.ValidationException</exception>
- <to uri="jms:queue:invalid"/>
+ <to uri="jms:queue:invalid.JmsSpringValidatorIT"/>
</doCatch>
<doFinally>
- <to uri="jms:queue:finally"/>
+ <to uri="jms:queue:finally.JmsSpringValidatorIT"/>
</doFinally>
</doTry>
</route>
<route>
- <from uri="jms:queue:valid"/>
+ <from uri="jms:queue:valid.JmsSpringValidatorIT"/>
<to uri="mock:valid"/>
</route>
<route>
- <from uri="jms:queue:invalid"/>
+ <from uri="jms:queue:invalid.JmsSpringValidatorIT"/>
<to uri="mock:invalid"/>
</route>
<route>
- <from uri="jms:queue:finally"/>
+ <from uri="jms:queue:finally.JmsSpringValidatorIT"/>
<to uri="mock:finally"/>
</route>
</camelContext>
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java
index d603cb1d4a79..ae38051b48a0 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java
@@ -66,9 +66,9 @@ public class RemoveEndpointsTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:foo").to("jms:queue:foo");
- from("jms:queue:foo").to("mock:jms-queue");
- from("jms:topic:bar").to("mock:jms-topic");
+ from("direct:foo").to("jms:queue:foo." +
RemoveEndpointsTest.class.getSimpleName());
+ from("jms:queue:foo." +
RemoveEndpointsTest.class.getSimpleName()).to("mock:jms-queue");
+ from("jms:topic:bar." +
RemoveEndpointsTest.class.getSimpleName()).to("mock:jms-topic");
from("seda:mem-queue").to("mock:seda-queue");
}
};
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
index 1e0e891b6cc8..7810d885381c 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
+++
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
@@ -47,7 +47,7 @@ public class JmsJettyAsyncTest extends CamelTestSupport {
getMockEndpoint("mock:result").expectsNoDuplicates(body());
for (int i = 0; i < size; i++) {
- template.sendBody("activemq:queue:inbox", Integer.toString(i));
+ template.sendBody("activemq:queue:inbox." +
getClass().getSimpleName(), Integer.toString(i));
}
MockEndpoint.assertIsSatisfied(context, 2, TimeUnit.MINUTES);
@@ -60,7 +60,7 @@ public class JmsJettyAsyncTest extends CamelTestSupport {
@Override
public void configure() {
// enable async consumer to process messages faster
- from("activemq:queue:inbox?asyncConsumer=false")
+ from("activemq:queue:inbox." +
JmsJettyAsyncTest.class.getSimpleName() + "?asyncConsumer=false")
.to("http://0.0.0.0:"; + port + "/myapp")
.to("log:result?groupSize=10", "mock:result");
