svn commit: r590607 - /activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java

[js...@apache.org]

Author: jstrachan
Date: Wed Oct 31 02:56:04 2007
New Revision: 590607

URL: http://svn.apache.org/viewvc?rev=590607&view=rev
Log:
added another test case

Added:
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
      - copied, changed from r589979, activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java

Copied: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java (from r589979, activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java?p2=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java&p1=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java&r1=589979&r2=590607&rev=590607&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java Wed Oct 31 02:56:04 2007
@@ -20,13 +20,11 @@
 
 import javax.naming.Context;
 
-import org.apache.camel.Body;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Headers;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
-import org.apache.camel.Properties;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.util.jndi.JndiContext;
@@ -36,7 +34,7 @@
 /**
  * @version $Revision: 1.1 $
  */
-public class BeanWithPropertiesAndHeadersAndBodyInjectionTest extends ContextTestSupport {
+public class BeanWithHeadersAndBodyInjectionTest extends ContextTestSupport {
     private static final transient Log LOG = LogFactory.getLog(BeanRouteTest.class);
     protected MyBean myBean = new MyBean();
 
@@ -53,16 +51,12 @@
             }
         });
 
-        Map foo = myBean.foo;
-        Map bar = myBean.bar;
+        Map foo = myBean.headers;
         assertNotNull("myBean.foo", foo);
-        assertNotNull("myBean.bar", bar);
 
-        assertEquals("foo.p1", "abc", foo.get("p1"));
-        assertEquals("foo.p2", 123, foo.get("p2"));
+        assertEquals("foo.h1", "xyz", foo.get("h1"));
+        assertEquals("foo.h2", 456, foo.get("h2"));
 
-        assertEquals("bar.h1", "xyz", bar.get("h1"));
-        assertEquals("bar.h2", 456, bar.get("h2"));
         assertEquals("body", "TheBody", myBean.body);
     }
 
@@ -82,18 +76,16 @@
     }
 
     public static class MyBean {
-        public Map foo;
-        public Map bar;
-        private String body;
+        public Map<String, Object> headers;
+        public Object body;
 
         @Override
         public String toString() {
-            return "MyBean[foo: " + foo + " bar: " + bar + " body: " + body + "]";
+            return "MyBean[foo: " + headers + " body: " + body + "]";
         }
 
-        public void myMethod(@Properties Map foo, @Headers Map bar, @Body String body) {
-            this.foo = foo;
-            this.bar = bar;
+        public void myMethod(@Headers Map<String, Object> headers,Object body) {
+            this.headers = headers;
             this.body = body;
             LOG.info("myMethod() method called on " + this);
         }