svn commit: r1187863 - /camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java

[da...@apache.org]

Author: davsclaus
Date: Sun Oct 23 11:05:33 2011
New Revision: 1187863

URL: http://svn.apache.org/viewvc?rev=1187863&view=rev
Log:
CAMEL-4551: NotifyBuilder wereSentTo now acts as filter for the other predicates. Added check that at least a predicate has been set as well.

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java?rev=1187863&r1=1187862&r2=1187863&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java Sun Oct 23 11:05:33 2011
@@ -900,30 +900,49 @@ public class NotifyBuilderTest extends C
     public void testWhenDoneWereSentTo() throws Exception {
         // only match when two are done and were sent to mock:beer
         NotifyBuilder notify = new NotifyBuilder(context)
-                .whenDone(2).wereSentTo("log:beer")
+                .whenDone(2).wereSentTo("mock:beer")
+                .create();
+
+        template.sendBody("direct:bar", "A");
+        assertEquals(false, notify.matches());
+
+        template.sendBody("direct:beer", "B");
+        assertEquals(false, notify.matches());
+
+        template.sendBody("direct:bar", "C");
+        assertEquals(false, notify.matches());
+
+        template.sendBody("direct:bar", "D");
+        assertEquals(false, notify.matches());
+
+        template.sendBody("direct:cake", "E");
+        assertEquals(false, notify.matches());
+
+        template.sendBody("direct:beer", "F");
+        assertEquals(true, notify.matches());
+    }
+
+    public void testWereSentToWhenDone() throws Exception {
+        // like the other test, but ordering of wereSentTo does not matter
+        NotifyBuilder notify = new NotifyBuilder(context)
+                .wereSentTo("mock:beer").whenDone(2)
                 .create();
 
-        log.info("================ direct:bar =============");
         template.sendBody("direct:bar", "A");
         assertEquals(false, notify.matches());
 
-        log.info("================ direct:beer =============");
         template.sendBody("direct:beer", "B");
         assertEquals(false, notify.matches());
 
-        log.info("================ direct:bar =============");
         template.sendBody("direct:bar", "C");
         assertEquals(false, notify.matches());
 
-        log.info("================ direct:bar =============");
         template.sendBody("direct:bar", "D");
         assertEquals(false, notify.matches());
 
-        log.info("================ direct:cake =============");
         template.sendBody("direct:cake", "E");
         assertEquals(false, notify.matches());
 
-        log.info("================ direct:beer =============");
         template.sendBody("direct:beer", "F");
         assertEquals(true, notify.matches());
     }