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 2023/08/14 14:44:57 UTC
[camel] branch main updated: CAMEL-19741: refactored camel-sjms to support concurrent tests (#11103)
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 c67d8f77a5c CAMEL-19741: refactored camel-sjms to support concurrent tests (#11103)
c67d8f77a5c is described below
commit c67d8f77a5c5ebfaaf16c6f8d1637e43c33bb973
Author: LostArtist <93...@users.noreply.github.com>
AuthorDate: Mon Aug 14 16:44:51 2023 +0200
CAMEL-19741: refactored camel-sjms to support concurrent tests (#11103)
Co-authored-by: Nikita Konovalov <nk...@redhat.com>
---
.../component/sjms/AsyncStartStopListenerTest.java | 20 +++++++--------
.../component/sjms/JmsMessageTimestampTest.java | 4 +--
.../component/sjms/JmsSelectorOptionTest.java | 26 +++++++++----------
.../camel/component/sjms/JmsSelectorTest.java | 8 +++---
.../component/sjms/ReconnectConsumerTest.java | 2 +-
.../component/sjms/ReconnectInOutProducerTest.java | 2 +-
.../component/sjms/ReconnectProducerTest.java | 2 +-
.../component/sjms/SjmsComponentRestartTest.java | 12 ++++-----
.../sjms/SjmsEndpointConnectionSettingsTest.java | 2 +-
.../sjms/SjmsEndpointNameOverrideTest.java | 12 ++++-----
.../camel/component/sjms/SjmsEndpointTest.java | 30 +++++++++++-----------
.../component/sjms/SjmsSendDynamicAwareTest.java | 8 +++---
.../component/sjms/bugfixes/CAMEL6820Test.java | 2 +-
.../sjms/consumer/AsyncConsumerFalseTest.java | 8 +++---
.../sjms/consumer/AsyncConsumerInOutTest.java | 10 ++++----
.../consumer/AutowiredConnectionFactoryTest.java | 2 +-
.../sjms/consumer/EmptyMessageBodyTest.java | 6 ++---
.../consumer/InOnlyConsumerAsyncFalseTest.java | 2 +-
.../sjms/consumer/InOnlyConsumerDefaultTest.java | 2 +-
.../InOnlyConsumerQueueSynchronousTest.java | 2 +-
.../sjms/consumer/InOnlyConsumerQueueTest.java | 2 +-
.../sjms/consumer/InOnlyConsumerTempQueueTest.java | 2 +-
.../sjms/consumer/InOnlyConsumerTopicTest.java | 6 ++---
.../sjms/consumer/InOnlyPooledExchangeTest.java | 2 +-
.../sjms/consumer/InOnlyQueueConsumerTest.java | 2 +-
.../sjms/consumer/InOnlyTopicConsumerTest.java | 2 +-
.../consumer/InOnlyTopicDurableConsumerTest.java | 6 ++---
.../sjms/consumer/InOutConcurrentConsumerTest.java | 4 +--
.../sjms/consumer/InOutConsumerQueueAsyncTest.java | 10 ++++----
.../sjms/consumer/InOutConsumerQueueTest.java | 10 ++++----
.../consumer/InOutConsumerTempQueueAsyncTest.java | 10 ++++----
.../sjms/consumer/InOutConsumerTempQueueTest.java | 8 +++---
.../sjms/consumer/InOutConsumerTopicTest.java | 10 ++++----
.../consumer/InOutSynchronousConsumerTest.java | 4 +--
.../sjms/consumer/JmsPollingConsumerTest.java | 24 ++++++++---------
.../camel/component/sjms/it/AsyncJmsInOutIT.java | 8 +++---
.../component/sjms/it/AsyncJmsInOutTempDestIT.java | 8 +++---
.../camel/component/sjms/it/SyncJmsInOutIT.java | 8 +++---
.../component/sjms/it/SyncJmsInOutTempDestIT.java | 8 +++---
.../sjms/jms/DestinationNameParserTest.java | 8 +++---
.../sjms/producer/AsyncQueueProducerTest.java | 8 +++---
.../sjms/producer/InOnlyQueueProducerTest.java | 2 +-
.../sjms/producer/InOnlyTopicProducerTest.java | 2 +-
.../producer/InOutQueueProducerAsyncLoadTest.java | 2 +-
.../producer/InOutQueueProducerSyncLoadTest.java | 2 +-
.../sjms/producer/InOutQueueProducerTest.java | 2 +-
.../sjms/producer/InOutTempQueueProducerTest.java | 12 ++++-----
.../sjms/producer/QueueProducerQoSTest.java | 4 +--
.../component/sjms/producer/QueueProducerTest.java | 2 +-
.../SjmsToDSendDynamicTwoDisabledTest.java | 10 ++++----
.../sjms/producer/SjmsToDSendDynamicTwoTest.java | 10 ++++----
.../sjms/support/MyInOutTestConsumer.java | 2 +-
.../component/sjms/threadpool/ThreadPoolTest.java | 4 +--
.../sjms/tx/TransactedAsyncExceptionTest.java | 2 +-
.../sjms/tx/TransactedConcurrentConsumersTest.java | 2 +-
.../sjms/tx/TransactedOnCompletionTest.java | 8 +++---
.../sjms/tx/TransactedProducerInOutErrorTest.java | 4 +--
.../sjms/tx/TransactedQueueConsumerTest.java | 2 +-
.../sjms/tx/TransactedQueueInOutProducerTest.java | 12 ++++-----
.../sjms/tx/TransactedQueueProducerTest.java | 8 +++---
.../sjms/tx/TransactedTopicConsumerTest.java | 2 +-
61 files changed, 204 insertions(+), 202 deletions(-)
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
index 7d9b3e6294d..55886c0e946 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
@@ -28,32 +28,32 @@ public class AsyncStartStopListenerTest extends JmsTestSupport {
@Test
public void testAsyncStartConsumer() throws Exception {
- sendBodyAndAssert("sjms:queue:foo.start");
+ sendBodyAndAssert("sjms:queue:foo.start.AsyncStartStopListenerTest");
}
@Test
public void testAsyncStartStopConsumer() throws Exception {
- sendBodyAndAssert("sjms:queue:foo.startstop");
+ sendBodyAndAssert("sjms:queue:foo.startstop.AsyncStartStopListenerTest");
}
@Test
public void testAsyncStopConsumer() throws Exception {
- sendBodyAndAssert("sjms:queue:foo.stop");
+ sendBodyAndAssert("sjms:queue:foo.stop.AsyncStartStopListenerTest");
}
@Test
public void testAsyncStopProducer() throws Exception {
- sendBodyAndAssert("sjms:queue:foo?asyncStopListener=true");
+ sendBodyAndAssert("sjms:queue:foo.AsyncStartStopListenerTest?asyncStopListener=true");
}
@Test
public void testAsyncStartProducer() throws Exception {
- sendBodyAndAssert("sjms:queue:foo?asyncStartListener=true");
+ sendBodyAndAssert("sjms:queue:foo.AsyncStartStopListenerTest?asyncStartListener=true");
}
@Test
public void testAsyncStartStopProducer() throws Exception {
- sendBodyAndAssert("sjms:queue:foo?asyncStopListener=true&asyncStartListener=true");
+ sendBodyAndAssert("sjms:queue:foo.AsyncStartStopListenerTest?asyncStopListener=true&asyncStartListener=true");
}
private void sendBodyAndAssert(final String uri) throws InterruptedException {
@@ -70,10 +70,10 @@ public class AsyncStartStopListenerTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:foo.startstop?asyncStartListener=true&asyncStopListener=true").to("mock:result");
- from("sjms:queue:foo.start?asyncStartListener=true").to("mock:result");
- from("sjms:queue:foo.stop?asyncStopListener=true").to("mock:result");
- from("sjms:queue:foo").to("mock:result");
+ from("sjms:queue:foo.startstop.AsyncStartStopListenerTest?asyncStartListener=true&asyncStopListener=true").to("mock:result");
+ from("sjms:queue:foo.start.AsyncStartStopListenerTest?asyncStartListener=true").to("mock:result");
+ from("sjms:queue:foo.stop.AsyncStartStopListenerTest?asyncStopListener=true").to("mock:result");
+ from("sjms:queue:foo.AsyncStartStopListenerTest").to("mock:result");
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsMessageTimestampTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsMessageTimestampTest.java
index 66a49b90dfc..012ae215de0 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsMessageTimestampTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsMessageTimestampTest.java
@@ -30,7 +30,7 @@ public class JmsMessageTimestampTest extends JmsTestSupport {
result.expectedMessageCount(1);
result.message(0).header(Exchange.MESSAGE_TIMESTAMP).isGreaterThan(0);
- template.sendBody("sjms:queue:hello", "Hello World");
+ template.sendBody("sjms:queue:hello.JmsMessageTimestampTest", "Hello World");
result.assertIsSatisfied();
}
@@ -39,7 +39,7 @@ public class JmsMessageTimestampTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:hello").to("mock:result");
+ from("sjms:queue:hello.JmsMessageTimestampTest").to("mock:result");
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorOptionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorOptionTest.java
index a05eb03e2fc..6b4aff8773d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorOptionTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorOptionTest.java
@@ -41,22 +41,22 @@ public class JmsSelectorOptionTest extends JmsTestSupport {
endpointC.expectedBodiesReceived("Message1", "Message2");
endpointC.expectedMessageCount(2);
- template.sendBodyAndHeader("sjms:queue:hello", "A blue car!", "color", "blue");
- template.sendBodyAndHeader("sjms:queue:hello", "A red car!", "color", "red");
- template.sendBodyAndHeader("sjms:queue:hello", "A blue car, again!", "color", "blue");
- template.sendBodyAndHeader("sjms:queue:hello", "Message1", "SIZE_NUMBER", 1505);
- template.sendBodyAndHeader("sjms:queue:hello", "Message3", "SIZE_NUMBER", 1300);
- template.sendBodyAndHeader("sjms:queue:hello", "Message2", "SIZE_NUMBER", 1600);
+ template.sendBodyAndHeader("sjms:queue:hello.JmsSelectorOptionTest", "A blue car!", "color", "blue");
+ template.sendBodyAndHeader("sjms:queue:hello.JmsSelectorOptionTest", "A red car!", "color", "red");
+ template.sendBodyAndHeader("sjms:queue:hello.JmsSelectorOptionTest", "A blue car, again!", "color", "blue");
+ template.sendBodyAndHeader("sjms:queue:hello.JmsSelectorOptionTest", "Message1", "SIZE_NUMBER", 1505);
+ template.sendBodyAndHeader("sjms:queue:hello.JmsSelectorOptionTest", "Message3", "SIZE_NUMBER", 1300);
+ template.sendBodyAndHeader("sjms:queue:hello.JmsSelectorOptionTest", "Message2", "SIZE_NUMBER", 1600);
MockEndpoint.assertIsSatisfied(context);
}
@Test
public void testConsumerTemplate() {
- template.sendBodyAndHeader("sjms:queue:consumer", "Message1", "SIZE_NUMBER", 1505);
- template.sendBodyAndHeader("sjms:queue:consumer", "Message3", "SIZE_NUMBER", 1300);
- template.sendBodyAndHeader("sjms:queue:consumer", "Message2", "SIZE_NUMBER", 1600);
+ template.sendBodyAndHeader("sjms:queue:consumer.JmsSelectorOptionTest", "Message1", "SIZE_NUMBER", 1505);
+ template.sendBodyAndHeader("sjms:queue:consumer.JmsSelectorOptionTest", "Message3", "SIZE_NUMBER", 1300);
+ template.sendBodyAndHeader("sjms:queue:consumer.JmsSelectorOptionTest", "Message2", "SIZE_NUMBER", 1600);
- Exchange ex = consumer.receive("sjms:queue:consumer?messageSelector=SIZE_NUMBER<1500", 5000L);
+ Exchange ex = consumer.receive("sjms:queue:consumer.JmsSelectorOptionTest?messageSelector=SIZE_NUMBER<1500", 5000L);
Message message = ex.getIn();
int size = message.getHeader("SIZE_NUMBER", int.class);
assertEquals(1300, size, "The message header SIZE_NUMBER should be less than 1500");
@@ -67,9 +67,9 @@ public class JmsSelectorOptionTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:hello?messageSelector=color='blue'").to("mock:a");
- from("sjms:queue:hello?messageSelector=color='red'").to("mock:b");
- from("sjms:queue:hello?messageSelector=SIZE_NUMBER>1500").to("mock:c");
+ from("sjms:queue:hello.JmsSelectorOptionTest?messageSelector=color='blue'").to("mock:a");
+ from("sjms:queue:hello.JmsSelectorOptionTest?messageSelector=color='red'").to("mock:b");
+ from("sjms:queue:hello.JmsSelectorOptionTest?messageSelector=SIZE_NUMBER>1500").to("mock:c");
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
index cf27f32746b..f8437d3a742 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
@@ -37,8 +37,8 @@ public class JmsSelectorTest extends JmsTestSupport {
resultEndpoint.expectedBodiesReceived(expectedBody2);
resultEndpoint.message(0).header("cheese").isEqualTo("y");
- template.sendBodyAndHeader("sjms:test.a", expectedBody, "cheese", "x");
- template.sendBodyAndHeader("sjms:test.a", expectedBody2, "cheese", "y");
+ template.sendBodyAndHeader("sjms:test.a.JmsSelectorTest", expectedBody, "cheese", "x");
+ template.sendBodyAndHeader("sjms:test.a.JmsSelectorTest", expectedBody2, "cheese", "y");
resultEndpoint.assertIsSatisfied();
}
@@ -47,8 +47,8 @@ public class JmsSelectorTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:test.a").to("log:test-before?showAll=true").to("sjms:test.b");
- from("sjms:test.b?messageSelector=cheese='y'").to("log:test-after?showAll=true").to("mock:result");
+ from("sjms:test.a.JmsSelectorTest").to("log:test-before?showAll=true").to("sjms:test.b.JmsSelectorTest");
+ from("sjms:test.b.JmsSelectorTest?messageSelector=cheese='y'").to("log:test-after?showAll=true").to("mock:result");
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectConsumerTest.java
index e8669d8aa5a..37606e5db0a 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectConsumerTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
disabledReason = "Requires control of ActiveMQ, so it can only run locally (embedded or container)")
public class ReconnectConsumerTest extends JmsTestSupport {
- private static final String SJMS_QUEUE_NAME = "sjms:in.only.consumer";
+ private static final String SJMS_QUEUE_NAME = "sjms:in.only.consumer.ReconnectConsumerTest";
private static final String MOCK_RESULT = "mock:result";
@Test
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
index 8ad94cbb9e7..586fdc583a3 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.fail;
disabledReason = "Requires control of ActiveMQ, so it can only run locally (embedded or container)")
public class ReconnectInOutProducerTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "in.out.queue.producer.test";
+ private static final String TEST_DESTINATION_NAME = "in.out.queue.producer.test.ReconnectInOutProducerTest";
@Override
protected boolean useJmx() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
index 845959cb0ea..5f5cb9647f4 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
disabledReason = "Requires control of ActiveMQ, so it can only run locally (embedded or container)")
public class ReconnectProducerTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "sync.queue.producer.test";
+ private static final String TEST_DESTINATION_NAME = "sync.queue.producer.test.ReconnectProducerTest";
@Override
protected boolean useJmx() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
index bb92ddb3689..11a81f0c16a 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
@@ -49,7 +49,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
RouteBuilder routeBuilder = new RouteBuilder(context) {
@Override
public void configure() {
- from("sjms:queue:test").to("mock:test");
+ from("sjms:queue:test.SjmsComponentRestartTest").to("mock:test");
}
};
context.addRoutes(routeBuilder);
@@ -57,7 +57,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
context.start();
getMockEndpoint("mock:test").expectedMessageCount(1);
- template.sendBody("sjms:queue:test", "Hello World");
+ template.sendBody("sjms:queue:test.SjmsComponentRestartTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
// restart
@@ -74,7 +74,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
// and re-create template
template = context.createProducerTemplate();
- template.sendBody("sjms:queue:test", "Hello World");
+ template.sendBody("sjms:queue:test.SjmsComponentRestartTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
context.stop();
@@ -85,7 +85,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
RouteBuilder routeBuilder = new RouteBuilder(context) {
@Override
public void configure() {
- from("sjms:queue:test").to("mock:test");
+ from("sjms:queue:test.SjmsComponentRestartTest").to("mock:test");
}
};
context.addRoutes(routeBuilder);
@@ -93,7 +93,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
context.start();
getMockEndpoint("mock:test").expectedMessageCount(1);
- template.sendBody("sjms:queue:test", "Hello World");
+ template.sendBody("sjms:queue:test.SjmsComponentRestartTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
// restart
@@ -104,7 +104,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
getMockEndpoint("mock:test").expectedMessageCount(1);
- template.sendBody("sjms:queue:test", "Hello World");
+ template.sendBody("sjms:queue:test.SjmsComponentRestartTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
context.stop();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
index 110ad64be56..39bd2e4933b 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
@@ -34,7 +34,7 @@ public class SjmsEndpointConnectionSettingsTest extends CamelTestSupport {
@Test
public void testConnectionFactory() {
- Endpoint endpoint = context.getEndpoint("sjms:queue:test?connectionFactory=#activemq");
+ Endpoint endpoint = context.getEndpoint("sjms:queue:test.SjmsEndpointConnectionSettingsTest?connectionFactory=#activemq");
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint) endpoint;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
index eabe9caee82..99896ce00e5 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
@@ -38,28 +38,28 @@ public class SjmsEndpointNameOverrideTest extends CamelTestSupport {
@Test
public void testDefaults() {
- Endpoint endpoint = context.getEndpoint(BEAN_NAME + ":test");
+ Endpoint endpoint = context.getEndpoint(BEAN_NAME + ":test.SjmsEndpointNameOverrideTest");
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint sjms = (SjmsEndpoint) endpoint;
- assertEquals(BEAN_NAME + "://test", sjms.getEndpointUri());
+ assertEquals(BEAN_NAME + "://test.SjmsEndpointNameOverrideTest", sjms.getEndpointUri());
assertEquals(ExchangePattern.InOnly, sjms.createExchange().getPattern());
}
@Test
public void testQueueEndpoint() {
- Endpoint sjms = context.getEndpoint(BEAN_NAME + ":queue:test");
+ Endpoint sjms = context.getEndpoint(BEAN_NAME + ":queue:test.SjmsEndpointNameOverrideTest");
assertNotNull(sjms);
assertTrue(sjms instanceof SjmsEndpoint);
- assertEquals(BEAN_NAME + "://queue:test", sjms.getEndpointUri());
+ assertEquals(BEAN_NAME + "://queue:test.SjmsEndpointNameOverrideTest", sjms.getEndpointUri());
}
@Test
public void testTopicEndpoint() {
- Endpoint sjms = context.getEndpoint(BEAN_NAME + ":topic:test");
+ Endpoint sjms = context.getEndpoint(BEAN_NAME + ":topic:test.SjmsEndpointNameOverrideTest");
assertNotNull(sjms);
assertTrue(sjms instanceof SjmsEndpoint);
- assertEquals(BEAN_NAME + "://topic:test", sjms.getEndpointUri());
+ assertEquals(BEAN_NAME + "://topic:test.SjmsEndpointNameOverrideTest", sjms.getEndpointUri());
}
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
index f62fe19ab05..cdca02b2abf 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
@@ -40,33 +40,33 @@ public class SjmsEndpointTest extends CamelTestSupport {
@Test
public void testDefaults() {
- Endpoint endpoint = context.getEndpoint("sjms:test");
+ Endpoint endpoint = context.getEndpoint("sjms:test.SjmsEndpointTest");
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint sjms = (SjmsEndpoint) endpoint;
- assertEquals("sjms://test", sjms.getEndpointUri());
+ assertEquals("sjms://test.SjmsEndpointTest", sjms.getEndpointUri());
assertEquals(ExchangePattern.InOnly, sjms.createExchange().getPattern());
}
@Test
public void testQueueEndpoint() {
- Endpoint sjms = context.getEndpoint("sjms:queue:test");
+ Endpoint sjms = context.getEndpoint("sjms:queue:test.SjmsEndpointTest");
assertNotNull(sjms);
- assertEquals("sjms://queue:test", sjms.getEndpointUri());
+ assertEquals("sjms://queue:test.SjmsEndpointTest", sjms.getEndpointUri());
assertTrue(sjms instanceof SjmsEndpoint);
}
@Test
public void testJndiStyleEndpointName() {
- SjmsEndpoint sjms = context.getEndpoint("sjms:/jms/test/hov.t1.dev:topic", SjmsEndpoint.class);
+ SjmsEndpoint sjms = context.getEndpoint("sjms:/jms/test/hov.t1.dev:topic.SjmsEndpointTest", SjmsEndpoint.class);
assertNotNull(sjms);
assertFalse(sjms.isTopic());
- assertEquals("/jms/test/hov.t1.dev:topic", sjms.getDestinationName());
+ assertEquals("/jms/test/hov.t1.dev:topic.SjmsEndpointTest", sjms.getDestinationName());
}
@Test
public void testSetTransacted() {
- Endpoint endpoint = context.getEndpoint("sjms:queue:test?transacted=true");
+ Endpoint endpoint = context.getEndpoint("sjms:queue:test.SjmsEndpointTest?transacted=true");
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint) endpoint;
@@ -75,7 +75,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
@Test
public void testAsyncProducer() {
- Endpoint endpoint = context.getEndpoint("sjms:queue:test?synchronous=true");
+ Endpoint endpoint = context.getEndpoint("sjms:queue:test.SjmsEndpointTest?synchronous=true");
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint) endpoint;
@@ -85,7 +85,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
@Test
public void testReplyTo() {
String replyTo = "reply.to.queue";
- Endpoint endpoint = context.getEndpoint("sjms:queue:test?replyTo=" + replyTo);
+ Endpoint endpoint = context.getEndpoint("sjms:queue:test.SjmsEndpointTest?replyTo=" + replyTo);
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint) endpoint;
@@ -96,7 +96,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
@Test
public void testDefaultExchangePattern() {
try {
- SjmsEndpoint sjms = (SjmsEndpoint) context.getEndpoint("sjms:queue:test");
+ SjmsEndpoint sjms = (SjmsEndpoint) context.getEndpoint("sjms:queue:test.SjmsEndpointTest");
assertNotNull(sjms);
assertEquals(ExchangePattern.InOnly, sjms.getExchangePattern());
// assertTrue(sjms.createExchange().getPattern().equals(ExchangePattern.InOnly));
@@ -108,7 +108,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
@Test
public void testInOnlyExchangePattern() {
try {
- Endpoint sjms = context.getEndpoint("sjms:queue:test?exchangePattern=" + ExchangePattern.InOnly);
+ Endpoint sjms = context.getEndpoint("sjms:queue:test.SjmsEndpointTest?exchangePattern=" + ExchangePattern.InOnly);
assertNotNull(sjms);
assertEquals(ExchangePattern.InOnly, sjms.createExchange().getPattern());
} catch (Exception e) {
@@ -119,7 +119,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
@Test
public void testInOutExchangePattern() {
try {
- Endpoint sjms = context.getEndpoint("sjms:queue:test?exchangePattern=" + ExchangePattern.InOut);
+ Endpoint sjms = context.getEndpoint("sjms:queue:test.SjmsEndpointTest?exchangePattern=" + ExchangePattern.InOut);
assertNotNull(sjms);
assertEquals(ExchangePattern.InOut, sjms.createExchange().getPattern());
} catch (Exception e) {
@@ -130,14 +130,14 @@ public class SjmsEndpointTest extends CamelTestSupport {
@Test
public void testUnsupportedMessageExchangePattern() {
assertThrows(ResolveEndpointFailedException.class,
- () -> context.getEndpoint("sjms:queue:test2?messageExchangePattern=OutOnly"));
+ () -> context.getEndpoint("sjms:queue:test2.SjmsEndpointTest?messageExchangePattern=OutOnly"));
}
@Test
public void testReplyToAndMEPMatch() {
String replyTo = "reply.to.queue";
Endpoint endpoint = context
- .getEndpoint("sjms:queue:test?replyTo=" + replyTo + "&exchangePattern=" + ExchangePattern.InOut);
+ .getEndpoint("sjms:queue:test.SjmsEndpointTest?replyTo=" + replyTo + "&exchangePattern=" + ExchangePattern.InOut);
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint) endpoint;
@@ -147,7 +147,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
@Test
public void testDestinationName() {
- Endpoint endpoint = context.getEndpoint("sjms:queue:test?synchronous=true");
+ Endpoint endpoint = context.getEndpoint("sjms:queue:test.SjmsEndpointTest?synchronous=true");
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint) endpoint;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java
index 401c2a68ebe..c4a7294cf1d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java
@@ -40,10 +40,10 @@ public class SjmsSendDynamicAwareTest extends CamelTestSupport {
this.sjmsSendDynamicAware.setScheme("sjms");
Exchange exchange = createExchangeWithBody("The Body");
SendDynamicAware.DynamicAwareEntry entry
- = new SendDynamicAware.DynamicAwareEntry("sjms:destination", "sjms:${header.test}", null, null);
+ = new SendDynamicAware.DynamicAwareEntry("sjms:destination.SjmsSendDynamicAwareTest", "sjms:${header.test}", null, null);
Processor processor = this.sjmsSendDynamicAware.createPreProcessor(createExchangeWithBody("Body"), entry);
processor.process(exchange);
- assertEquals("destination", exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME));
+ assertEquals("destination.SjmsSendDynamicAwareTest", exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME));
}
@Test
@@ -51,9 +51,9 @@ public class SjmsSendDynamicAwareTest extends CamelTestSupport {
this.sjmsSendDynamicAware.setScheme("sjms");
Exchange exchange = createExchangeWithBody("The Body");
SendDynamicAware.DynamicAwareEntry entry
- = new SendDynamicAware.DynamicAwareEntry("sjms://destination", "sjms://${header.test}", null, null);
+ = new SendDynamicAware.DynamicAwareEntry("sjms://destination.SjmsSendDynamicAwareTest", "sjms://${header.test}", null, null);
Processor processor = this.sjmsSendDynamicAware.createPreProcessor(createExchangeWithBody("Body"), entry);
processor.process(exchange);
- assertEquals("destination", exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME));
+ assertEquals("destination.SjmsSendDynamicAwareTest", exchange.getMessage().getHeader(SjmsConstants.JMS_DESTINATION_NAME));
}
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL6820Test.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL6820Test.java
index fd16a9803d9..c63c6c0e083 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL6820Test.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL6820Test.java
@@ -37,7 +37,7 @@ public class CAMEL6820Test extends JmsTestSupport {
private static final String TEST_DATA_DIR = "target/testdata";
private static final String FILE_OUTPUT_URI = "file:" + TEST_DATA_DIR;
private static final String FILE_INPUT_URI = "file:" + TEST_DATA_DIR;
- private static final String SJMS_QUEUE_URI = "sjms:queue:file.converter.queue";
+ private static final String SJMS_QUEUE_URI = "sjms:queue:file.converter.queue.CAMEL6820Test";
private static final String MOCK_RESULT_URI = "mock:result";
@Test
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
index 6e988a74f7c..30932f2c1af 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
@@ -33,6 +33,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
*/
public class AsyncConsumerFalseTest extends CamelTestSupport {
+ private static final String SJMS_QUEUE_URI = "sjms:queue:start.AsyncConsumerFalseTest";
+
@RegisterExtension
public ArtemisService service = ArtemisServiceFactory.createSingletonVMService();
@@ -41,8 +43,8 @@ public class AsyncConsumerFalseTest extends CamelTestSupport {
// async is disabled (so we should receive in same order)
getMockEndpoint("mock:result").expectedBodiesReceived("Camel", "Hello World");
- template.sendBody("sjms:queue:start", "Hello Camel");
- template.sendBody("sjms:queue:start", "Hello World");
+ template.sendBody("sjms:queue:start.AsyncConsumerFalseTest", "Hello Camel");
+ template.sendBody("sjms:queue:start.AsyncConsumerFalseTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -67,7 +69,7 @@ public class AsyncConsumerFalseTest extends CamelTestSupport {
@Override
public void configure() {
// disable async in only mode on the consumer
- from("sjms:queue:start")
+ from(SJMS_QUEUE_URI)
.choice()
.when(body().contains("Camel"))
.to("async:camel?delay=2000")
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
index 05d4bf6be35..e29a649a6f7 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
@@ -45,8 +45,8 @@ public class AsyncConsumerInOutTest extends CamelTestSupport {
// process the 2nd message on the queue
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Bye Camel");
- template.sendBody("sjms:queue:start", "Hello Camel");
- template.sendBody("sjms:queue:start", "Hello World");
+ template.sendBody("sjms:queue:start.ArtemisService", "Hello Camel");
+ template.sendBody("sjms:queue:start.ArtemisService", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -72,17 +72,17 @@ public class AsyncConsumerInOutTest extends CamelTestSupport {
@Override
public void configure() {
// enable async in only mode on the consumer
- from("sjms:queue:start?asyncConsumer=true")
+ from("sjms:queue:start.ArtemisService?asyncConsumer=true")
.choice()
.when(body().contains("Camel"))
.to("async:camel?delay=2000")
- .to(ExchangePattern.InOut, "sjms:queue:in.out.test?replyTo=response.queue")
+ .to(ExchangePattern.InOut, "sjms:queue:in.out.test.ArtemisService?replyTo=response.queue")
.to("mock:result")
.otherwise()
.to("log:other")
.to("mock:result");
- from("sjms:queue:in.out.test?asyncConsumer=true")
+ from("sjms:queue:in.out.test.ArtemisService?asyncConsumer=true")
.to("log:camel")
.transform(constant("Bye Camel"));
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AutowiredConnectionFactoryTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AutowiredConnectionFactoryTest.java
index 346e6ffebb6..d084314d910 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AutowiredConnectionFactoryTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AutowiredConnectionFactoryTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
public class AutowiredConnectionFactoryTest extends JmsTestSupport {
- private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue";
+ private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue.AutowiredConnectionFactoryTest";
private static final String MOCK_RESULT = "mock:result";
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/EmptyMessageBodyTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/EmptyMessageBodyTest.java
index 990efd8677c..ac9ac8af70e 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/EmptyMessageBodyTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/EmptyMessageBodyTest.java
@@ -27,8 +27,8 @@ public class EmptyMessageBodyTest extends JmsTestSupport {
public void testSynchronous() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(2);
- template.sendBody("sjms:start", "");
- template.sendBody("sjms:start", null);
+ template.sendBody("sjms:start.queue.EmptyMessageBodyTest", "");
+ template.sendBody("sjms:start.queue.EmptyMessageBodyTest", null);
MockEndpoint.assertIsSatisfied(context);
}
@@ -36,7 +36,7 @@ public class EmptyMessageBodyTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:start").to("mock:result");
+ from("sjms:queue:start.queue.EmptyMessageBodyTest").to("mock:result");
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncFalseTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncFalseTest.java
index d0c2c8303e0..8bd983666be 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncFalseTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncFalseTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class InOnlyConsumerAsyncFalseTest extends JmsTestSupport {
- private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.synch";
+ private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.synch.InOnlyConsumerAsyncFalseTest";
private static final String MOCK_RESULT = "mock:result";
private static String beforeThreadName;
private static String afterThreadName;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java
index 75db2cffc5a..31ef5ee9cfd 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
public class InOnlyConsumerDefaultTest extends JmsTestSupport {
- private static final String SJMS_QUEUE_NAME = "sjms:in.only.consumer";
+ private static final String SJMS_QUEUE_NAME = "sjms:in.only.consumer.InOnlyConsumerDefaultTest";
private static final String MOCK_RESULT = "mock:result";
@Test
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
index cce76a9c2b3..631c3c1d7bc 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
public class InOnlyConsumerQueueSynchronousTest extends JmsTestSupport {
- private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue";
+ private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue.InOnlyConsumerQueueSynchronousTest";
private static final String MOCK_RESULT = "mock:result";
@Test
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueTest.java
index 0241b549bdb..9bd56d15195 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
public class InOnlyConsumerQueueTest extends JmsTestSupport {
- private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue";
+ private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue.InOnlyConsumerQueueTest";
private static final String MOCK_RESULT = "mock:result";
@Test
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTempQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTempQueueTest.java
index 826785d96cd..b86edf63440 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTempQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTempQueueTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
public class InOnlyConsumerTempQueueTest extends JmsTestSupport {
- private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.";
+ private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.InOnlyConsumerTempQueueTest";
private static final String MOCK_RESULT = "mock:result";
@Test
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTopicTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTopicTest.java
index 5f61e680868..208668d05bf 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTopicTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTopicTest.java
@@ -33,8 +33,8 @@ public class InOnlyConsumerTopicTest extends JmsTestSupport {
@Test
public void testSynchronous() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello Camel", "Hello World");
- template.sendBody("sjms:topic:in.only.topic", "Hello Camel");
- template.sendBody("sjms:topic:in.only.topic", "Hello World");
+ template.sendBody("sjms:topic:in.only.InOnlyConsumerTopicTest.topic", "Hello Camel");
+ template.sendBody("sjms:topic:in.only.InOnlyConsumerTopicTest.topic", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -42,7 +42,7 @@ public class InOnlyConsumerTopicTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:topic:in.only.topic").to("log:request").process(new Processor() {
+ from("sjms:topic:in.only.InOnlyConsumerTopicTest.topic").to("log:request").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = (String) exchange.getIn().getBody();
if (body.contains("Camel")) {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyPooledExchangeTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyPooledExchangeTest.java
index 89b2bc8c235..d53c3ec1691 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyPooledExchangeTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyPooledExchangeTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class InOnlyPooledExchangeTest extends JmsTestSupport {
- private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue";
+ private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue.InOnlyPooledExchangeTest";
private static final String MOCK_RESULT = "mock:result";
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java
index 461ec7d2708..e5232fe6d9e 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
public class InOnlyQueueConsumerTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "sjms:queue:in.only.queue.consumer.test";
+ private static final String TEST_DESTINATION_NAME = "sjms:queue:in.only.queue.consumer.test.InOnlyQueueConsumerTest";
@Override
protected boolean useJmx() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java
index 83bba4902a4..47580387b6c 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
public class InOnlyTopicConsumerTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "sjms:topic:in.only.topic.consumer.test";
+ private static final String TEST_DESTINATION_NAME = "sjms:topic:in.only.topic.consumer.test.InOnlyTopicConsumerTest";
@Override
protected boolean useJmx() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
index 41b48bd253e..d40024c94db 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
@@ -39,7 +39,7 @@ public class InOnlyTopicDurableConsumerTest extends JmsTestSupport {
// wait a bit and send the message
Thread.sleep(1000);
- template.sendBody("sjms:topic:foo", "Hello World");
+ template.sendBody("sjms:topic:foo.topic.InOnlyTopicDurableConsumerTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -63,10 +63,10 @@ public class InOnlyTopicDurableConsumerTest extends JmsTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("sjms:topic:foo?durableSubscriptionName=bar1")
+ from("sjms:topic:foo.topic.InOnlyTopicDurableConsumerTest?durableSubscriptionName=bar1")
.to("mock:result");
- from("sjms:topic:foo?durableSubscriptionName=bar2")
+ from("sjms:topic:foo.topic.InOnlyTopicDurableConsumerTest?durableSubscriptionName=bar2")
.to("mock:result2");
}
};
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
index 977394b7e2d..a482a08f335 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
@@ -77,10 +77,10 @@ public class InOutConcurrentConsumerTest extends JmsTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .to("sjms:a?replyToConcurrentConsumers=5&replyTo=myResponse")
+ .to("sjms:a.InOutConcurrentConsumerTest?replyToConcurrentConsumers=5&replyTo=myResponse")
.to("mock:result");
- from("sjms:a?concurrentConsumers=5")
+ from("sjms:a.InOutConcurrentConsumerTest?concurrentConsumers=5")
.process(exchange -> {
String body = exchange.getIn().getBody(String.class);
// sleep a little to simulate heavy work and force concurrency processing
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
index ee9ef102835..33a323d381c 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
@@ -30,8 +30,8 @@ public class InOutConsumerQueueAsyncTest extends JmsTestSupport {
public void testAsync() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Hello Camel");
- template.sendBody("sjms:start", "Hello Camel");
- template.sendBody("sjms:start", "Hello World");
+ template.sendBody("sjms:start.queue.InOutConsumerQueueAsyncTest", "Hello Camel");
+ template.sendBody("sjms:start.queue.InOutConsumerQueueAsyncTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -40,14 +40,14 @@ public class InOutConsumerQueueAsyncTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:start?asyncConsumer=true")
+ from("sjms:queue:start.queue.InOutConsumerQueueAsyncTest?asyncConsumer=true")
.log("Requesting ${body} with thread ${threadName}")
.to(ExchangePattern.InOut,
- "sjms:queue:in.out.queue?replyToConcurrentConsumers=2&replyTo=in.out.queue.response")
+ "sjms:queue:in.out.queue.InOutConsumerQueueAsyncTest?replyToConcurrentConsumers=2&replyTo=in.out.queue.response")
.log("Result ${body} with thread ${threadName}")
.to("mock:result");
- from("sjms:queue:in.out.queue?concurrentConsumers=2").to("log:before")
+ from("sjms:queue:in.out.queue.InOutConsumerQueueAsyncTest?concurrentConsumers=2").to("log:before")
.log("Replying ${body} with thread ${threadName}")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
index 0af8ed5baef..afe0300e3e5 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
@@ -29,8 +29,8 @@ public class InOutConsumerQueueTest extends JmsTestSupport {
public void testSynchronous() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello Camel", "Hello World");
- template.sendBody("sjms:start", "Hello Camel");
- template.sendBody("sjms:start", "Hello World");
+ template.sendBody("sjms:start.queue.InOutConsumerQueueTest", "Hello Camel");
+ template.sendBody("sjms:start.queue.InOutConsumerQueueTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -39,11 +39,11 @@ public class InOutConsumerQueueTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:start").to("log:request")
- .to("sjms:queue:in.out.queue?exchangePattern=InOut&replyTo=in.out.queue.response")
+ from("sjms:queue:start.queue.InOutConsumerQueueTest").to("log:request")
+ .to("sjms:queue:in.out.queue.InOutConsumerQueueTest?exchangePattern=InOut&replyTo=in.out.queue.response")
.to("log:response").to("mock:result");
- from("sjms:queue:in.out.queue").process(new Processor() {
+ from("sjms:queue:in.out.queue.InOutConsumerQueueTest").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = (String) exchange.getIn().getBody();
if (body.contains("Camel")) {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
index 0e60d4deb9c..ee930757909 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
@@ -30,8 +30,8 @@ public class InOutConsumerTempQueueAsyncTest extends JmsTestSupport {
public void testAsync() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Hello Camel");
- template.sendBody("sjms:start", "Hello Camel");
- template.sendBody("sjms:start", "Hello World");
+ template.sendBody("sjms:start.queue.InOutConsumerTempQueueAsyncTest", "Hello Camel");
+ template.sendBody("sjms:start.queue.InOutConsumerTempQueueAsyncTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -40,13 +40,13 @@ public class InOutConsumerTempQueueAsyncTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:start?asyncConsumer=true")
+ from("sjms:queue:start.queue.InOutConsumerTempQueueAsyncTest?asyncConsumer=true")
.log("Requesting ${body} with thread ${threadName}")
- .to(ExchangePattern.InOut, "sjms:queue:in.out.temp.queue?replyToConcurrentConsumers=2")
+ .to(ExchangePattern.InOut, "sjms:queue:in.out.temp.queue.InOutConsumerTempQueueAsyncTest?replyToConcurrentConsumers=2")
.log("Result ${body} with thread ${threadName}")
.to("mock:result");
- from("sjms:queue:in.out.temp.queue?concurrentConsumers=2").to("log:before")
+ from("sjms:queue:in.out.temp.queue.InOutConsumerTempQueueAsyncTest?concurrentConsumers=2").to("log:before")
.log("Replying ${body} with thread ${threadName}")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
index b1e05f48c93..7f724e39e09 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
@@ -29,8 +29,8 @@ public class InOutConsumerTempQueueTest extends JmsTestSupport {
public void testSynchronous() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello Camel", "Hello World");
- template.sendBody("sjms:start", "Hello Camel");
- template.sendBody("sjms:start", "Hello World");
+ template.sendBody("sjms:start.queue.InOutConsumerTempQueueTest", "Hello Camel");
+ template.sendBody("sjms:start.queue.InOutConsumerTempQueueTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -38,10 +38,10 @@ public class InOutConsumerTempQueueTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:queue:start").to("sjms:queue:in.out.temp.queue?exchangePattern=InOut")
+ from("sjms:queue:start.queue.InOutConsumerTempQueueTest").to("sjms:queue:in.out.temp.queue.InOutConsumerTempQueueTest?exchangePattern=InOut")
.to("mock:result");
- from("sjms:queue:in.out.temp.queue?exchangePattern=InOut").to("log:before")
+ from("sjms:queue:in.out.temp.queue.InOutConsumerTempQueueTest?exchangePattern=InOut").to("log:before")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = (String) exchange.getIn().getBody();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
index 4e3b2906902..d9ac19cb5a9 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
@@ -33,8 +33,8 @@ public class InOutConsumerTopicTest extends JmsTestSupport {
@Test
public void testSynchronous() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello Camel", "Hello World");
- template.sendBody("sjms:topic:start", "Hello Camel");
- template.sendBody("sjms:topic:start", "Hello World");
+ template.sendBody("sjms:topic:start.topic.InOutConsumerTopicTest", "Hello Camel");
+ template.sendBody("sjms:topic:start.topic.InOutConsumerTopicTest", "Hello World");
Thread.sleep(3000);
MockEndpoint.assertIsSatisfied(context);
}
@@ -43,11 +43,11 @@ public class InOutConsumerTopicTest extends JmsTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("sjms:topic:start").to("log:request")
- .to("sjms:topic:in.out.topic?exchangePattern=InOut&replyTo=in.out.topic.response")
+ from("sjms:topic:start.topic.InOutConsumerTopicTest").to("log:request")
+ .to("sjms:topic:in.out.topic.InOutConsumerTopicTest?exchangePattern=InOut&replyTo=in.out.topic.response")
.to("log:response").to("mock:result");
- from("sjms:topic:in.out.topic?exchangePattern=InOut").process(new Processor() {
+ from("sjms:topic:in.out.topic.InOutConsumerTopicTest?exchangePattern=InOut").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = (String) exchange.getIn().getBody();
if (body.contains("Camel")) {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
index 6db8b1035eb..fc752a09a14 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
@@ -28,7 +28,7 @@ public class InOutSynchronousConsumerTest extends JmsTestSupport {
private static String beforeThreadName;
private static String afterThreadName;
- private String url = "sjms:queue:in?replyTo=response.queue&synchronous=true";
+ private String url = "sjms:queue:in.queue.InOutSynchronousConsumerTest?replyTo=response.queue&synchronous=true";
@Test
public void testSynchronous() {
@@ -50,7 +50,7 @@ public class InOutSynchronousConsumerTest extends JmsTestSupport {
.to("log:after")
.to("mock:result");
- from("sjms:queue:in").process(exchange -> exchange.getMessage().setBody("Bye World"));
+ from("sjms:queue:in.queue.InOutSynchronousConsumerTest").process(exchange -> exchange.getMessage().setBody("Bye World"));
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/JmsPollingConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/JmsPollingConsumerTest.java
index 309c3316dab..5a59602dbf2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/JmsPollingConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/JmsPollingConsumerTest.java
@@ -36,8 +36,8 @@ public class JmsPollingConsumerTest extends JmsTestSupport {
// the message is sent to the queue
CompletableFuture.runAsync(() -> {
- String body = consumer.receiveBody("sjms:queue.start", String.class);
- template.sendBody("sjms:queue.foo", body + " Claus");
+ String body = consumer.receiveBody("sjms:queue.start.JmsPollingConsumerTest", String.class);
+ template.sendBody("sjms:queue.foo.JmsPollingConsumerTest", body + " Claus");
});
// wait a little to demonstrate we can start poll before we have a msg on the queue
@@ -56,10 +56,10 @@ public class JmsPollingConsumerTest extends JmsTestSupport {
// use another thread for polling consumer to demonstrate that we can wait before
// the message is sent to the queue
CompletableFuture.runAsync(() -> {
- String body = consumer.receiveBodyNoWait("sjms:queue.start", String.class);
+ String body = consumer.receiveBodyNoWait("sjms:queue.start.JmsPollingConsumerTest", String.class);
assertNull(body, "Should be null");
- template.sendBody("sjms:queue.foo", "Hello Claus");
+ template.sendBody("sjms:queue.foo.JmsPollingConsumerTest", "Hello Claus");
});
// wait a little to demonstrate we can start poll before we have a msg on the queue
@@ -70,7 +70,7 @@ public class JmsPollingConsumerTest extends JmsTestSupport {
MockEndpoint.assertIsSatisfied(context);
// Consume the message
- consumer.receiveBody("sjms:queue.start", String.class);
+ consumer.receiveBody("sjms:queue.start.JmsPollingConsumerTest", String.class);
}
@Test
@@ -81,10 +81,10 @@ public class JmsPollingConsumerTest extends JmsTestSupport {
// use another thread for polling consumer to demonstrate that we can wait before
// the message is sent to the queue
CompletableFuture.runAsync(() -> {
- String body = consumer.receiveBody("sjms:queue.start", 100, String.class);
+ String body = consumer.receiveBody("sjms:queue.start.JmsPollingConsumerTest", 100, String.class);
assertNull(body, "Should be null");
- template.sendBody("sjms:queue.foo", "Hello Claus");
+ template.sendBody("sjms:queue.foo.JmsPollingConsumerTest", "Hello Claus");
});
// wait a little to demonstrate we can start poll before we have a msg on the queue
@@ -95,7 +95,7 @@ public class JmsPollingConsumerTest extends JmsTestSupport {
MockEndpoint.assertIsSatisfied(context);
// Consume the message
- consumer.receiveBody("sjms:queue.start", String.class);
+ consumer.receiveBody("sjms:queue.start.JmsPollingConsumerTest", String.class);
}
@Test
@@ -106,8 +106,8 @@ public class JmsPollingConsumerTest extends JmsTestSupport {
// use another thread for polling consumer to demonstrate that we can wait before
// the message is sent to the queue
CompletableFuture.runAsync(() -> {
- String body = consumer.receiveBody("sjms:queue.start", 3000, String.class);
- template.sendBody("sjms:queue.foo", body + " Claus");
+ String body = consumer.receiveBody("sjms:queue.start.JmsPollingConsumerTest", 3000, String.class);
+ template.sendBody("sjms:queue.foo.JmsPollingConsumerTest", body + " Claus");
});
// wait a little to demonstrate we can start poll before we have a msg on the queue
@@ -123,9 +123,9 @@ public class JmsPollingConsumerTest extends JmsTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:start").log("Sending ${body} to queue.start").to("sjms:queue.start");
+ from("direct:start").log("Sending ${body} to queue.start.JmsPollingConsumerTest").to("sjms:queue.start.JmsPollingConsumerTest");
- from("sjms:queue.foo").log("Received ${body} from queue.start").to("mock:result");
+ from("sjms:queue.foo.JmsPollingConsumerTest").log("Received ${body} from queue.start.JmsPollingConsumerTest").to("mock:result");
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
index 2d9650f8826..89021ba2c59 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
@@ -41,7 +41,7 @@ public class AsyncJmsInOutIT extends JmsTestSupport {
StopWatch watch = new StopWatch();
for (int i = 0; i < 100; i++) {
- template.sendBody("seda:start", "" + i);
+ template.sendBody("seda:start.queue.AsyncJmsInOutIT", "" + i);
}
// just in case we run on slow boxes
@@ -56,11 +56,11 @@ public class AsyncJmsInOutIT extends JmsTestSupport {
@Override
public void configure() {
- from("seda:start")
- .to("sjms:queue:in.foo?asyncConsumer=true&replyTo=out.bar&exchangePattern=InOut")
+ from("seda:start.queue.AsyncJmsInOutIT")
+ .to("sjms:queue:in.foo.queue.AsyncJmsInOutIT?asyncConsumer=true&replyTo=out.bar&exchangePattern=InOut")
.to("mock:result");
- from("sjms:queue:in.foo?asyncConsumer=true")
+ from("sjms:queue:in.foo.queue.AsyncJmsInOutIT?asyncConsumer=true")
.log("Using ${threadName} to process ${body}")
.transform(body().prepend("Bye "));
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
index 1f6f4f902c5..46ce184d6c7 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
@@ -41,7 +41,7 @@ public class AsyncJmsInOutTempDestIT extends JmsTestSupport {
StopWatch watch = new StopWatch();
for (int i = 0; i < 100; i++) {
- template.sendBody("seda:start", "" + i);
+ template.sendBody("seda:start.AsyncJmsInOutTempDestIT", "" + i);
}
// just in case we run on slow boxes
@@ -56,11 +56,11 @@ public class AsyncJmsInOutTempDestIT extends JmsTestSupport {
@Override
public void configure() {
- from("seda:start")
- .to("sjms:in.foo.tempQ?exchangePattern=InOut")
+ from("seda:start.AsyncJmsInOutTempDestIT")
+ .to("sjms:in.foo.tempQ.AsyncJmsInOutTempDestIT?exchangePattern=InOut")
.to("mock:result");
- from("sjms:in.foo.tempQ?asyncConsumer=true")
+ from("sjms:in.foo.tempQ.AsyncJmsInOutTempDestIT?asyncConsumer=true")
.log("Using ${threadName} to process ${body}")
.transform(body().prepend("Bye "));
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
index 2c7408535f1..1ef7567a00d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
@@ -41,7 +41,7 @@ public class SyncJmsInOutIT extends JmsTestSupport {
StopWatch watch = new StopWatch();
for (int i = 0; i < 100; i++) {
- template.sendBody("seda:start", "" + i);
+ template.sendBody("seda:start.SyncJmsInOutIT", "" + i);
}
// just in case we run on slow boxes
@@ -56,11 +56,11 @@ public class SyncJmsInOutIT extends JmsTestSupport {
@Override
public void configure() {
- from("seda:start")
- .to("sjms:queue:in.foo?replyTo=out.bar&exchangePattern=InOut")
+ from("seda:start.SyncJmsInOutIT")
+ .to("sjms:queue:in.foo.SyncJmsInOutIT?replyTo=out.bar&exchangePattern=InOut")
.to("mock:result");
- from("sjms:queue:in.foo?exchangePattern=InOut")
+ from("sjms:queue:in.foo.SyncJmsInOutIT?exchangePattern=InOut")
.log("Using ${threadName} to process ${body}")
.transform(body().prepend("Bye "));
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
index 917afea8841..25a6da25d62 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
@@ -41,7 +41,7 @@ public class SyncJmsInOutTempDestIT extends JmsTestSupport {
StopWatch watch = new StopWatch();
for (int i = 0; i < 100; i++) {
- template.sendBody("seda:start", "" + i);
+ template.sendBody("seda:start.SyncJmsInOutTempDestIT", "" + i);
}
// just in case we run on slow boxes
@@ -55,11 +55,11 @@ public class SyncJmsInOutTempDestIT extends JmsTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("seda:start")
- .to("sjms:in.foo.tempQ?exchangePattern=InOut")
+ from("seda:start.SyncJmsInOutTempDestIT")
+ .to("sjms:in.foo.tempQ.SyncJmsInOutTempDestIT?exchangePattern=InOut")
.to("mock:result");
- from("sjms:in.foo.tempQ?exchangePattern=InOut")
+ from("sjms:in.foo.tempQ.SyncJmsInOutTempDestIT?exchangePattern=InOut")
.log("Using ${threadName} to process ${body}")
.transform(body().prepend("Bye "));
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
index bf66202fb52..0d051f8aa35 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
@@ -27,8 +27,8 @@ public class DestinationNameParserTest {
@Test
public void testIsTopic() {
- assertTrue(DestinationNameParser.isTopic("topic:foo"));
- assertFalse(DestinationNameParser.isTopic("queue:bar"));
+ assertTrue(DestinationNameParser.isTopic("topic:foo.DestinationNameParserTest"));
+ assertFalse(DestinationNameParser.isTopic("queue:bar.DestinationNameParserTest"));
assertFalse(DestinationNameParser.isTopic("bar"));
}
@@ -40,8 +40,8 @@ public class DestinationNameParserTest {
@Test
public void testGetShortName() {
- assertEquals("foo", DestinationNameParser.getShortName("topic:foo"));
- assertFalse(DestinationNameParser.isTopic("queue:bar"), "bar");
+ assertEquals("foo.DestinationNameParserTest", DestinationNameParser.getShortName("topic:foo.DestinationNameParserTest"));
+ assertFalse(DestinationNameParser.isTopic("queue:bar.DestinationNameParserTest"), "bar");
assertFalse(DestinationNameParser.isTopic("bar"), "bar");
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
index afcf301104f..2dfba6d742d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
@@ -49,7 +49,7 @@ public class AsyncQueueProducerTest extends CamelTestSupport {
getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
- template.sendBody("direct:start", "Hello Camel");
+ template.sendBody("direct:start.AsyncQueueProducerTest", "Hello Camel");
// we should run before the async processor that sets B
route += "A";
@@ -82,7 +82,7 @@ public class AsyncQueueProducerTest extends CamelTestSupport {
public void configure() {
context.addComponent("async", new MyAsyncComponent());
- from("direct:start")
+ from("direct:start.AsyncQueueProducerTest")
.to("mock:before")
.to("log:before")
.process(new Processor() {
@@ -96,9 +96,9 @@ public class AsyncQueueProducerTest extends CamelTestSupport {
afterThreadName = Thread.currentThread().getName();
}
})
- .to("sjms:queue:foo");
+ .to("sjms:queue:foo.AsyncQueueProducerTest");
- from("sjms:queue:foo?asyncConsumer=true")
+ from("sjms:queue:foo.AsyncQueueProducerTest?asyncConsumer=true")
.to("mock:after")
.to("log:after")
.delay(1000)
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyQueueProducerTest.java
index ba569d4c842..45bbcf36c2d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyQueueProducerTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class InOnlyQueueProducerTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "sync.queue.producer.test";
+ private static final String TEST_DESTINATION_NAME = "sync.queue.producer.test.InOnlyQueueProducerTest";
public InOnlyQueueProducerTest() {
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java
index 7918b5a8caa..c9d5a703d09 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class InOnlyTopicProducerTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "test.foo.topic";
+ private static final String TEST_DESTINATION_NAME = "test.foo.topic.InOnlyTopicProducerTest";
public InOnlyTopicProducerTest() {
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
index 4cde886c9d6..48029e9e94f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.fail;
public class InOutQueueProducerAsyncLoadTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "in.out.queue.producer.test";
+ private static final String TEST_DESTINATION_NAME = "in.out.queue.producer.test.InOutQueueProducerAsyncLoadTest";
private MessageConsumer mc1;
private MessageConsumer mc2;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
index 10e764ea9e6..faa0df32b96 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.fail;
public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "in.out.queue.producer.test";
+ private static final String TEST_DESTINATION_NAME = "in.out.queue.producer.test.InOutQueueProducerSyncLoadTest";
private MessageConsumer mc1;
private MessageConsumer mc2;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
index 42927a8a5da..ab4be9db641 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.fail;
public class InOutQueueProducerTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "in.out.queue.producer.test";
+ private static final String TEST_DESTINATION_NAME = "in.out.queue.producer.test.InOutQueueProducerTest";
public InOutQueueProducerTest() {
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java
index a9c92d7ec29..c6d07583140 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java
@@ -36,6 +36,8 @@ import static org.junit.jupiter.api.Assertions.fail;
public class InOutTempQueueProducerTest extends JmsTestSupport {
+ private static final String QUEUE_NAME = "in.out.queue.producer.test.request.InOutTempQueueProducerTest";
+
@Override
protected boolean useJmx() {
return true;
@@ -43,13 +45,12 @@ public class InOutTempQueueProducerTest extends JmsTestSupport {
@Test
public void testInOutQueueProducer() throws Exception {
- String queueName = "in.out.queue.producer.test.request";
- MessageConsumer mc = createQueueConsumer(queueName);
+ MessageConsumer mc = createQueueConsumer(QUEUE_NAME);
assertNotNull(mc);
final String requestText = "Hello World!";
final String responseText = "How are you";
mc.setMessageListener(new MyMessageListener(requestText, responseText));
- Object responseObject = template.requestBody("sjms:queue:" + queueName + "?exchangePattern=InOut", requestText);
+ Object responseObject = template.requestBody("sjms:queue:" + QUEUE_NAME + "?exchangePattern=InOut", requestText);
assertNotNull(responseObject);
assertTrue(responseObject instanceof String);
assertEquals(responseText, responseObject);
@@ -59,14 +60,13 @@ public class InOutTempQueueProducerTest extends JmsTestSupport {
@Test
public void testInOutQueueProducerWithCorrelationId() throws Exception {
- String queueName = "in.out.queue.producer.test.request";
- MessageConsumer mc = createQueueConsumer(queueName);
+ MessageConsumer mc = createQueueConsumer(QUEUE_NAME);
assertNotNull(mc);
final String requestText = "Hello World!";
final String responseText = "How are you";
mc.setMessageListener(new MyMessageListener(requestText, responseText));
final String correlationId = UUID.randomUUID().toString().replace("-", "");
- Exchange exchange = template.request("sjms:queue:" + queueName + "?exchangePattern=InOut", exchange1 -> {
+ Exchange exchange = template.request("sjms:queue:" + QUEUE_NAME + "?exchangePattern=InOut", exchange1 -> {
exchange1.getIn().setBody(requestText);
exchange1.getIn().setHeader("JMSCorrelationID", correlationId);
});
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
index 3815629fedd..ce2fb1c8e92 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
@@ -44,8 +44,8 @@ import static org.junit.jupiter.api.Assertions.fail;
public class QueueProducerQoSTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(QueueProducerQoSTest.class);
- private static final String TEST_INONLY_DESTINATION_NAME = "queue.producer.test.qos.inonly";
- private static final String TEST_INOUT_DESTINATION_NAME = "queue.producer.test.qos.inout";
+ private static final String TEST_INONLY_DESTINATION_NAME = "queue.producer.test.qos.inonly.QueueProducerQoSTest";
+ private static final String TEST_INOUT_DESTINATION_NAME = "queue.producer.test.qos.inout.QueueProducerQoSTest";
private static final String EXPIRED_MESSAGE_ROUTE_ID = "expiredAdvisoryRoute";
private static final String MOCK_EXPIRED_ADVISORY = "mock:expiredAdvisory";
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
index 4f6df90b821..0d072146805 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class QueueProducerTest extends JmsTestSupport {
- private static final String TEST_DESTINATION_NAME = "test.foo";
+ private static final String TEST_DESTINATION_NAME = "test.foo.QueueProducerTest";
public QueueProducerTest() {
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDSendDynamicTwoDisabledTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDSendDynamicTwoDisabledTest.java
index af2370c0ea1..7963a5d922a 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDSendDynamicTwoDisabledTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDSendDynamicTwoDisabledTest.java
@@ -26,12 +26,12 @@ public class SjmsToDSendDynamicTwoDisabledTest extends JmsTestSupport {
@Test
public void testToD() {
- template.sendBodyAndHeader("direct:start", "Hello bar", "where", "bar");
- template.sendBodyAndHeader("direct:start", "Hello beer", "where", "beer");
- template.sendBodyAndHeader("direct:start", "Hello gin", "where", "gin");
+ template.sendBodyAndHeader("direct:start", "Hello bar", "where", "bar.SjmsToDSendDynamicTwoDisabledTest");
+ template.sendBodyAndHeader("direct:start", "Hello beer", "where", "beer.SjmsToDSendDynamicTwoDisabledTest");
+ template.sendBodyAndHeader("direct:start", "Hello gin", "where", "gin.SjmsToDSendDynamicTwoDisabledTest");
- template.sendBodyAndHeader("direct:start2", "Hello beer", "where2", "beer");
- template.sendBodyAndHeader("direct:start2", "Hello whiskey", "where2", "whiskey");
+ template.sendBodyAndHeader("direct:start2", "Hello beer", "where2", "beer.SjmsToDSendDynamicTwoDisabledTest");
+ template.sendBodyAndHeader("direct:start2", "Hello whiskey", "where2", "whiskey.SjmsToDSendDynamicTwoDisabledTest");
// there should be 4 sjms endpoint
long count = context.getEndpoints().stream().filter(e -> e.getEndpointUri().startsWith("sjms:")).count();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDSendDynamicTwoTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDSendDynamicTwoTest.java
index 0ce3aa43795..f8bd2cd54b2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDSendDynamicTwoTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsToDSendDynamicTwoTest.java
@@ -26,12 +26,12 @@ public class SjmsToDSendDynamicTwoTest extends JmsTestSupport {
@Test
public void testToD() {
- template.sendBodyAndHeader("direct:start", "Hello bar", "where", "bar");
- template.sendBodyAndHeader("direct:start", "Hello beer", "where", "beer");
- template.sendBodyAndHeader("direct:start", "Hello gin", "where", "gin");
+ template.sendBodyAndHeader("direct:start", "Hello bar", "where", "bar.SjmsToDSendDynamicTwoTest");
+ template.sendBodyAndHeader("direct:start", "Hello beer", "where", "beer.SjmsToDSendDynamicTwoTest");
+ template.sendBodyAndHeader("direct:start", "Hello gin", "where", "gin.SjmsToDSendDynamicTwoTest");
- template.sendBodyAndHeader("direct:start2", "Hello beer", "where2", "beer");
- template.sendBodyAndHeader("direct:start2", "Hello whiskey", "where2", "whiskey");
+ template.sendBodyAndHeader("direct:start2", "Hello beer", "where2", "beer.SjmsToDSendDynamicTwoTest");
+ template.sendBodyAndHeader("direct:start2", "Hello whiskey", "where2", "whiskey.SjmsToDSendDynamicTwoTest");
// there should be 2 sjms endpoint
long count = context.getEndpoints().stream().filter(e -> e.getEndpointUri().startsWith("sjms:")).count();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java
index 01b7b1a7d25..dece883b3b8 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java
@@ -46,7 +46,7 @@ public class MyInOutTestConsumer implements MessageListener {
private MessageProducer producer;
static {
- clientQueueName = "client.messages";
+ clientQueueName = "client.messages.MyInOutTestConsumer";
ackMode = Session.AUTO_ACKNOWLEDGE;
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java
index 11416e98ce8..21c740c73d8 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java
@@ -54,8 +54,8 @@ public class ThreadPoolTest extends JmsTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:start").to("sjms:queue:foo").routeId(FROM_ROUTE);
- from("sjms:queue:foo").to("log:test.log.1?showBody=true").routeId(TO_ROUTE);
+ from("direct:start").to("sjms:queue:foo.ThreadPoolTest").routeId(FROM_ROUTE);
+ from("sjms:queue:foo.ThreadPoolTest").to("log:test.log.1?showBody=true").routeId(TO_ROUTE);
}
};
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
index 735904e16df..0d02d8c8124 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
@@ -48,7 +48,7 @@ public class TransactedAsyncExceptionTest extends CamelTestSupport {
@Test
public void testRouteWithThread() throws Exception {
- String destination = "sjms:queue:async.exception";
+ String destination = "sjms:queue:async.exception.queue.TransactedAsyncExceptionTest";
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
index 6dedf7a5320..20a01ee4549 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
@@ -29,7 +29,7 @@ public class TransactedConcurrentConsumersTest extends TransactedConsumerSupport
*/
@Test
public void testRoute() throws Exception {
- final String destinationName = "sjms:queue:one.consumer.one.route.test";
+ final String destinationName = "sjms:queue:one.consumer.one.route.test.queue.TransactedAsyncExceptionTest";
int routeCount = 1;
int concurrentConsumers = 2;
int messageCount = 20;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedOnCompletionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedOnCompletionTest.java
index 8f57c012c27..fbf600db4ff 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedOnCompletionTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedOnCompletionTest.java
@@ -42,7 +42,7 @@ public class TransactedOnCompletionTest extends CamelTestSupport {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:onCompletion").expectedBodiesReceived("onCompletion");
- template.sendBody("direct:start", "Hello World");
+ template.sendBody("direct:start.TransactedOnCompletionTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
@@ -63,14 +63,14 @@ public class TransactedOnCompletionTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:start")
+ from("direct:start.TransactedOnCompletionTest")
.onCompletion()
.setBody(simple("onCompletion"))
.to("mock:onCompletion")
.end()
- .to("sjms:queue:test.queue?transacted=true");
+ .to("sjms:queue:test.queue.TransactedOnCompletionTest?transacted=true");
- from("sjms:queue:test.queue?transacted=true")
+ from("sjms:queue:test.queue.TransactedOnCompletionTest?transacted=true")
.to("mock:result");
}
};
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
index d015bdd4812..eecb9c6f5fc 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
@@ -53,10 +53,10 @@ public class TransactedProducerInOutErrorTest {
public void configure() {
from("direct:start")
- .to("sjms:queue:test-in?replyTo=test-out&exchangePattern=InOut&transacted=true")
+ .to("sjms:queue:test-in.TransactedProducerInOutErrorTest?replyTo=test-out&exchangePattern=InOut&transacted=true")
.to("mock:result");
- from("sjms:queue:test-in?exchangePattern=InOut")
+ from("sjms:queue:test-in.TransactedProducerInOutErrorTest?exchangePattern=InOut")
.log("Using ${threadName} to process ${body}")
.transform(body().prepend("Bye "));
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
index 9df72acc66e..ae3bbb9eeef 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
@@ -26,7 +26,7 @@ public class TransactedQueueConsumerTest extends TransactedConsumerSupport {
*/
@Test
public void testRoute() throws Exception {
- final String destinationName = "sjms:queue:one.consumer.one.route.tx.test";
+ final String destinationName = "sjms:queue:one.consumer.one.route.tx.test.TransactedQueueConsumerTest";
int routeCount = 1;
int concurrentConsumers = 1;
int messageCount = 20;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java
index 1f0528b2874..346870cb45b 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java
@@ -76,10 +76,10 @@ public class TransactedQueueInOutProducerTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:start")
- .to("sjms:queue:test.queue?transacted=true")
+ .to("sjms:queue:test.queue.TransactedQueueInOutProducerTest?transacted=true")
// request/reply is not transacted
- .to(ExchangePattern.InOut, "sjms:queue:test.transform")
- .to("sjms:queue:test.queue2?transacted=true")
+ .to(ExchangePattern.InOut, "sjms:queue:test.transform.TransactedQueueInOutProducerTest")
+ .to("sjms:queue:test.queue2.TransactedQueueInOutProducerTest?transacted=true")
.process(
new Processor() {
@Override
@@ -93,13 +93,13 @@ public class TransactedQueueInOutProducerTest extends CamelTestSupport {
}
});
- from("sjms:queue:test.queue?transacted=true")
+ from("sjms:queue:test.queue.TransactedQueueInOutProducerTest?transacted=true")
.to("mock:result");
- from("sjms:queue:test.queue2?transacted=true")
+ from("sjms:queue:test.queue2.TransactedQueueInOutProducerTest?transacted=true")
.to("mock:result2");
- from("sjms:queue:test.transform")
+ from("sjms:queue:test.transform.TransactedQueueInOutProducerTest")
.transform(body().prepend("Changed "));
}
};
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
index d74bd71f255..6843c443550 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
@@ -75,8 +75,8 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:start")
- .to("sjms:queue:test.queue?transacted=true")
- .to("sjms:queue:test.queue2?transacted=true")
+ .to("sjms:queue:test.queue.TransactedQueueProducerTest.queue?transacted=true")
+ .to("sjms:queue:test.queue2.TransactedQueueProducerTest.queue2?transacted=true")
.process(
new Processor() {
@Override
@@ -90,10 +90,10 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
}
});
- from("sjms:queue:test.queue?transacted=true")
+ from("sjms:queue:test.queue.TransactedQueueProducerTest.queue?transacted=true")
.to("mock:result");
- from("sjms:queue:test.queue2?transacted=true")
+ from("sjms:queue:test.queue2.TransactedQueueProducerTest.queue2?transacted=true")
.to("mock:result2");
}
};
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
index 010808656f6..689d1f57f05 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
@@ -26,7 +26,7 @@ public class TransactedTopicConsumerTest extends TransactedConsumerSupport {
*/
@Test
public void testRoute() throws Exception {
- final String destinationName = "sjms:topic:one.consumer.one.route.tx.test";
+ final String destinationName = "sjms:topic:one.consumer.one.route.tx.test.TransactedTopicConsumerTest";
int routeCount = 2;
int concurrentConsumers = 1;
int messageCount = 20;