Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 75402 invoked from network); 6 Dec 2010 12:16:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Dec 2010 12:16:39 -0000 Received: (qmail 76960 invoked by uid 500); 6 Dec 2010 12:16:39 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 76911 invoked by uid 500); 6 Dec 2010 12:16:39 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 76904 invoked by uid 99); 6 Dec 2010 12:16:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Dec 2010 12:16:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Dec 2010 12:16:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1C1FA23889E3; Mon, 6 Dec 2010 12:16:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1042602 - /camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java Date: Mon, 06 Dec 2010 12:16:18 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101206121618.1C1FA23889E3@eris.apache.org> Author: davsclaus Date: Mon Dec 6 12:16:17 2010 New Revision: 1042602 URL: http://svn.apache.org/viewvc?rev=1042602&view=rev Log: Added unit test based on user issue. Added: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java Added: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java?rev=1042602&view=auto ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java (added) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java Mon Dec 6 12:16:17 2010 @@ -0,0 +1,115 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.issues; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangeTimedOutException; +import org.apache.camel.Processor; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.impl.JndiRegistry; + +/** + * @version $Revision$ + */ +public class SetHeaderInDoCatchIssueTest extends ContextTestSupport { + + public void testSuccess() { + Exchange exchange = template.request("direct:start", new Processor() { + public void process(Exchange exchange) throws Exception { + // empty message + } + }); + + assertEquals("CamsResponse", exchange.getOut().getHeader("Status")); + } + + public void testExchangeTimedOutException() { + Exchange exchange = template.request("direct:start", new Processor() { + public void process(Exchange exchange) throws Exception { + exchange.getIn().setBody("ExchangeTimedOutException"); + } + }); + + assertEquals("TimeOut", exchange.getOut().getHeader("Status")); + } + + public void testException() { + Exchange exchange = template.request("direct:start", new Processor() { + public void process(Exchange exchange) throws Exception { + exchange.getIn().setBody("Exception"); + } + }); + + assertEquals("ExceptionGeneral", exchange.getOut().getHeader("Status")); + } + + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry registry = new JndiRegistry(createJndiContext()); + + registry.bind("A", new Processor() { + public void process(Exchange exchange) throws Exception { + log.info("A headers " + exchange.getIn().getHeaders()); + } + }); + + registry.bind("B", new Processor() { + public void process(Exchange exchange) throws Exception { + log.info("B headers " + exchange.getIn().getHeaders()); + + if ("ExchangeTimedOutException".equals(exchange.getIn().getBody(String.class))) { + throw new ExchangeTimedOutException(exchange, 1); + } else if ("Exception".equals(exchange.getIn().getBody(String.class))) { + throw new Exception(); + } + } + }); + + registry.bind("C", new Processor() { + public void process(Exchange exchange) throws Exception { + log.info("C headers " + exchange.getIn().getHeaders()); + } + }); + + return registry; + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + context.setTracing(true); + + from("direct:start") + .doTry() + .to("A") + .setHeader("CamelJmsDestinationName", constant("queue:outQueue")) + .inOut("B") + .setHeader("Status", constant("CamsResponse")) + .doCatch(ExchangeTimedOutException.class) + .setHeader("Status", constant("TimeOut")) + .doCatch(Exception.class) + .setHeader("Status", constant("ExceptionGeneral")) + .end() + .to("C") + .transform(body()); + } + }; + } + +}