svn commit: r949671 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/processor/routingslip/ components/camel-spring/src/test/resources/org/apache/camel/spring/processor/

[ningjiang]

Author: ningjiang
Date: Mon May 31 07:03:29 2010
New Revision: 949671

URL: http://svn.apache.org/viewvc?rev=949671&view=rev
Log:
CAMEL-2740 Using more clean expression DSL for testing

Modified:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java
    
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml
    
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java?rev=949671&r1=949670&r2=949671&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java
 Mon May 31 07:03:29 2010
@@ -139,7 +139,7 @@ public class RoutingSlipTest extends Con
                 // END SNIPPET: e3
                 
                 // START SNIPPET: e4
-                
from("direct:d").routingSlip(ExpressionBuilder.bodyExpression());
+                from("direct:d").routingSlip(body());
                 // END SNIPPET: e4
             }
         };

Modified: 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml?rev=949671&r1=949670&r2=949671&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlip.xml
 Mon May 31 07:03:29 2010
@@ -33,20 +33,20 @@
     <route>
       <from uri="direct:a" />
       <routingSlip>
-       <simple>${header.myHeader}</simple>
+       <header>myHeader</header>
       </routingSlip>
       <to uri="mock:end" />
     </route>
     <route>
       <from uri="direct:b" />
       <routingSlip>
-       <simple>${header.aRoutingSlipHeader}</simple>
+       <header>aRoutingSlipHeader</header>
       </routingSlip>   
     </route>
     <route>
       <from uri="direct:c" />
       <routingSlip uriDelimiter="#">
-         <simple>${header.aRoutingSlipHeader}</simple>
+         <header>aRoutingSlipHeader</header>
       </routingSlip>
     </route>
     <route>

Modified: 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml?rev=949671&r1=949670&r2=949671&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/routingSlipIgnoreInvalidEndpoints.xml
 Mon May 31 07:03:29 2010
@@ -25,7 +25,7 @@
     <route>
       <from uri="direct:a" />
       <routingSlip ignoreInvalidEndpoints="true">
-         <simple>${header.myHeader}</simple>
+         <header>myHeader</header>
       </routingSlip>
       <to uri="mock:end"/>     
     </route>