Author: davsclaus
Date: Mon Sep 29 21:46:55 2008
New Revision: 700334
URL: http://svn.apache.org/viewvc?rev=700334&view=rev
Log:
added error handler with mock unit test based on user forum trouble
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
(with props)
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java?rev=700334&view=auto
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
(added)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
Mon Sep 29 21:46:55 2008
@@ -0,0 +1,78 @@
+/**
+ * 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.Processor;
+import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Error Handler unit test
+ */
+public class ErrorHandlerTest extends ContextTestSupport {
+
+ public void testNoError() throws Exception {
+ MockEndpoint error = getMockEndpoint("mock:error");
+ MockEndpoint result = getMockEndpoint("mock:result");
+ error.expectedMessageCount(0);
+ result.expectedMessageCount(1);
+ result.expectedBodiesReceived("Bye World");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testError() throws Exception {
+ MockEndpoint error = getMockEndpoint("mock:error");
+ MockEndpoint result = getMockEndpoint("mock:result");
+ error.expectedMessageCount(1);
+ result.expectedMessageCount(0);
+
+ try {
+ template.sendBody("direct:start", "Boom");
+ fail("Should have thrown a RuntimeCamelException");
+ } catch (RuntimeCamelException e) {
+ assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+ }
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("direct:start")
+
.errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(1))
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ String body =
exchange.getIn().getBody(String.class);
+ if ("Boom".equals(body)) {
+ throw new IllegalArgumentException("Forced
exception by unit test");
+ }
+ exchange.getIn().setBody("Bye World");
+ }
+ })
+ .to("mock:result");
+ }
+ };
+ }
+}
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java?rev=700334&r1=700333&r2=700334&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
Mon Sep 29 21:46:55 2008
@@ -27,6 +27,7 @@
* @version $Revision$
*/
public abstract class ExpressionAdapter extends ExpressionSupport<Exchange> {
+
public abstract Object evaluate(Exchange exchange);
protected String assertionFailureMessage(Exchange exchange) {
