Author: davsclaus
Date: Mon Jul 18 14:05:01 2011
New Revision: 1147884
URL: http://svn.apache.org/viewvc?rev=1147884&view=rev
Log:
CAMEL-4234: Added unit test based on user issue.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
- copied, changed from r1147832,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/MisspelledRouteRefTest.xml
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java?rev=1147884&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
Mon Jul 18 14:05:01 2011
@@ -0,0 +1,87 @@
+/**
+ * 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.Processor;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class AdviceWithTwoRoutesOnExceptionIssueTest extends
ContextTestSupport {
+
+ public void testAdviceWith() throws Exception {
+ context.getRouteDefinition("a").adviceWith(context, new
AdviceWithRouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ interceptSendToEndpoint("mock:a").skipSendToOriginalEndpoint()
+ .to("mock:error");
+ }
+ });
+
+ context.getRouteDefinition("b").adviceWith(context, new
AdviceWithRouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ interceptSendToEndpoint("mock:b").skipSendToOriginalEndpoint()
+ .to("mock:error");
+ }
+ });
+
+ getMockEndpoint("mock:error").whenAnyExchangeReceived(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ String body = exchange.getIn().getBody(String.class);
+ throw new IllegalArgumentException("Forced " + body);
+ }
+ });
+
+ getMockEndpoint("mock:a").expectedMessageCount(0);
+ getMockEndpoint("mock:b").expectedMessageCount(0);
+ // whenAnyExchange is invoked after the mock receive the exchange
+ getMockEndpoint("mock:error").expectedBodiesReceived("A", "B");
+ // the onException should handle and send the message to this mock
+ getMockEndpoint("mock:handled").expectedBodiesReceived("Handling
Forced A", "Handling Forced B");
+
+ Object outA = template.requestBody("direct:a", "A");
+ assertEquals("Handling Forced A", outA);
+
+ Object outB = template.requestBody("direct:b", "B");
+ assertEquals("Handling Forced B", outB);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class)
+ .handled(true)
+ .setBody(simple("Handling ${exception.message}"))
+ .to("mock:handled");
+
+ from("direct:a").routeId("a").to("mock:a");
+
+ from("direct:b").routeId("b").to("mock:b");
+ }
+ };
+ }
+}
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java?rev=1147884&view=auto
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
(added)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
Mon Jul 18 14:05:01 2011
@@ -0,0 +1,33 @@
+/**
+ * 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.issues;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.issues.AdviceWithTwoRoutesOnExceptionIssueTest;
+
+import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+
+/**
+ *
+ */
+public class SpringAdviceWithTwoRoutesOnExceptionIssueTest extends
AdviceWithTwoRoutesOnExceptionIssueTest {
+
+ protected CamelContext createCamelContext() throws Exception {
+ return createSpringCamelContext(this,
"org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml");
+ }
+
+}
Copied:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
(from r1147832,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/MisspelledRouteRefTest.xml)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/MisspelledRouteRefTest.xml&r1=1147832&r2=1147884&rev=1147884&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/MisspelledRouteRefTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
Mon Jul 18 14:05:01 2011
@@ -23,9 +23,28 @@
">
<camelContext xmlns="http://camel.apache.org/schema/spring">
- <routeBuilder ref="xxxroute"/>
- </camelContext>
- <bean id="route" class="org.apache.camel.spring.issues.MyRouteBuilder"/>
+ <onException>
+ <exception>java.lang.Exception</exception>
+ <handled>
+ <constant>true</constant>
+ </handled>
+ <setBody>
+ <simple>Handling ${exception.message}</simple>
+ </setBody>
+ <to uri="mock:handled"/>
+ </onException>
+
+ <route id="a">
+ <from uri="direct:a"/>
+ <to uri="mock:a"/>
+ </route>
+
+ <route id="b">
+ <from uri="direct:b"/>
+ <to uri="mock:b"/>
+ </route>
+
+ </camelContext>
</beans>