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/03/07 22:15:08 UTC
[camel] branch camel-3.x updated: (chores) camel-jms: avoid sharing unsafe resources
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 1a2620d9f38 (chores) camel-jms: avoid sharing unsafe resources
1a2620d9f38 is described below
commit 1a2620d9f386f49a5cf1a4a168d29d3ca8899521
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Mar 7 13:02:24 2023 -0300
(chores) camel-jms: avoid sharing unsafe resources
Do not reuse queues and topic names to avoid concurrent tests from disturbing each other
---
.../apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java | 2 +-
.../component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java | 2 +-
.../org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.java | 2 +-
.../org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java | 2 +-
.../camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java | 2 +-
.../jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java | 2 +-
.../jms/tx/TransactionErrorHandlerCustomerSpringParserTest.java | 2 +-
.../apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml | 2 +-
.../component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml | 2 +-
.../org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml | 2 +-
.../org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml | 2 +-
.../camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml | 2 +-
.../component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml | 2 +-
.../jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java
index 538dbb52b90..06e226f5d88 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java
@@ -47,7 +47,7 @@ public class JMSTransactionErrorHandlerTest extends AbstractSpringJMSTestSupport
// and not JMS doing the redelivery
mock.message(0).header("JMSRedelivered").isEqualTo(false);
- template.sendBody("activemq:queue:okay", "Hello World");
+ template.sendBody("activemq:queue:okay.JMSTransactionErrorHandlerTest", "Hello World");
mock.assertIsSatisfied();
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
index 5330c9ed8a2..8f3c22aadf7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.java
@@ -77,7 +77,7 @@ public class JMSTransactionIsTransactedRedeliveredTest extends AbstractSpringJMS
// success at 3rd attempt
mock.message(0).header("count").isEqualTo(3);
- template.sendBody("activemq:queue:okay", "Hello World");
+ template.sendBody("activemq:queue:okay.JMSTransactionIsTransactedRedeliveredTest", "Hello World");
mock.assertIsSatisfied();
error.assertIsSatisfied();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.java
index f78034303fb..e728f609a78 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.java
@@ -39,7 +39,7 @@ public class JMSTransactionRollbackTest extends AbstractSpringJMSTestSupport {
getMockEndpoint("mock:before").expectedMessageCount(6);
getMockEndpoint("mock:result").expectedMessageCount(0);
- template.sendBody("activemq:queue:okay", "Hello World");
+ template.sendBody("activemq:queue:okay.JMSTransactionRollbackTest", "Hello World");
MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java
index 7b810b05cf9..713335604fd 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java
@@ -43,7 +43,7 @@ public class JMSTransactionalClientTest extends AbstractSpringJMSTestSupport {
// success at 3rd attempt
mock.message(0).header("count").isEqualTo(3);
- template.sendBody("activemq:queue:okay", "Hello World");
+ template.sendBody("activemq:queue:okay.JMSTransactionalClientTest", "Hello World");
mock.assertIsSatisfied();
// END SNIPPET: e1
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java
index 2ac10e3c16c..fc093f14fef 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java
@@ -42,7 +42,7 @@ public class JMSTransactionalClientWithRollbackTest extends AbstractSpringJMSTes
// success at 3rd attempt
mock.message(0).header("count").isEqualTo(3);
- template.sendBody("activemq:queue:okay", "Hello World");
+ template.sendBody("activemq:queue:okay.JMSTransactionalClientWithRollbackTest", "Hello World");
mock.assertIsSatisfied();
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java
index 5e30e82d55e..65230126358 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java
@@ -42,7 +42,7 @@ public class TransactionErrorHandlerBuilderAsSpringBeanTest extends AbstractSpri
// success at 3rd attempt
mock.message(0).header("count").isEqualTo(3);
- template.sendBody("activemq:queue:okay", "Hello World");
+ template.sendBody("activemq:queue:okay.TransactionErrorHandlerBuilderAsSpringBeanTest", "Hello World");
mock.assertIsSatisfied();
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.java
index f51b260b90d..e2ab19e447d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.java
@@ -42,7 +42,7 @@ public class TransactionErrorHandlerCustomerSpringParserTest extends AbstractSpr
// success at 3rd attempt
mock.message(0).header("count").isEqualTo(3);
- template.sendBody("activemq:queue:okay", "Hello World");
+ template.sendBody("activemq:queue:okay.TransactionErrorHandlerCustomerSpringParserTest", "Hello World");
mock.assertIsSatisfied();
}
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml
index b778517a185..5c06625fc56 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml
@@ -71,7 +71,7 @@
<jmxAgent id="agent" disabled="true"/>
<route errorHandlerRef="myErrorHandler">
<!-- 1: from the jms queue -->
- <from uri="activemq:queue:okay"/>
+ <from uri="activemq:queue:okay.JMSTransactionErrorHandlerTest"/>
<!-- 2: mark this route as transacted -->
<transacted/>
<!-- 3: call our business logic that is myProcessor -->
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
index ebff09184c4..d5d1bb5feae 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
@@ -60,7 +60,7 @@
</errorHandler>
<route id="myRoute" errorHandlerRef="txEH">
- <from uri="activemq:queue:okay"/>
+ <from uri="activemq:queue:okay.JMSTransactionIsTransactedRedeliveredTest"/>
<transacted/>
<to uri="mock:before"/>
<process ref="myProcessor"/>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml
index c1ceb01b5c7..212d0468a45 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionRollbackTest.xml
@@ -56,7 +56,7 @@
</errorHandler>
<route errorHandlerRef="txEH">
- <from uri="activemq:queue:okay"/>
+ <from uri="activemq:queue:okay.JMSTransactionRollbackTest"/>
<transacted/>
<to uri="mock:before"/>
<process ref="myProcessor"/>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
index 197d1a1d65c..a617b952273 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml
@@ -30,7 +30,7 @@
<!-- and now our route using the XML syntax -->
<camel:route errorHandlerRef="errorHandler">
<!-- 1: from the jms queue -->
- <camel:from uri="activemq:queue:okay"/>
+ <camel:from uri="activemq:queue:okay.JMSTransactionalClientTest"/>
<!-- 2: setup the transactional boundaries to require a transaction -->
<camel:transacted ref="PROPAGATION_REQUIRED"/>
<!-- 3: call our business logic that is myProcessor -->
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml
index 33683e4054d..16c014aa4e9 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml
@@ -32,7 +32,7 @@
<!-- and now our route using the XML syntax -->
<route errorHandlerRef="errorHandler">
<!-- 1: from the jms queue -->
- <from uri="activemq:queue:okay"/>
+ <from uri="activemq:queue:okay.JMSTransactionalClientWithRollbackTest"/>
<!-- 2: setup the transactional boundaries to require a transaction -->
<transacted ref="PROPAGATION_REQUIRED"/>
<!-- 3: call our business logic that is myProcessor -->
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
index e9ada51ac18..c248d3709bb 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml
@@ -33,7 +33,7 @@
<!-- in this route the transactionErrorHandler is used -->
<camel:route errorHandlerRef="transactionErrorHandler">
<!-- 1: from the jms queue -->
- <camel:from uri="activemq:queue:okay"/>
+ <camel:from uri="activemq:queue:okay.TransactionErrorHandlerBuilderAsSpringBeanTest"/>
<!-- 2: setup the transactional boundaries to require a transaction -->
<camel:transacted ref="required"/>
<!-- 3: call our business logic that is myProcessor -->
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml
index d08d85442d5..abd7e48b3cf 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerCustomerSpringParserTest.xml
@@ -33,7 +33,7 @@
<!-- in this route the transactionErrorHandler is used -->
<camel:route errorHandlerRef="transactionErrorHandler">
<!-- 1: from the jms queue -->
- <camel:from uri="activemq:queue:okay"/>
+ <camel:from uri="activemq:queue:okay.TransactionErrorHandlerCustomerSpringParserTest"/>
<!-- 2: setup the transactional boundaries to require a transaction -->
<camel:transacted ref="required"/>
<!-- 3: call our business logic that is myProcessor -->