Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ADCDC950C for ; Thu, 22 Dec 2011 08:42:32 +0000 (UTC) Received: (qmail 86012 invoked by uid 500); 22 Dec 2011 08:42:32 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 85980 invoked by uid 500); 22 Dec 2011 08:42:31 -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 85971 invoked by uid 99); 22 Dec 2011 08:42:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2011 08:42:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 22 Dec 2011 08:42:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1AE2923889E1 for ; Thu, 22 Dec 2011 08:42:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1222101 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java Date: Thu, 22 Dec 2011 08:42:06 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111222084206.1AE2923889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Thu Dec 22 08:42:05 2011 New Revision: 1222101 URL: http://svn.apache.org/viewvc?rev=1222101&view=rev Log: Added test based on user forum issue Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java?rev=1222101&view=auto ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java (added) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java Thu Dec 22 08:42:05 2011 @@ -0,0 +1,68 @@ +/** + * 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.processor; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.builder.RouteBuilder; + +/** + * + */ +public class SplitterPropertyContinuedTest extends ContextTestSupport { + + public void testSplitterPropertyContinued() throws Exception { + getMockEndpoint("mock:end").expectedBodiesReceived("A,Kaboom,B,C"); + getMockEndpoint("mock:end").message(0).property("errorCode").isNull(); + getMockEndpoint("mock:error").expectedBodiesReceived("Kaboom"); + getMockEndpoint("mock:error").message(0).property("errorCode").isEqualTo("ERR-1"); + getMockEndpoint("mock:split").expectedBodiesReceived("A", "B", "C"); + getMockEndpoint("mock:split").allMessages().property("errorCode").isNull(); + + template.sendBody("direct:start", "A,Kaboom,B,C"); + + assertMockEndpointsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + onException(Exception.class) + .continued(true) + .setProperty("errorCode", constant("ERR-1")); + + from("direct:start") + .split(body()) + .log("Step #1 - Body: ${body} with error code: ${property.errorCode}") + .choice() + .when(body().contains("Kaboom")) + .throwException(new IllegalArgumentException("Damn")) + .end() + .log("Step #2 - Body: ${body} with error code: ${property.errorCode}") + .choice() + .when(simple("${property.errorCode} != null")) + .to("mock:error") + .otherwise() + .to("mock:split") + .end() + .end() + .to("mock:end"); + } + }; + } +}