svn commit: r1413317 - /camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTwoTest.java

[davsclaus]

Author: davsclaus
Date: Sun Nov 25 10:18:14 2012
New Revision: 1413317

URL: http://svn.apache.org/viewvc?rev=1413317&view=rev
Log:
CAMEL-5818: Added unit test

Added:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTwoTest.java
      - copied, changed from r1413309, 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java

Copied: 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTwoTest.java
 (from r1413309, 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTwoTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTwoTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java&r1=1413309&r2=1413317&rev=1413317&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTwoTest.java
 Sun Nov 25 10:18:14 2012
@@ -23,14 +23,15 @@ import org.apache.camel.ExpressionEvalua
 import org.apache.camel.builder.RouteBuilder;
 
 /**
- * @version 
+ * @version
  */
-public class SplitterThrowExceptionInExpressionTest extends ContextTestSupport 
{
+public class SplitterThrowExceptionInExpressionTwoTest extends 
ContextTestSupport {
 
     public void testSplitterAndVerifyMock() throws Exception {
-        getMockEndpoint("mock:error").expectedMessageCount(0);
-        getMockEndpoint("mock:error2").expectedMessageCount(1);
-        getMockEndpoint("mock:split").expectedMessageCount(0);
+        getMockEndpoint("mock:cast1").expectedMessageCount(1);
+        getMockEndpoint("mock:cast2").expectedMessageCount(0);
+        getMockEndpoint("mock:cast3").expectedMessageCount(0);
+        getMockEndpoint("mock:error").expectedMessageCount(1);
         getMockEndpoint("mock:result").expectedMessageCount(0);
 
         template.sendBody("direct:start", "A,B,C");
@@ -43,17 +44,16 @@ public class SplitterThrowExceptionInExp
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                onException(ExpressionEvaluationException.class)
-                        .handled(true).to("mock://error");
-
-                from("direct://start")
-                    .onException(ExpressionEvaluationException.class)
-                        .handled(true).to("mock://error2")
-                    .end()
-                    .split(new MyExpression())
-                        .to("mock://split")
+                from("direct:start")
+                    
.errorHandler(deadLetterChannel("mock:error").disableRedelivery())
+                    .multicast().stopOnException().streaming()
+                        .to("mock:cast1")
+                        .split(new 
MyExpression()).stopOnException().streaming()
+                            .to("mock:cast2")
+                        .end()
+                        .to("mock:cast3")
                     .end()
-                    .to("log:result");
+                    .to("mock:result");
             }
         };
     }