You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/09/01 13:18:23 UTC

svn commit: r1164005 - in /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept: InterceptFromWhenNoStopTest.java InterceptFromWhenTest.java InterceptFromWhenWithChoiceTest.java

Author: davsclaus
Date: Thu Sep  1 11:18:23 2011
New Revision: 1164005

URL: http://svn.apache.org/viewvc?rev=1164005&view=rev
Log:
polished

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenNoStopTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenWithChoiceTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenNoStopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenNoStopTest.java?rev=1164005&r1=1164004&r2=1164005&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenNoStopTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenNoStopTest.java Thu Sep  1 11:18:23 2011
@@ -18,7 +18,6 @@ package org.apache.camel.processor.inter
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import static org.apache.camel.builder.PredicateBuilder.toPredicate;
 
 /**
  * @version 
@@ -48,7 +47,7 @@ public class InterceptFromWhenNoStopTest
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                interceptFrom().when(toPredicate(simple("${body} contains 'Goofy'"))).to("mock:goofy");
+                interceptFrom().when(simple("${body} contains 'Goofy'")).to("mock:goofy");
 
                 from("direct:start").to("mock:end");
             }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenTest.java?rev=1164005&r1=1164004&r2=1164005&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenTest.java Thu Sep  1 11:18:23 2011
@@ -18,7 +18,6 @@ package org.apache.camel.processor.inter
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import static org.apache.camel.builder.PredicateBuilder.toPredicate;
 
 /**
  * @version 
@@ -50,7 +49,7 @@ public class InterceptFromWhenTest exten
             public void configure() throws Exception {
                 context.setTracing(true);
 
-                interceptFrom().when(toPredicate(simple("${body} contains 'Goofy'"))).to("mock:goofy").stop();
+                interceptFrom().when(simple("${body} contains 'Goofy'")).to("mock:goofy").stop();
 
                 from("direct:start").to("mock:end");
             }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenWithChoiceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenWithChoiceTest.java?rev=1164005&r1=1164004&r2=1164005&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenWithChoiceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromWhenWithChoiceTest.java Thu Sep  1 11:18:23 2011
@@ -18,7 +18,6 @@ package org.apache.camel.processor.inter
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import static org.apache.camel.builder.PredicateBuilder.toPredicate;
 
 /**
  * @version 
@@ -64,7 +63,7 @@ public class InterceptFromWhenWithChoice
             @Override
             public void configure() throws Exception {
                 interceptFrom()
-                    .when(toPredicate(simple("${body} contains 'Goofy'")))
+                    .when(simple("${body} contains 'Goofy'"))
                         .choice()
                             .when(body().contains("Hello")).to("mock:hello")
                             .otherwise().to("log:foo").to("mock:goofy")