svn commit: r727962 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/builder/ValueBuilder.java test/java/org/apache/camel/TestSupport.java test/java/org/apache/camel/builder/PredicateBuilderTest.java

[davsclaus]

Author: davsclaus
Date: Thu Dec 18 23:37:00 2008
New Revision: 727962

URL: http://svn.apache.org/viewvc?rev=727962&view=rev
Log:
CAMEL-772: Added not(predicate) to valuebuilder

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java?rev=727962&r1=727961&r2=727962&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
 Thu Dec 18 23:37:00 2008
@@ -82,13 +82,6 @@
         return onNewPredicate(PredicateBuilder.isInstanceOf(expression, type));
     }
 
-    /**
-     * @deprecated use {...@link #regex(String)}
-     */
-    public Predicate matchesRegex(String regex) {
-        return onNewPredicate(PredicateBuilder.regex(expression, regex));
-    }
-
     public Predicate isNull() {
         return onNewPredicate(PredicateBuilder.isNull(expression));
     }
@@ -97,6 +90,10 @@
         return onNewPredicate(PredicateBuilder.isNotNull(expression));
     }
 
+    public Predicate not(Predicate predicate) {
+        return onNewPredicate(PredicateBuilder.not(predicate));
+    }
+
     /**
      * Create a predicate that the left hand expression contains the value of
      * the right hand expression

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?rev=727962&r1=727961&r2=727962&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java 
(original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java 
Thu Dec 18 23:37:00 2008
@@ -219,7 +219,7 @@
      */
     protected void assertPredicateDoesNotMatch(Predicate predicate, Exchange 
exchange) {
         try {
-            predicate.assertMatches("Predicate should match", exchange);
+            predicate.assertMatches("Predicate should match: ", exchange);
         } catch (AssertionError e) {
             log.debug("Caught expected assertion error: " + e);
         }
@@ -231,7 +231,7 @@
      */
     protected boolean assertPredicate(Predicate predicate, Exchange exchange, 
boolean expected) {
         if (expected) {
-            predicate.assertMatches("Predicate failed", exchange);
+            predicate.assertMatches("Predicate failed: ", exchange);
         }
         boolean value = predicate.matches(exchange);
 

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java?rev=727962&r1=727961&r2=727962&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
 Thu Dec 18 23:37:00 2008
@@ -24,6 +24,7 @@
 import org.apache.camel.impl.DefaultExchange;
 
 import static org.apache.camel.builder.Builder.constant;
+import static org.apache.camel.builder.PredicateBuilder.not;
 
 /**
  * @version $Revision$
@@ -38,11 +39,13 @@
 
     public void testPredicates() throws Exception {
         assertMatches(header("name").isEqualTo(constant("James")));
+        assertMatches(not(header("name").isEqualTo(constant("Claus"))));
     }
 
     public void testFailingPredicates() throws Exception {
         assertDoesNotMatch(header("name").isEqualTo(constant("Hiram")));
         assertDoesNotMatch(header("size").isGreaterThan(constant(100)));
+        assertDoesNotMatch(not(header("size").isLessThan(constant(100))));
     }
 
     @Override