You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/10/18 11:56:04 UTC
svn commit: r1023715 - in /camel/trunk/components:
camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
Author: ningjiang
Date: Mon Oct 18 09:56:04 2010
New Revision: 1023715
URL: http://svn.apache.org/viewvc?rev=1023715&view=rev
Log:
Polish the unit test of JmsMessageBindTest
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java?rev=1023715&r1=1023714&r2=1023715&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java Mon Oct 18 09:56:04 2010
@@ -83,6 +83,7 @@ public class CXFGreeterRouterTest extend
@Test
public void testInvokingServiceFromCXFClient() throws Exception {
+ Thread.sleep(330000);
Service service = Service.create(serviceName);
service.addPort(routerPortName, "http://schemas.xmlsoap.org/soap/",
"http://localhost:9003/CamelContext/RouterPort");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java?rev=1023715&r1=1023714&r2=1023715&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java Mon Oct 18 09:56:04 2010
@@ -16,8 +16,10 @@
*/
package org.apache.camel.component.jms.bind;
+import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.component.jms.JmsBinding;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
@@ -32,8 +34,13 @@ public class JmsMessageBindTest extends
public void testSendAMessageToBean() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedBodiesReceived("Completed");
+
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put("foo", "bar");
+ // this header should not be sent as its value cannot be serialized
+ headers.put("binding", new JmsBinding());
- template.sendBodyAndHeader("activemq:Test.BindingQueue", "SomeBody", "foo", "bar");
+ template.sendBodyAndHeaders("activemq:Test.BindingQueue", "SomeBody", headers);
// lets wait for the method to be invoked
assertMockEndpointsSatisfied();
@@ -42,9 +49,11 @@ public class JmsMessageBindTest extends
MyBean bean = getMandatoryBean(MyBean.class, "myBean");
assertEquals("body", "SomeBody", bean.getBody());
- Map headers = bean.getHeaders();
- assertNotNull("No headers!", headers);
- assertEquals("foo header", "bar", headers.get("foo"));
+ Map beanHeaders = bean.getHeaders();
+ assertNotNull("No headers!", beanHeaders);
+
+ assertEquals("foo header", "bar", beanHeaders.get("foo"));
+ assertNull("Should get a null value", beanHeaders.get("binding"));
}
@Override
Re: svn commit: r1023715 - in /camel/trunk/components:
camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
Posted by Claus Ibsen <cl...@gmail.com>.
Willem there is this Thread.sleep in this commit. I think its a mistake.
On Mon, Oct 18, 2010 at 11:56 AM, <ni...@apache.org> wrote:
> Author: ningjiang
> Date: Mon Oct 18 09:56:04 2010
> New Revision: 1023715
>
> URL: http://svn.apache.org/viewvc?rev=1023715&view=rev
> Log:
> Polish the unit test of JmsMessageBindTest
>
> Modified:
> camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
> camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
>
> Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java?rev=1023715&r1=1023714&r2=1023715&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java (original)
> +++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java Mon Oct 18 09:56:04 2010
> @@ -83,6 +83,7 @@ public class CXFGreeterRouterTest extend
>
> @Test
> public void testInvokingServiceFromCXFClient() throws Exception {
> + Thread.sleep(330000);
> Service service = Service.create(serviceName);
> service.addPort(routerPortName, "http://schemas.xmlsoap.org/soap/",
> "http://localhost:9003/CamelContext/RouterPort");
>
> Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java?rev=1023715&r1=1023714&r2=1023715&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java (original)
> +++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java Mon Oct 18 09:56:04 2010
> @@ -16,8 +16,10 @@
> */
> package org.apache.camel.component.jms.bind;
>
> +import java.util.HashMap;
> import java.util.Map;
>
> +import org.apache.camel.component.jms.JmsBinding;
> import org.apache.camel.component.mock.MockEndpoint;
> import org.apache.camel.test.junit4.CamelSpringTestSupport;
> import org.junit.Test;
> @@ -32,8 +34,13 @@ public class JmsMessageBindTest extends
> public void testSendAMessageToBean() throws Exception {
> MockEndpoint endpoint = getMockEndpoint("mock:result");
> endpoint.expectedBodiesReceived("Completed");
> +
> + Map<String, Object> headers = new HashMap<String, Object>();
> + headers.put("foo", "bar");
> + // this header should not be sent as its value cannot be serialized
> + headers.put("binding", new JmsBinding());
>
> - template.sendBodyAndHeader("activemq:Test.BindingQueue", "SomeBody", "foo", "bar");
> + template.sendBodyAndHeaders("activemq:Test.BindingQueue", "SomeBody", headers);
>
> // lets wait for the method to be invoked
> assertMockEndpointsSatisfied();
> @@ -42,9 +49,11 @@ public class JmsMessageBindTest extends
> MyBean bean = getMandatoryBean(MyBean.class, "myBean");
> assertEquals("body", "SomeBody", bean.getBody());
>
> - Map headers = bean.getHeaders();
> - assertNotNull("No headers!", headers);
> - assertEquals("foo header", "bar", headers.get("foo"));
> + Map beanHeaders = bean.getHeaders();
> + assertNotNull("No headers!", beanHeaders);
> +
> + assertEquals("foo header", "bar", beanHeaders.get("foo"));
> + assertNull("Should get a null value", beanHeaders.get("binding"));
> }
>
> @Override
>
>
>
--
Claus Ibsen
Apache Camel Committer
Author of Camel in Action: http://www.manning.com/ibsen/
Open Source Integration: http://fusesource.com
Blog: http://davsclaus.blogspot.com/
Twitter: http://twitter.com/davsclaus