This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit f8dcd50bcb35d1c208808059982927a70ac670c1 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Thu Aug 18 10:09:05 2022 +0200 camel-jms: more adjustments to ensure uniqueness of resources --- .../jms/ActiveMQOriginalDestinationTest.java | 10 ++++---- .../jms/SpringJmsRoutingSlipInOutTest.java | 27 ++++++++++++++++++++++ .../jms/SpringJmsRoutingSlipInOutTest.xml | 2 +- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java index f8688c22202..36adbebd769 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java @@ -28,14 +28,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@TestInstance(TestInstance.Lifecycle.PER_CLASS) public class ActiveMQOriginalDestinationTest extends AbstractJMSTest { protected String componentName = "activemq"; @@ -45,7 +43,7 @@ public class ActiveMQOriginalDestinationTest extends AbstractJMSTest { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - template.sendBody("activemq:queue:foo", "Hello World"); + template.sendBody("activemq:queue:ActiveMQOriginalDestinationTest", "Hello World"); assertMockEndpointsSatisfied(); @@ -53,13 +51,13 @@ public class ActiveMQOriginalDestinationTest extends AbstractJMSTest { Exchange out = consumer.receive("activemq:queue:bar", 5000); assertNotNull(out); - // and we should have foo as the original destination + // and we should have ActiveMQOriginalDestinationTest as the original destination JmsMessage msg = out.getIn(JmsMessage.class); Message jms = msg.getJmsMessage(); ActiveMQMessage amq = assertIsInstanceOf(ActiveMQMessage.class, jms); ActiveMQDestination original = amq.getOriginalDestination(); assertNotNull(original); - assertEquals("foo", original.getPhysicalName()); + assertEquals("ActiveMQOriginalDestinationTest", original.getPhysicalName()); assertEquals("Queue", original.getDestinationTypeAsString()); } @@ -82,7 +80,7 @@ public class ActiveMQOriginalDestinationTest extends AbstractJMSTest { return new RouteBuilder() { @Override public void configure() { - from("activemq:queue:foo") + from("activemq:queue:ActiveMQOriginalDestinationTest") .to("activemq:queue:bar") .to("mock:result"); } diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java index 1a977fb07a1..4075d5e936a 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java @@ -16,6 +16,9 @@ */ package org.apache.camel.component.jms; +import java.util.Map; + +import org.apache.camel.Headers; import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; @@ -40,4 +43,28 @@ public class SpringJmsRoutingSlipInOutTest extends CamelSpringTestSupport { assertMockEndpointsSatisfied(); } + public static final class MyBean { + + public void createSlip(@Headers Map<String, Object> headers) { + headers.put("mySlip", + "activemq:queue:SpringJmsRoutingSlipInOutTest.a,activemq:queue:SpringJmsRoutingSlipInOutTest.b"); + } + + public String backFromSlip(String body) { + return "Done-" + body; + } + + public String doA(String body) { + return "A-" + body; + } + + public String doB(String body) { + return "B-" + body; + } + + public String doResult(String body) { + return "Result-" + body; + } + } + } diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml index 85bf5d63749..8975475f46a 100644 --- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml +++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml @@ -24,7 +24,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> - <bean id="myBean" class="org.apache.camel.component.jms.JmsRoutingSlipInOutTest$MyBean"/> + <bean id="myBean" class="org.apache.camel.component.jms.SpringJmsRoutingSlipInOutTest$MyBean"/> <bean id="activemq" class="org.apache.camel.component.jms.JmsComponent"> <property name="connectionFactory">
