svn commit: r631524 - in /activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor: ExpressionAdapter.java SetHeaderUsingDslExpressionsTest.java

[js...@apache.org]

Author: jstrachan
Date: Wed Feb 27 01:31:38 2008
New Revision: 631524

URL: http://svn.apache.org/viewvc?rev=631524&view=rev
Log:
added a helper class, ExpressionAdapter which makes it easier to write new expression classes inside the Java DSL with a minimal amount of coding

Added:
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java   (with props)
Modified:
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java

Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java?rev=631524&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java Wed Feb 27 01:31:38 2008
@@ -0,0 +1,37 @@
+/**
+ *
+ * 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.processor;
+
+import org.apache.camel.Expression;
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.ExpressionSupport;
+
+/**
+ * A helper class for developers wishing to implement an {@link Expression} using Java code with a minimum amount
+ * of code to write so that the developer only needs to implement the {@link #evaluate(Exchange)} method.
+ * 
+ * @version $Revision: 1.1 $
+ */
+public abstract class ExpressionAdapter extends ExpressionSupport<Exchange> {
+    public abstract Object evaluate(Exchange exchange);
+
+    protected String assertionFailureMessage(Exchange exchange) {
+        return toString();
+    }
+
+}

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java?rev=631524&r1=631523&r2=631524&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java Wed Feb 27 01:31:38 2008
@@ -18,6 +18,7 @@
 package org.apache.camel.processor;
 
 import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 
@@ -28,6 +29,36 @@
     protected String body = "<person name='James' city='London'/>";
     protected MockEndpoint expected;
 
+    public void testUseConstant() throws Exception {
+        context.addRoutes(new RouteBuilder() {
+            public void configure() throws Exception {
+                from("direct:start").
+                        setHeader("foo").constant("ABC").
+                        to("mock:result");
+            }
+        });
+
+        template.sendBodyAndHeader("direct:start", body, "bar", "ABC");
+
+        assertMockEndpointsSatisifed();
+    }
+
+    public void testUseExpression() throws Exception {
+        context.addRoutes(new RouteBuilder() {
+            public void configure() throws Exception {
+                from("direct:start").setHeader("foo").expression(new ExpressionAdapter() {
+                    public Object evaluate(Exchange exchange) {
+                        return "ABC";
+                    }
+                }).to("mock:result");
+            }
+        });
+
+        template.sendBodyAndHeader("direct:start", body, "bar", "ABC");
+
+        assertMockEndpointsSatisifed();
+    }
+
     public void testUseHeaderExpression() throws Exception {
         context.addRoutes(new RouteBuilder() {
             public void configure() throws Exception {
@@ -37,8 +68,6 @@
             }
         });
 
-        expected.message(0).header("foo").isEqualTo("ABC");
-
         template.sendBodyAndHeader("direct:start", body, "bar", "ABC");
 
         assertMockEndpointsSatisifed();
@@ -53,8 +82,6 @@
             }
         });
 
-        expected.message(0).header("foo").isEqualTo("ABC");
-
         template.sendBody("direct:start", "ABC");
 
         assertMockEndpointsSatisifed();
@@ -69,8 +96,6 @@
             }
         });
 
-        expected.message(0).header("foo").isEqualTo("ABC");
-
         template.sendBody("direct:start", "ABC".getBytes());
 
         assertMockEndpointsSatisifed();
@@ -81,5 +106,6 @@
         super.setUp();
 
         expected = getMockEndpoint("mock:result");
+        expected.message(0).header("foo").isEqualTo("ABC");
     }
 }