You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/08/19 08:38:39 UTC

svn commit: r567359 - in /activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean: BodyAnnotationToDisambiguateMethodsTest.java ExpressionAnnotationToDisambiguateMethodsTest.java

Author: jstrachan
Date: Sat Aug 18 23:38:38 2007
New Revision: 567359

URL: http://svn.apache.org/viewvc?view=rev&rev=567359
Log:
test cases showing method disambiguation using annotations

Added:
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java   (contents, props changed)
      - copied, changed from r567358, activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java   (with props)

Copied: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java (from r567358, activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java?view=diff&rev=567359&p1=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java&r1=567358&p2=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java&r2=567359
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java Sat Aug 18 23:38:38 2007
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.bean;
 
+import org.apache.camel.Body;
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.language.Simple;
+import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.util.jndi.JndiContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -29,7 +29,7 @@
 /**
  * @version $Revision: 1.1 $
  */
-public class BeanWithExpressionInjectionTest extends ContextTestSupport {
+public class BodyAnnotationToDisambiguateMethodsTest extends ContextTestSupport {
     private static final transient Log LOG = LogFactory.getLog(BeanRouteTest.class);
     protected MyBean myBean = new MyBean();
 
@@ -39,7 +39,6 @@
         template.sendBodyAndHeader("direct:in", expectedBody, "foo", "bar");
 
         assertEquals("bean body: " + myBean, expectedBody, myBean.body);
-        assertEquals("bean foo: " + myBean, "bar", myBean.foo);
     }
 
     @Override
@@ -59,17 +58,18 @@
 
     public static class MyBean {
         public String body;
-        public String foo;
 
-        @Override
-        public String toString() {
-            return "MyBean[foo: " + foo + " body: " + body + "]";
+        public void bar(String body) {
+            fail("bar() called with: " + body);
         }
 
-        public void read(String body, @Simple("header.foo") String foo) {
-            this.foo = foo;
+        public void foo(@Body String body) {
             this.body = body;
-            LOG.info("read() method called on " + this);
+            LOG.info("foo() method called on " + this);
+        }
+
+        public void wrongMethod(String body) {
+            fail("wrongMethod() called with: " + body);
         }
     }
 }

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java?view=auto&rev=567359
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java Sat Aug 18 23:38:38 2007
@@ -0,0 +1,73 @@
+/**
+ * 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.ContextTestSupport;
+import org.apache.camel.language.Simple;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.processor.BeanRouteTest;
+import org.apache.camel.util.jndi.JndiContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.naming.Context;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class ExpressionAnnotationToDisambiguateMethodsTest extends ContextTestSupport {
+    private static final transient Log LOG = LogFactory.getLog(BeanRouteTest.class);
+    protected MyBean myBean = new MyBean();
+
+    public void testSendMessage() throws Exception {
+        template.sendBodyAndHeader("direct:in", "<hello>world!</hello>", "foo", "bar");
+
+        assertEquals("bean body: " + myBean, "bar", myBean.bar);
+    }
+
+    @Override
+    protected Context createJndiContext() throws Exception {
+        JndiContext answer = new JndiContext();
+        answer.bind("myBean", myBean);
+        return answer;
+    }
+
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            public void configure() {
+                from("direct:in").beanRef("myBean");
+            }
+        };
+    }
+
+    public static class MyBean {
+        public String bar;
+
+        public void bar(String body) {
+            fail("bar() called with: " + body);
+        }
+
+        public void foo(@Simple("header.foo") String bar) {
+            this.bar = bar;
+            LOG.info("foo() method called with: " + bar);
+        }
+
+        public void wrongMethod(String body) {
+            fail("wrongMethod() called with: " + body);
+        }
+    }
+}
\ No newline at end of file

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native