You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/01/16 14:45:42 UTC
svn commit: r1059558 - in
/camel/trunk/camel-core/src/test/java/org/apache/camel:
component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
issues/OnExceptionBeforeErrorHandlerIssueTest.java
Author: davsclaus
Date: Sun Jan 16 13:45:42 2011
New Revision: 1059558
URL: http://svn.apache.org/viewvc?rev=1059558&view=rev
Log:
Fixed tests from CI. Added test based on user forum issue.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionBeforeErrorHandlerIssueTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java?rev=1059558&r1=1059557&r2=1059558&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java Sun Jan 16 13:45:42 2011
@@ -57,7 +57,8 @@ public class FromFileDoNotDeleteFileIfPr
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
+ onException(IllegalArgumentException.class)
+ .to("mock:error");
from("file://target/deletefile?delete=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java?rev=1059558&r1=1059557&r2=1059558&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java Sun Jan 16 13:45:42 2011
@@ -41,8 +41,9 @@ public class FromFileDoNotMoveFileIfProc
template.sendBodyAndHeader("file://target/movefile", body, Exchange.FILE_NAME, "hello.txt");
MockEndpoint mock = getMockEndpoint("mock:error");
- mock.expectedMessageCount(1);
- mock.message(0).body(String.class).isEqualTo(body);
+ // it could potentially retry the file on the 2nd poll and then fail again
+ // so it should be minimum message count
+ mock.expectedMinimumMessageCount(1);
mock.assertIsSatisfied();
oneExchangeDone.matchesMockWaitTime();
@@ -56,7 +57,8 @@ public class FromFileDoNotMoveFileIfProc
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
+ onException(IllegalArgumentException.class)
+ .to("mock:error");
from("file://target/movefile?move=done").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionBeforeErrorHandlerIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionBeforeErrorHandlerIssueTest.java?rev=1059558&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionBeforeErrorHandlerIssueTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/OnExceptionBeforeErrorHandlerIssueTest.java Sun Jan 16 13:45:42 2011
@@ -0,0 +1,94 @@
+/**
+ * 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.RouteBuilder;
+
+/**
+ * @version $Revision$
+ */
+public class OnExceptionBeforeErrorHandlerIssueTest extends ContextTestSupport {
+
+ public void testOk() throws Exception {
+ context.startRoute("foo");
+
+ getMockEndpoint("mock:error").expectedMessageCount(0);
+ getMockEndpoint("mock:dead").expectedMessageCount(0);
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testKabom() throws Exception {
+ context.startRoute("foo");
+
+ getMockEndpoint("mock:error").expectedMessageCount(0);
+ getMockEndpoint("mock:dead").expectedMessageCount(1);
+ getMockEndpoint("mock:result").expectedMessageCount(0);
+
+ template.sendBody("direct:start", "kabom");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testIllegal() throws Exception {
+ context.startRoute("foo");
+
+ getMockEndpoint("mock:error").expectedMessageCount(1);
+ getMockEndpoint("mock:dead").expectedMessageCount(0);
+ getMockEndpoint("mock:result").expectedMessageCount(0);
+
+ template.sendBody("direct:start", "illegal");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(IllegalArgumentException.class)
+ .handled(true)
+ .setBody().constant("Handled")
+ .to("mock:error")
+ .end();
+
+ // usually error handler should be defined first (before onException),
+ // but its not enforced
+ errorHandler(deadLetterChannel("mock:dead").useOriginalMessage());
+
+ from("direct:start").routeId("foo").noAutoStartup()
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ String body = exchange.getIn().getBody(String.class);
+ if ("illegal".equals(body)) {
+ throw new IllegalArgumentException("I cannot do this");
+ } else if ("kabom".equals(body)) {
+ throw new RuntimeException("Kabom");
+ }
+ }
+ }).to("mock:result");
+ }
+ };
+ }
+}