Author: davsclaus
Date: Tue Sep 30 10:51:12 2008
New Revision: 700535
URL: http://svn.apache.org/viewvc?rev=700535&view=rev
Log:
CAMEL-907: Added unit test for bean binding with injected expression annotations
Added:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
(with props)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
(with props)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
(with props)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
(contents, props changed)
- copied, changed from r700515,
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/camelContext.xml
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
Added:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java?rev=700535&view=auto
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
(added)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
Tue Sep 30 10:51:12 2008
@@ -0,0 +1,90 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.bean;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Bean binding unit test.
+ */
+public class BeanBindingTest extends SpringTestSupport {
+
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new
ClassPathXmlApplicationContext("org/apache/camel/component/bean/beanBindingTest.xml");
+ }
+
+ @Override
+ protected int getExpectedRouteCount() {
+ return 0;
+ }
+
+ public void testBeanBindingUsingBeanExpression() throws Exception {
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedMessageCount(2);
+ result.expectedBodiesReceived("Bye Claus", "Bye James");
+ result.message(0).header("count").isEqualTo(1);
+ result.message(1).header("count").isEqualTo(2);
+
+ template.sendBody("direct:startBeanExpression", "Claus");
+ template.sendBody("direct:startBeanExpression", "James");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testBeanBindingUsingConstantExpression() throws Exception {
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedMessageCount(2);
+ result.expectedBodiesReceived("Bye Claus", "Bye James");
+ result.message(0).header("count").isEqualTo(5);
+ result.message(1).header("count").isEqualTo(5);
+
+ template.sendBody("direct:startConstantExpression", "Claus");
+ template.sendBody("direct:startConstantExpression", "James");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testBeanBindingUsingHeaderExpression() throws Exception {
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedMessageCount(2);
+ result.expectedBodiesReceived("Bye Claus", "Bye James");
+ result.message(0).header("count").isEqualTo(1);
+ result.message(1).header("count").isEqualTo(2);
+
+ template.sendBodyAndHeader("direct:startHeaderExpression", "Claus",
"number", "1");
+ template.sendBodyAndHeader("direct:startHeaderExpression", "James",
"number", "2");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testBeanBindingUsingManyExpression() throws Exception {
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedMessageCount(2);
+ result.expectedBodiesReceived("Bye Claus", "Bye James");
+ result.message(0).header("count").isEqualTo(5 * 3);
+ result.message(1).header("count").isEqualTo(5 * 4);
+
+ template.sendBodyAndHeader("direct:startMany", "Claus", "number", "3");
+ template.sendBodyAndHeader("direct:startMany", "James", "number", "4");
+
+ assertMockEndpointsSatisfied();
+ }
+
+}
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java?rev=700535&r1=700534&r2=700535&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
Tue Sep 30 10:51:12 2008
@@ -18,7 +18,6 @@
import org.apache.camel.spring.SpringTestSupport;
-import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -56,7 +55,6 @@
}
protected int getExpectedRouteCount() {
- // TODO why zero?
return 0;
}
Added:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java?rev=700535&view=auto
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
(added)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
Tue Sep 30 10:51:12 2008
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.bean;
+
+import org.apache.camel.Header;
+import org.apache.camel.MessageDriven;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.language.Bean;
+import org.apache.camel.language.Constant;
+
+/**
+ * Consumer using bean binding with an injected expressions such as: @Bean,
@Constant etc.
+ */
+public class MyBeanBindingConsumer {
+
+ private ProducerTemplate template;
+
+ @MessageDriven(uri = "direct:startBeanExpression")
+ public void doSomethingBeanExpression(String payload, @Bean(value =
"myCounter") int count) {
+ template.sendBodyAndHeader("mock:result", "Bye " + payload, "count",
count);
+ }
+
+ @MessageDriven(uri = "direct:startConstantExpression")
+ public void doSomethingConstantExpression(String payload, @Constant(value
= "5") int count) {
+ template.sendBodyAndHeader("mock:result", "Bye " + payload, "count",
count);
+ }
+
+ @MessageDriven(uri = "direct:startHeaderExpression")
+ public void doSomethingHeaderExpression(String payload, @Header(name =
"number") int count) {
+ template.sendBodyAndHeader("mock:result", "Bye " + payload, "count",
count);
+ }
+
+ @MessageDriven(uri = "direct:startMany")
+ public void doSomethingHeaderExpression(String payload, @Constant(value =
"5") int count, @Header(name = "number") int number) {
+ template.sendBodyAndHeader("mock:result", "Bye " + payload, "count",
count * number);
+ }
+
+ public void setTemplate(ProducerTemplate template) {
+ this.template = template;
+ }
+}
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java?rev=700535&view=auto
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
(added)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
Tue Sep 30 10:51:12 2008
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.bean;
+
+/**
+ * A POJO that just counts
+ */
+public class MyBeanCounter {
+
+ private int count;
+
+ public int count() {
+ return ++count;
+ }
+
+}
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanCounter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
(from r700515,
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/camelContext.xml)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml?p2=activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml&p1=activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/camelContext.xml&r1=700515&r2=700535&rev=700535&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/camelContext.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
Tue Sep 30 10:51:12 2008
@@ -22,9 +22,17 @@
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
- </camelContext>
-
- <bean id="myBean" class="org.apache.camel.component.bean.ExampleBean"/>
+ <camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <template id="template"/>
+
+ <endpoint id="startBeanExpression" uri="direct:startBeanExpression"/>
+ <endpoint id="result" uri="mock:result"/>
+ </camelContext>
+
+ <bean id="myConsumer"
class="org.apache.camel.component.bean.MyBeanBindingConsumer">
+ <property name="template" ref="template"/>
+ </bean>
+
+ <bean id="myCounter"
class="org.apache.camel.component.bean.MyBeanCounter"/>
</beans>
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
