Author: davsclaus
Date: Wed May 4 15:33:14 2011
New Revision: 1099488
URL: http://svn.apache.org/viewvc?rev=1099488&view=rev
Log:
Ported unit test from Java DSL to XML DSL.
Added:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java
- copied, changed from r1099417,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml
- copied, changed from r1099417,
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml
Copied:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java
(from r1099417,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java?p2=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java&p1=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java&r1=1099417&r2=1099488&rev=1099488&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java
Wed May 4 15:33:14 2011
@@ -16,23 +16,20 @@
*/
package org.apache.camel.component.jms;
-import java.util.Map;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Headers;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
-
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
*
*/
-public class JmsRoutingSlipInOutTest extends CamelTestSupport {
+public class SpringJmsRoutingSlipInOutTest extends CamelSpringTestSupport {
+
+ @Override
+ protected AbstractApplicationContext createApplicationContext() {
+ return new
ClassPathXmlApplicationContext("org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml");
+ }
@Test
public void testInOutRoutingSlip() throws Exception {
@@ -43,67 +40,4 @@ public class JmsRoutingSlipInOutTest ext
assertMockEndpointsSatisfied();
}
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myBean", new MyBean());
- return jndi;
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("activemq:queue:start")
- .to("direct:start")
- .to("bean:myBean?method=doResult")
- .to("mock:result");
-
- from("direct:start")
- .to("bean:myBean?method=createSlip")
- .setExchangePattern(ExchangePattern.InOut)
- .routingSlip(header("mySlip"))
- .to("bean:myBean?method=backFromSlip");
-
- from("activemq:queue:a")
- .to("bean:myBean?method=doA");
-
- from("activemq:queue:b")
- .to("bean:myBean?method=doB");
- }
- };
- }
-
- public static final class MyBean {
-
- public void createSlip(@Headers Map<String, Object> headers) {
- headers.put("mySlip", "activemq:queue:a,activemq:queue: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;
- }
- }
}
Copied:
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml
(from r1099417,
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml?p2=camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml&p1=camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml&r1=1099417&r2=1099488&rev=1099488&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWire.xml
(original)
+++
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.xml
Wed May 4 15:33:14 2011
@@ -22,14 +22,41 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
- <jmxAgent id="agent" disabled="true"/>
- </camelContext>
-
- <bean id="connectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
- </bean>
- <!-- END SNIPPET: example -->
+ <bean id="myBean"
class="org.apache.camel.component.jms.JmsRoutingSlipInOutTest$MyBean"/>
+
+ <bean id="activemq"
class="org.apache.activemq.camel.component.ActiveMQComponent">
+ <property name="brokerURL"
value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
+ </bean>
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
+
+ <route>
+ <from uri="activemq:queue:start"/>
+ <to uri="direct:start"/>
+ <to uri="bean:myBean?method=doResult"/>
+ <to uri="mock:result"/>
+ </route>
+
+ <route>
+ <from uri="direct:start"/>
+ <to uri="bean:myBean?method=createSlip"/>
+ <setExchangePattern pattern="InOut"/>
+ <routingSlip>
+ <header>mySlip</header>
+ </routingSlip>
+ <to uri="bean:myBean?method=backFromSlip"/>
+ </route>
+
+ <route>
+ <from uri="activemq:queue:a"/>
+ <to uri="bean:myBean?method=doA"/>
+ </route>
+
+ <route>
+ <from uri="activemq:queue:b"/>
+ <to uri="bean:myBean?method=doB"/>
+ </route>
+
+ </camelContext>
</beans>
