Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: camel-dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r731998 - in
 /activemq/camel/trunk/components/camel-spring/src/test:
 java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
 resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
Date: Tue, 06 Jan 2009 16:45:57 -0000
To: camel-commits@activemq.apache.org
From: janstey@apache.org
Message-Id: <20090106164557.5C44D238889C@eris.apache.org>

Author: janstey
Date: Tue Jan  6 08:45:56 2009
New Revision: 731998

URL: http://svn.apache.org/viewvc?rev=731998&view=rev
Log:
CAMEL-1218 - Add test for an exception clause within a route

Added:
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java   (with props)
    activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml   (with props)

Added: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java?rev=731998&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java (added)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java Tue Jan  6 08:45:56 2009
@@ -0,0 +1,79 @@
+/**
+ * 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.spring.processor.onexception;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.mock.MockEndpoint;
+
+import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+
+/**
+ * Unit test for onException with the spring DSL.
+ */
+public class SpringOnExceptionSubRouteTest extends ContextTestSupport {
+
+    public void testOrderOk() throws Exception {
+        MockEndpoint result = getMockEndpoint("mock:result");
+        result.expectedBodiesReceived("Order OK");
+        result.expectedHeaderReceived("orderid", "123");
+
+        MockEndpoint error = getMockEndpoint("mock:error");
+        error.expectedMessageCount(0);
+
+        Object out = template.requestBodyAndHeader("direct:start", "Order: MacBook Pro", "customerid", "444");
+        assertEquals("Order OK", out);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testOrderError() throws Exception {
+        MockEndpoint error = getMockEndpoint("mock:error");
+        error.expectedBodiesReceived("Order ERROR");
+        error.expectedHeaderReceived("orderid", "failed");
+
+        MockEndpoint result = getMockEndpoint("mock:result");
+        result.expectedMessageCount(0);
+
+        Object out = template.requestBodyAndHeader("direct:start", "Order: kaboom", "customerid", "555");
+        assertEquals("Order ERROR", out);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testOrderErrorWithNoExceptionClause() throws Exception {
+        MockEndpoint error = getMockEndpoint("mock:error");
+        error.expectedMessageCount(0);
+
+        MockEndpoint result = getMockEndpoint("mock:result");
+        result.expectedMessageCount(0);
+
+        try {
+            template.requestBodyAndHeader("direct:start_with_no_handler", "Order: kaboom", "customerid", "555");
+            fail("Should throw an Exception");
+        } catch (Exception e) {
+            assertEquals("Cannot order: kaboom", e.getCause().getMessage());
+        }        
+
+        assertMockEndpointsSatisfied();
+    }    
+    
+    protected CamelContext createCamelContext() throws Exception {
+        return createSpringCamelContext(this, "/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml");
+    }
+}
\ No newline at end of file

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml?rev=731998&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml (added)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml Tue Jan  6 08:45:56 2009
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+    ">
+
+    <!-- START SNIPPET: e1 -->
+
+    <!-- this is our POJO bean with our business logic defined as a plain spring bean -->
+    <bean id="orderService" class="org.apache.camel.spring.processor.onexception.OrderService" />
+
+    <!-- this is the camel context where we define the routes -->
+    <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+
+      <route>
+        <from uri="direct:start" />
+        <onException>
+          <exception>org.apache.camel.spring.processor.onexception.OrderFailedException</exception>
+          <redeliveryPolicy maximumRedeliveries="1" />
+          <handled>
+            <constant>true</constant>
+          </handled>
+          <bean ref="orderService" method="orderFailed" />
+          <to uri="mock:error" />
+        </onException>
+        <bean ref="orderService" method="handleOrder" />
+        <to uri="mock:result" />
+      </route>
+
+      <!-- The exception clause specified in the first route will not be used in this route -->
+      <route>
+        <from uri="direct:start_with_no_handler" />
+        <bean ref="orderService" method="handleOrder" />
+        <to uri="mock:result" />
+      </route>
+
+    </camelContext>
+    <!-- END SNIPPET: e1 -->
+
+</beans>

Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
------------------------------------------------------------------------------
    svn:eol-style = native