svn commit: r1038698 - /camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchSetHeaderIssueTest.java

[davsclaus]

Author: davsclaus
Date: Wed Nov 24 17:00:39 2010
New Revision: 1038698

URL: http://svn.apache.org/viewvc?rev=1038698&view=rev
Log:
Added unit test based on forum issue

Added:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchSetHeaderIssueTest.java
      - copied, changed from r1038674, 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java

Copied: 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchSetHeaderIssueTest.java
 (from r1038674, 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchSetHeaderIssueTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchSetHeaderIssueTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java&r1=1038674&r2=1038698&rev=1038698&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TryCatchSetHeaderIssueTest.java
 Wed Nov 24 17:00:39 2010
@@ -22,16 +22,13 @@ import org.apache.camel.builder.RouteBui
 /**
  * @version $Revision$
  */
-public class TryCatchFinallyOnExceptionIssueTest extends ContextTestSupport {
+public class TryCatchSetHeaderIssueTest extends ContextTestSupport {
 
-    public void testTryCatchFinallyOnExceptionIssue() throws Exception {
-        // doTry .. doCatch .. doFinally uses its own error handling so we 
wont get one here
-        getMockEndpoint("mock:error").expectedMessageCount(0);
+    public void testTryCatchSetHeaderIssue() throws Exception {
+        getMockEndpoint("mock:end").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:end").expectedHeaderReceived("foo", "error");
 
-        getMockEndpoint("mock:finally").expectedMessageCount(1);
-        getMockEndpoint("mock:end").expectedMessageCount(0);
-
-        template.sendBody("seda:start", "Hello World");
+        template.sendBody("direct:start", "Hello World");
 
         assertMockEndpointsSatisfied();
     }
@@ -41,16 +38,12 @@ public class TryCatchFinallyOnExceptionI
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("seda:start")
-                    .onException(Exception.class)
-                        .handled(true)
-                        .maximumRedeliveries(2)
-                        .to("mock:error")
-                    .end()
+                from("direct:start")
                     .doTry()
+                        .setHeader("foo", constant("try"))
                         .throwException(new IllegalArgumentException("Damn"))
-                    .doFinally()
-                        .to("mock:finally")
+                    .doCatch(Exception.class)
+                        .setHeader("foo", constant("error"))
                     .end()
                     .to("mock:end");
             }