You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/02/02 18:32:59 UTC

svn commit: r1441777 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java

Author: cmueller
Date: Sat Feb  2 17:32:59 2013
New Revision: 1441777

URL: http://svn.apache.org/viewvc?rev=1441777&view=rev
Log:
CAMEL-6033: NoRedeliveryOnShutdown doesn't work for DeadLetterChannel

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java?rev=1441777&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java Sat Feb  2 17:32:59 2013
@@ -0,0 +1,62 @@
+/**
+ * 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.LoggingLevel;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
+import org.junit.Ignore;
+
+@Ignore
+public class RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest extends ContextTestSupport {
+
+    public void testRedeliveryErrorHandlerNoRedeliveryOnShutdown() throws Exception {
+        getMockEndpoint("mock:foo").expectedMessageCount(1);
+        getMockEndpoint("mock:deadLetter").expectedMessageCount(1);
+
+        template.sendBody("seda:foo", "Hello World");
+
+        getMockEndpoint("mock:foo").assertIsSatisfied();
+
+        // should not take long to stop the route
+        StopWatch watch = new StopWatch();
+        context.stopRoute("foo");
+        watch.stop();
+
+        getMockEndpoint("mock:deadLetter").setResultWaitTime(25000);
+        getMockEndpoint("mock:deadLetter").assertIsSatisfied();
+
+        assertTrue("Should stop route faster, was " + watch.taken(), watch.taken() < 4000);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                errorHandler(deadLetterChannel("mock:deadLetter")
+                        .allowRedeliveryWhileStopping(false)
+                        .maximumRedeliveries(20).redeliveryDelay(1000).retryAttemptedLogLevel(LoggingLevel.INFO));
+
+                from("seda:foo").routeId("foo")
+                    .to("mock:foo")
+                    .throwException(new IllegalArgumentException("Forced"));
+            }
+        };
+    }
+}