Repository: camel Updated Branches: refs/heads/master 011e49452 -> 2054cdf1b
CAMEL-11446: Use awaitility in camel-core for testing where we otherwise use thred sleep which can be speeded up. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2054cdf1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2054cdf1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2054cdf1 Branch: refs/heads/master Commit: 2054cdf1bc54c1af62b96b3381f6fc6c3404b0c2 Parents: 011e494 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jul 9 11:43:44 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jul 9 11:43:44 2017 +0200 ---------------------------------------------------------------------- .../camel/builder/ExceptionBuilderTest.java | 6 +-- .../mock/MockEndpointTimeClauseTest.java | 48 ++++++++++---------- .../FileSedaShutdownCompleteAllTasksTest.java | 29 ++++++++++-- .../TimerNegativeNoRepeatCountDelayTest.java | 2 +- .../RouteMustHaveOutputOnExceptionTest.java | 2 + ...nThrownFromOnExceptionNoEndlessLoopTest.java | 1 + .../ExceptionThrownFromOnExceptionTest.java | 6 +++ ...lerAsyncDelayedTwoCamelContextIssueTest.java | 2 +- ...cyOnExceptionWhileRedeliveringIssueTest.java | 1 + .../TryCatchFinallyOnExceptionIssueTest.java | 1 + ...eptSendToEndpointIssueWithPredicateTest.java | 2 +- .../management/ExceptionWithManagementTest.java | 2 +- .../JmxInstrumentationUsingDefaultsTest.java | 15 ++++-- .../JmxInstrumentationWithConnectorTest.java | 2 - .../ManagedRedeliverRouteOnlyTest.java | 1 + .../camel/management/ManagedRedeliverTest.java | 1 + ...etterChannelOnExceptionOnRedeliveryTest.java | 2 + ...onsumerBridgeErrorHandlerRedeliveryTest.java | 2 + .../processor/DynamicRouterOnExceptionTest.java | 2 + .../MulticastFineGrainedErrorHandlingTest.java | 4 +- ...astParallelFineGrainedErrorHandlingTest.java | 4 +- ...cipientListFineGrainedErrorHandlingTest.java | 8 ++-- ...istParallelFineGrainedErrorHandlingTest.java | 6 +-- .../RedeliveryErrorHandlerLogHandledTest.java | 4 ++ .../RedeliveryOnExceptionBlockedDelayTest.java | 2 +- .../RedeliveryPolicyPerExceptionTest.java | 2 +- .../org/apache/camel/processor/RouteIdTest.java | 2 +- .../processor/RoutingSlipOnExceptionTest.java | 1 + .../processor/ThreadsRejectedExecutionTest.java | 21 ++++----- ...ntMulticastFineGrainedErrorHandlingTest.java | 4 +- ...cipientListFineGrainedErrorHandlingTest.java | 4 +- .../CustomExceptionPolicyStrategyTest.java | 2 + ...xceptionPolicyStrategyUsingOnlyWhenTest.java | 2 +- ...ultExceptionPolicyStrategyUsingWhenTest.java | 4 ++ .../properties/myproperties.properties | 2 +- 35 files changed, 126 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java index 4c4f171..7a51a4c 100644 --- a/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java +++ b/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java @@ -171,7 +171,7 @@ public class ExceptionBuilderTest extends ContextTestSupport { .to(ERROR_QUEUE); onException(IOException.class) - .redeliveryDelay(100L) + .redeliveryDelay(10) .maximumRedeliveries(3) .maximumRedeliveryDelay(30 * 1000L) .backOffMultiplier(1.0) @@ -180,13 +180,13 @@ public class ExceptionBuilderTest extends ContextTestSupport { .to(ERROR_QUEUE); onException(Exception.class) - .redeliveryDelay(100L) + .redeliveryDelay(0) .maximumRedeliveries(2) .setHeader(MESSAGE_INFO, constant("Damm just exception")) .to(ERROR_QUEUE); onException(MyBaseBusinessException.class) - .redeliveryDelay(100L) + .redeliveryDelay(0) .maximumRedeliveries(3) .setHeader(MESSAGE_INFO, constant("Damm my business is not going to well")) .to(BUSINESS_ERROR_QUEUE); http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java index d172cd7..d08ac1a 100644 --- a/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java @@ -48,7 +48,7 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { public void testAssertPeriod() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.setAssertPeriod(500); + mock.setAssertPeriod(10); template.sendBody("direct:a", "A"); @@ -58,20 +58,20 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { public void testAssertPeriodNot() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.setAssertPeriod(500); + mock.setAssertPeriod(10); template.sendBody("direct:a", "A"); template.sendBody("direct:a", "B"); + // we got 2 messages so the assertion is not mock.assertIsNotSatisfied(); } public void testAssertPeriodSecondMessageArrives() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - // wait 2 sec after preliminary assertion to ensure its still correct - // after the 2 seconds. - mock.setAssertPeriod(2000); + // wait a bit after preliminary assertion to ensure its still correct + mock.setAssertPeriod(250); template.sendBody("direct:a", "A"); @@ -79,7 +79,7 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { executor.execute(new Runnable() { public void run() { try { - Thread.sleep(1000); + Thread.sleep(50); } catch (Exception e) { // ignore } @@ -112,15 +112,13 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { executor.execute(new Runnable() { public void run() { try { - Thread.sleep(2000); + latch.await(); if (isStarted(template)) { template.sendBody("direct:a", "B"); } } catch (Exception e) { // ignore - } finally { - latch.countDown(); } } }); @@ -129,7 +127,7 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { // the assertion was valid at the time given assertMockEndpointsSatisfied(); - assertTrue(latch.await(10, TimeUnit.SECONDS)); + latch.countDown(); executor.shutdownNow(); } @@ -137,10 +135,10 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { public void testArrivesBeforeNext() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(2); - mock.message(0).arrives().noLaterThan(2).seconds().beforeNext(); + mock.message(0).arrives().noLaterThan(1).seconds().beforeNext(); template.sendBody("direct:a", "A"); - Thread.sleep(500); + Thread.sleep(50); template.sendBody("direct:a", "B"); assertMockEndpointsSatisfied(); @@ -149,10 +147,10 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { public void testArrivesAfterPrevious() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(2); - mock.message(1).arrives().noLaterThan(2).seconds().afterPrevious(); + mock.message(1).arrives().noLaterThan(1).seconds().afterPrevious(); template.sendBody("direct:a", "A"); - Thread.sleep(500); + Thread.sleep(50); template.sendBody("direct:a", "B"); assertMockEndpointsSatisfied(); @@ -161,13 +159,13 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { public void testArrivesBeforeAndAfter() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(3); - mock.message(1).arrives().noLaterThan(500).millis().afterPrevious(); - mock.message(1).arrives().noLaterThan(1000).millis().beforeNext(); + mock.message(1).arrives().noLaterThan(250).millis().afterPrevious(); + mock.message(1).arrives().noLaterThan(250).millis().beforeNext(); template.sendBody("direct:a", "A"); - Thread.sleep(100); + Thread.sleep(50); template.sendBody("direct:a", "B"); - Thread.sleep(200); + Thread.sleep(50); template.sendBody("direct:a", "C"); assertMockEndpointsSatisfied(); @@ -176,10 +174,10 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { public void testArrivesWithinAfterPrevious() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(2); - mock.message(1).arrives().between(1, 4).seconds().afterPrevious(); + mock.message(1).arrives().between(10, 500).millis().afterPrevious(); template.sendBody("direct:a", "A"); - Thread.sleep(1500); + Thread.sleep(50); template.sendBody("direct:a", "B"); assertMockEndpointsSatisfied(); @@ -188,10 +186,10 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { public void testArrivesWithinBeforeNext() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(2); - mock.message(0).arrives().between(1, 4).seconds().beforeNext(); + mock.message(0).arrives().between(10, 500).millis().beforeNext(); template.sendBody("direct:a", "A"); - Thread.sleep(1500); + Thread.sleep(50); template.sendBody("direct:a", "B"); assertMockEndpointsSatisfied(); @@ -204,11 +202,11 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { template.sendBody("direct:a", "A"); template.sendBody("direct:a", "B"); - Thread.sleep(100); + Thread.sleep(50); template.sendBody("direct:a", "C"); - Thread.sleep(150); + Thread.sleep(50); template.sendBody("direct:a", "D"); - Thread.sleep(200); + Thread.sleep(50); template.sendBody("direct:a", "E"); assertMockEndpointsSatisfied(); http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java index 5f9808c..b17bcc3 100644 --- a/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java @@ -16,8 +16,12 @@ */ package org.apache.camel.component.seda; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; +import org.apache.camel.Processor; import org.apache.camel.ShutdownRunningTask; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -27,6 +31,8 @@ import org.apache.camel.component.mock.MockEndpoint; */ public class FileSedaShutdownCompleteAllTasksTest extends ContextTestSupport { + private String url = "file:target/seda?initialDelay=0&delay=10"; + @Override protected void setUp() throws Exception { deleteDirectory("target/seda"); @@ -34,15 +40,14 @@ public class FileSedaShutdownCompleteAllTasksTest extends ContextTestSupport { } public void testShutdownCompleteAllTasks() throws Exception { - final String url = "file:target/seda"; + // prepare 5 files to begin with template.sendBodyAndHeader(url, "A", Exchange.FILE_NAME, "a.txt"); template.sendBodyAndHeader(url, "B", Exchange.FILE_NAME, "b.txt"); template.sendBodyAndHeader(url, "C", Exchange.FILE_NAME, "c.txt"); template.sendBodyAndHeader(url, "D", Exchange.FILE_NAME, "d.txt"); template.sendBodyAndHeader(url, "E", Exchange.FILE_NAME, "e.txt"); - // give it 20 seconds to shutdown - context.getShutdownStrategy().setTimeout(20); + final CountDownLatch latch = new CountDownLatch(1); context.addRoutes(new RouteBuilder() { @Override @@ -51,11 +56,23 @@ public class FileSedaShutdownCompleteAllTasksTest extends ContextTestSupport { // let it complete all tasks during shutdown .shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks) .to("log:delay") - .delay(1000).to("seda:foo"); + .to("seda:foo"); from("seda:foo").routeId("route2") .to("log:bar") - .to("mock:bar"); + .to("mock:bar") + .process(new Processor() { + boolean first = true; + @Override + public void process(Exchange exchange) throws Exception { + latch.countDown(); + if (first) { + // only sleep on first + Thread.sleep(100); + } + first = false; + } + }); } }); context.start(); @@ -65,6 +82,8 @@ public class FileSedaShutdownCompleteAllTasksTest extends ContextTestSupport { assertMockEndpointsSatisfied(); + latch.await(5, TimeUnit.SECONDS); + // shutdown during processing context.stop(); http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/component/timer/TimerNegativeNoRepeatCountDelayTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/timer/TimerNegativeNoRepeatCountDelayTest.java b/camel-core/src/test/java/org/apache/camel/component/timer/TimerNegativeNoRepeatCountDelayTest.java index 8ccb55b..7b780de 100644 --- a/camel-core/src/test/java/org/apache/camel/component/timer/TimerNegativeNoRepeatCountDelayTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/timer/TimerNegativeNoRepeatCountDelayTest.java @@ -50,7 +50,7 @@ public class TimerNegativeNoRepeatCountDelayTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("timer://negativeDelay?delay=-1").routeId("routeTest").to("mock:result"); + from("timer://negativeDelay?delay=-1&repeatCount=10").routeId("routeTest").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/impl/RouteMustHaveOutputOnExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/RouteMustHaveOutputOnExceptionTest.java b/camel-core/src/test/java/org/apache/camel/impl/RouteMustHaveOutputOnExceptionTest.java index 23477f2..4d8ae41 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/RouteMustHaveOutputOnExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/RouteMustHaveOutputOnExceptionTest.java @@ -36,6 +36,7 @@ public class RouteMustHaveOutputOnExceptionTest extends ContextTestSupport { public void configure() throws Exception { from("direct:start") .onException(Exception.class) + .redeliveryDelay(10) .maximumRedeliveries(2) .backOffMultiplier(1.5) .handled(true) @@ -56,6 +57,7 @@ public class RouteMustHaveOutputOnExceptionTest extends ContextTestSupport { public void configure() throws Exception { from("direct:start") .onException(Exception.class) + .redeliveryDelay(10) .maximumRedeliveries(2) .backOffMultiplier(1.5) .handled(true) http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionNoEndlessLoopTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionNoEndlessLoopTest.java b/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionNoEndlessLoopTest.java index fcf467e..c981d7d 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionNoEndlessLoopTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionNoEndlessLoopTest.java @@ -48,6 +48,7 @@ public class ExceptionThrownFromOnExceptionNoEndlessLoopTest extends ContextTest @Override public void configure() throws Exception { onException(IOException.class) + .redeliveryDelay(0) .maximumRedeliveries(3) .to("mock:b") .process(new Processor() { http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java b/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java index 6a82d30..e61c664 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java @@ -47,6 +47,7 @@ public class ExceptionThrownFromOnExceptionTest extends ContextTestSupport { public void configure() throws Exception { // on exception to catch all IO exceptions and handle them specially onException(IOException.class) + .redeliveryDelay(0) .maximumRedeliveries(3) .to("mock:b") .process(new Processor() { @@ -105,6 +106,7 @@ public class ExceptionThrownFromOnExceptionTest extends ContextTestSupport { public void configure() throws Exception { // on exception to catch all IO exceptions and handle them specially onException(IOException.class) + .redeliveryDelay(0) .maximumRedeliveries(3) // this time we handle the exception .handled(true) @@ -168,6 +170,7 @@ public class ExceptionThrownFromOnExceptionTest extends ContextTestSupport { // on exception to catch all IO exceptions and handle them specially onException(IOException.class) + .redeliveryDelay(0) .maximumRedeliveries(3) .to("mock:b") .process(new Processor() { @@ -232,6 +235,7 @@ public class ExceptionThrownFromOnExceptionTest extends ContextTestSupport { // on exception to catch all IO exceptions and handle them specially onException(IOException.class) + .redeliveryDelay(0) .maximumRedeliveries(3) // this time we handle the exception .handled(true) @@ -298,6 +302,7 @@ public class ExceptionThrownFromOnExceptionTest extends ContextTestSupport { // on exception to catch all IO exceptions and handle them specially onException(IOException.class) + .redeliveryDelay(0) .maximumRedeliveries(3) .to("mock:b") .process(new Processor() { @@ -364,6 +369,7 @@ public class ExceptionThrownFromOnExceptionTest extends ContextTestSupport { // on exception to catch all IO exceptions and handle them specially onException(IOException.class) + .redeliveryDelay(0) .maximumRedeliveries(3) // we now handle the exception .handled(true) http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java index 0144d4c..449cc18 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java @@ -64,7 +64,7 @@ public class RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest { @Override public void configure() throws Exception { onException(Exception.class) - .redeliveryDelay(100) + .redeliveryDelay(10) .maximumRedeliveries(5) .maximumRedeliveryDelay(1000) .backOffMultiplier(1) http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java index dddb861..58835dc 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest.java @@ -72,6 +72,7 @@ public class RedeliveryPolicyOnExceptionWhileRedeliveringIssueTest extends Conte public void configure() throws Exception { from("direct:source") .onException(FirstException.class) + .redeliveryDelay(0) .maximumRedeliveries(-1) .handled(true) .end() http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java index 3331690..56d540e 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java @@ -44,6 +44,7 @@ public class TryCatchFinallyOnExceptionIssueTest extends ContextTestSupport { from("seda:start") .onException(Exception.class) .handled(true) + .redeliveryDelay(0) .maximumRedeliveries(2) .to("mock:error") .end() http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java b/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java index 4881dd6..82b2cd0 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java @@ -79,7 +79,7 @@ public class TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredic public void configure() throws Exception { errorHandler(deadLetterChannel("mock:global") .maximumRedeliveries(2) - .redeliveryDelay(5000)); + .redeliveryDelay(500)); from("direct:start") // no redelivery delay for faster unit tests http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java b/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java index 6c9d505..28e843f 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java @@ -59,7 +59,7 @@ public class ExceptionWithManagementTest extends ContextTestSupport { public void configure() throws Exception { errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3)); - onException(IllegalArgumentException.class).maximumRedeliveries(1).to("mock:error"); + onException(IllegalArgumentException.class).redeliveryDelay(0).maximumRedeliveries(1).to("mock:error"); from("direct:start").process(new Processor() { public void process(Exchange exchange) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java index 63a4a67..a0340fa 100644 --- a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.lang.management.ManagementFactory; import java.util.Iterator; import java.util.Set; +import java.util.concurrent.TimeUnit; import javax.management.MBeanServer; import javax.management.MBeanServerConnection; @@ -30,6 +31,8 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import static org.awaitility.Awaitility.await; + /** * This test verifies JMX is enabled by default and it uses local mbean * server to conduct the test as connector server is not enabled by default. @@ -40,7 +43,6 @@ public class JmxInstrumentationUsingDefaultsTest extends ContextTestSupport { protected String domainName = DefaultManagementAgent.DEFAULT_DOMAIN; protected MBeanServerConnection mbsc; - protected long sleepForConnection; @Override protected boolean useJmx() { @@ -177,8 +179,15 @@ public class JmxInstrumentationUsingDefaultsTest extends ContextTestSupport { protected void setUp() throws Exception { releaseMBeanServers(); super.setUp(); - Thread.sleep(sleepForConnection); - mbsc = getMBeanConnection(); + + await().atMost(3, TimeUnit.SECONDS).until(() -> { + try { + mbsc = getMBeanConnection(); + return true; + } catch (Throwable e) { + return false; + } + }); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java index 0983a66..882208d 100644 --- a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java @@ -59,8 +59,6 @@ public class JmxInstrumentationWithConnectorTest extends JmxInstrumentationUsing @Override protected void setUp() throws Exception { - sleepForConnection = 3000; - registryPort = 30000 + new Random().nextInt(10000); log.info("Using port " + registryPort); url = "service:jmx:rmi:///jndi/rmi://localhost:" + registryPort + "/jmxrmi/camel"; http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java index 1a63926..6ad7d2fe 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverRouteOnlyTest.java @@ -64,6 +64,7 @@ public class ManagedRedeliverRouteOnlyTest extends ManagementTestSupport { context.getManagementStrategy().getManagementAgent().setStatisticsLevel(ManagementStatisticsLevel.RoutesOnly); onException(Exception.class).handled(true) + .redeliveryDelay(0) .maximumRedeliveries(4).logStackTrace(false) .setBody().constant("Error"); http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java index 1bc3ed7..e6b8bfc 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRedeliverTest.java @@ -85,6 +85,7 @@ public class ManagedRedeliverTest extends ManagementTestSupport { @Override public void configure() throws Exception { onException(Exception.class).handled(true) + .redeliveryDelay(0) .maximumRedeliveries(4).logStackTrace(false) .setBody().constant("Error"); http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java index 754c856..9aee6b0 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java @@ -68,6 +68,8 @@ public class DeadLetterChannelOnExceptionOnRedeliveryTest extends ContextTestSup onException(IOException.class) // try to redeliver at most 3 times .maximumRedeliveries(3) + // setting delay to zero is just to make unit testing faster + .redeliveryDelay(0) .onRedelivery(new MyIORedeliverProcessor()); // END SNIPPET: e1 http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java b/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java index 64b56cc..0b5ceba 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java @@ -62,6 +62,8 @@ public class DefaultConsumerBridgeErrorHandlerRedeliveryTest extends DefaultCons redeliverCounter.incrementAndGet(); } }) + // setting delay to zero is just to make unit testing faster + .redeliveryDelay(0) .handled(true) .to("mock:dead"); http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterOnExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterOnExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterOnExceptionTest.java index 6684112..1de2a09 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterOnExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterOnExceptionTest.java @@ -100,6 +100,8 @@ public class DynamicRouterOnExceptionTest extends ContextTestSupport { @Override public void configure() throws Exception { onException(IllegalArgumentException.class) + // setting delay to zero is just to make unit testing faster + .redeliveryDelay(0) .maximumRedeliveries(5); from("direct:start") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/MulticastFineGrainedErrorHandlingTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/MulticastFineGrainedErrorHandlingTest.java b/camel-core/src/test/java/org/apache/camel/processor/MulticastFineGrainedErrorHandlingTest.java index bbfffba..db6162e 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/MulticastFineGrainedErrorHandlingTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/MulticastFineGrainedErrorHandlingTest.java @@ -28,7 +28,7 @@ public class MulticastFineGrainedErrorHandlingTest extends ContextTestSupport { context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") @@ -52,7 +52,7 @@ public class MulticastFineGrainedErrorHandlingTest extends ContextTestSupport { context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelFineGrainedErrorHandlingTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelFineGrainedErrorHandlingTest.java b/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelFineGrainedErrorHandlingTest.java index b1d4f6c..d9924c7 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelFineGrainedErrorHandlingTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelFineGrainedErrorHandlingTest.java @@ -28,7 +28,7 @@ public class MulticastParallelFineGrainedErrorHandlingTest extends ContextTestSu context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") @@ -52,7 +52,7 @@ public class MulticastParallelFineGrainedErrorHandlingTest extends ContextTestSu context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java b/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java index 2c3d5da..642bf58 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java @@ -43,7 +43,7 @@ public class RecipientListFineGrainedErrorHandlingTest extends ContextTestSuppor context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") @@ -70,7 +70,7 @@ public class RecipientListFineGrainedErrorHandlingTest extends ContextTestSuppor @Override public void configure() throws Exception { from("direct:start") - .onException(Exception.class).maximumRedeliveries(3).end() + .onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(3).end() .to("mock:a") .recipientList(header("foo")) .aggregationStrategy(new MyAggregationStrategy()) @@ -101,7 +101,7 @@ public class RecipientListFineGrainedErrorHandlingTest extends ContextTestSuppor context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") @@ -135,7 +135,7 @@ public class RecipientListFineGrainedErrorHandlingTest extends ContextTestSuppor public void configure() throws Exception { context.setTracing(true); - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java b/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java index 711bfc6..3f14af6 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java @@ -41,7 +41,7 @@ public class RecipientListParallelFineGrainedErrorHandlingTest extends ContextTe context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") @@ -66,7 +66,7 @@ public class RecipientListParallelFineGrainedErrorHandlingTest extends ContextTe context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") @@ -101,7 +101,7 @@ public class RecipientListParallelFineGrainedErrorHandlingTest extends ContextTe public void configure() throws Exception { context.setTracing(true); - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerLogHandledTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerLogHandledTest.java b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerLogHandledTest.java index 90663b9..c72f10c 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerLogHandledTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerLogHandledTest.java @@ -38,6 +38,7 @@ public class RedeliveryErrorHandlerLogHandledTest extends ContextTestSupport { public void configure() throws Exception { onException(IllegalArgumentException.class) .maximumRedeliveries(3) + .redeliveryDelay(0) .handled(true) .to("mock:handled"); @@ -60,6 +61,7 @@ public class RedeliveryErrorHandlerLogHandledTest extends ContextTestSupport { public void configure() throws Exception { onException(IllegalArgumentException.class) .maximumRedeliveries(3) + .redeliveryDelay(0) .logHandled(true) .handled(true) .to("mock:handled"); @@ -83,6 +85,7 @@ public class RedeliveryErrorHandlerLogHandledTest extends ContextTestSupport { public void configure() throws Exception { onException(IllegalArgumentException.class) .maximumRedeliveries(3) + .redeliveryDelay(0) .logHandled(true) .logRetryAttempted(true) .handled(true) @@ -184,6 +187,7 @@ public class RedeliveryErrorHandlerLogHandledTest extends ContextTestSupport { @Override public void configure() throws Exception { onException(IllegalArgumentException.class) + .redeliveryDelay(0) .maximumRedeliveries(3) .logHandled(true) .logRetryAttempted(true) http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/RedeliveryOnExceptionBlockedDelayTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryOnExceptionBlockedDelayTest.java b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryOnExceptionBlockedDelayTest.java index bc14550..7d2b173 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryOnExceptionBlockedDelayTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryOnExceptionBlockedDelayTest.java @@ -54,7 +54,7 @@ public class RedeliveryOnExceptionBlockedDelayTest extends ContextTestSupport { public void configure() throws Exception { // will by default block onException(IllegalArgumentException.class) - .maximumRedeliveries(5).redeliveryDelay(2000); + .maximumRedeliveries(5).redeliveryDelay(0); from("seda:start") .to("log:before") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java index d2554a4..1b3e27b 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java @@ -91,7 +91,7 @@ public class RedeliveryPolicyPerExceptionTest extends ContextTestSupport { public void configure() { errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3)); - onException(IllegalArgumentException.class).maximumRedeliveries(2).to("mock:a"); + onException(IllegalArgumentException.class).redeliveryDelay(0).maximumRedeliveries(2).to("mock:a"); onException(NullPointerException.class).to("mock:b"); from("direct:start").process(processor); http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/RouteIdTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RouteIdTest.java b/camel-core/src/test/java/org/apache/camel/processor/RouteIdTest.java index cf6995c..4911145 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RouteIdTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RouteIdTest.java @@ -58,7 +58,7 @@ public class RouteIdTest extends ContextTestSupport { onException(Exception.class).handled(true).to("mock:error").end(); from("direct:start") - .onException(IOException.class).maximumRedeliveries(5).end() + .onException(IOException.class).redeliveryDelay(0).maximumRedeliveries(5).end() .routeId("myCoolRoute") .choice() .when(body().contains("Kabom")).throwException(new IllegalArgumentException("Damn")) http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipOnExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipOnExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipOnExceptionTest.java index 9f5f6f2..9e5c9ac 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipOnExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipOnExceptionTest.java @@ -26,6 +26,7 @@ public class RoutingSlipOnExceptionTest extends DynamicRouterOnExceptionTest { @Override public void configure() throws Exception { onException(IllegalArgumentException.class) + .redeliveryDelay(0) .maximumRedeliveries(5); from("direct:start") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedExecutionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedExecutionTest.java b/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedExecutionTest.java index 4f49a42..4c00c19 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedExecutionTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedExecutionTest.java @@ -49,7 +49,7 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { .to("log:before") // will use our custom pool .threads().executorService(pool) - .delay(1000) + .delay(200) .to("log:after") .to("mock:result"); } @@ -77,7 +77,7 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { .to("log:before") // will use our custom pool .threads().executorService(pool).callerRunsWhenRejected(false) - .delay(1000) + .delay(200) .to("log:after") .to("mock:result"); } @@ -86,8 +86,8 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(3); - // wait at most 5 seconds - mock.setResultWaitTime(5000); + // wait at most 2 seconds + mock.setResultWaitTime(2000); template.sendBody("seda:start", "Hello World"); template.sendBody("seda:start", "Hi World"); @@ -107,7 +107,7 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { from("seda:start") .to("log:before") .threads(1, 1).maxPoolSize(1).maxQueueSize(2).rejectedPolicy(ThreadPoolRejectedPolicy.Discard) - .delay(1000) + .delay(100) .to("log:after") .to("mock:result"); } @@ -135,7 +135,7 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { from("seda:start") .to("log:before") .threads(1, 1).maxPoolSize(1).maxQueueSize(2).rejectedPolicy(ThreadPoolRejectedPolicy.DiscardOldest) - .delay(1000) + .delay(100) .to("log:after") .to("mock:result"); } @@ -163,7 +163,7 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { from("seda:start") .to("log:before") .threads(1, 1).maxPoolSize(1).maxQueueSize(2).rejectedPolicy(ThreadPoolRejectedPolicy.Abort) - .delay(1000) + .delay(100) .to("log:after") .to("mock:result"); } @@ -191,7 +191,7 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { from("seda:start") .to("log:before") .threads(1, 1).maxPoolSize(1).maxQueueSize(2).rejectedPolicy(ThreadPoolRejectedPolicy.CallerRuns) - .delay(200) + .delay(100) .to("log:after") .to("mock:result"); } @@ -216,12 +216,12 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - onException(Exception.class).maximumRedeliveries(3).handled(true).to("mock:error"); + onException(Exception.class).redeliveryDelay(250).maximumRedeliveries(3).handled(true).to("mock:error"); from("seda:start") .to("log:before") .threads(1, 1).maxPoolSize(1).maxQueueSize(2).rejectedPolicy(ThreadPoolRejectedPolicy.Abort) - .delay(1000) + .delay(250) .to("log:after") .to("mock:result"); } @@ -245,5 +245,4 @@ public class ThreadsRejectedExecutionTest extends ContextTestSupport { assertEquals(0, inflight); } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java index 4efb1a6..8cd4a4e 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java @@ -30,7 +30,7 @@ public class AsyncEndpointMulticastFineGrainedErrorHandlingTest extends ContextT public void configure() throws Exception { context.addComponent("async", new MyAsyncComponent()); - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") @@ -55,7 +55,7 @@ public class AsyncEndpointMulticastFineGrainedErrorHandlingTest extends ContextT public void configure() throws Exception { context.addComponent("async", new MyAsyncComponent()); - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java index c3c77f5..dd7e631 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java @@ -41,7 +41,7 @@ public class AsyncEndpointRecipientListFineGrainedErrorHandlingTest extends Cont public void configure() throws Exception { context.addComponent("async", new MyAsyncComponent()); - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") @@ -66,7 +66,7 @@ public class AsyncEndpointRecipientListFineGrainedErrorHandlingTest extends Cont public void configure() throws Exception { context.addComponent("async", new MyAsyncComponent()); - onException(Exception.class).maximumRedeliveries(2); + onException(Exception.class).redeliveryDelay(0).maximumRedeliveries(2); from("direct:start") .to("mock:a") http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java b/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java index 70f48e7..2b6a758 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java @@ -76,11 +76,13 @@ public class CustomExceptionPolicyStrategyTest extends ContextTestSupport { onException(MyPolicyException.class) .maximumRedeliveries(1) + .redeliveryDelay(0) .setHeader(MESSAGE_INFO, constant("Damm my policy exception")) .to(ERROR_QUEUE); onException(CamelException.class) .maximumRedeliveries(3) + .redeliveryDelay(0) .setHeader(MESSAGE_INFO, constant("Damm a Camel exception")) .to(ERROR_QUEUE); // END SNIPPET e1 http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java b/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java index fed0e1d..58bbfbf 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java @@ -69,7 +69,7 @@ public class DefaultExceptionPolicyStrategyUsingOnlyWhenTest extends ContextTest errorHandler(deadLetterChannel(ERROR_QUEUE).maximumRedeliveries(0).redeliveryDelay(100)); onException(MyUserException.class).onWhen(header("user").isNotNull()) - .maximumRedeliveries(1).backOffMultiplier(2).redeliveryDelay(0) + .maximumRedeliveries(1).redeliveryDelay(0) .to(ERROR_USER_QUEUE); from("direct:a").process(new Processor() { http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java b/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java index 009a165..00e6645 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java @@ -76,6 +76,8 @@ public class DefaultExceptionPolicyStrategyUsingWhenTest extends ContextTestSupp // there is a header[user] on the exchange that is not null onException(MyUserException.class).onWhen(header("user").isNotNull()) .maximumRedeliveries(1) + // setting delay to zero is just to make unit testing faster + .redeliveryDelay(0) .to(ERROR_USER_QUEUE); // here we define onException to catch MyUserException as a kind @@ -85,6 +87,8 @@ public class DefaultExceptionPolicyStrategyUsingWhenTest extends ContextTestSupp // have been defined onException(MyUserException.class) .maximumRedeliveries(2) + // setting delay to zero is just to make unit testing faster + .redeliveryDelay(0) .to(ERROR_QUEUE); // END SNIPPET e1 http://git-wip-us.apache.org/repos/asf/camel/blob/2054cdf1/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties ---------------------------------------------------------------------- diff --git a/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties b/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties index 8c698d5..1bd9df3 100644 --- a/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties +++ b/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties @@ -37,7 +37,7 @@ slipDelimiter=## myQueueSize=10 -myDelayPattern=3:1000;5:3000;10:5000;20:10000 +myDelayPattern=3:10;5:30;10:50;20:100 stop=true onlytwo=2
