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 2017/07/15 14:54:30 UTC
[2/2] camel git commit: CAMEL-11446: Use awaitility for testing where
we otherwise use thred sleep which can be speeded up.
CAMEL-11446: Use awaitility 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/46b3eb44
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/46b3eb44
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/46b3eb44
Branch: refs/heads/master
Commit: 46b3eb44b5e49aee42ec3bb6a0e2e9616677a23c
Parents: 8ec4550
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jul 15 16:37:37 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 15 16:37:37 2017 +0200
----------------------------------------------------------------------
...terChannelUseOriginalInBodyWithFileTest.java | 2 +-
.../org/apache/camel/processor/DelayerTest.java | 22 ++++++++++----------
.../processor/DelayerWhileShutdownTest.java | 4 ++--
.../apache/camel/processor/MyDelayCalcBean.java | 2 +-
.../processor/ShutdownCompleteAllTasksTest.java | 2 +-
.../ShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../camel/processor/ShutdownDeferTest.java | 2 +-
.../camel/processor/ShutdownNotDeferTest.java | 2 +-
.../camel/processor/SplitGroupMultiXmlTest.java | 2 +-
.../processor/SplitGroupMultiXmlTokenTest.java | 2 +-
.../SplitGroupWrappedMultiXmlTokenTest.java | 2 +-
.../processor/SplitterParallelBigFileTest.java | 2 +-
.../SplitterStreamingUoWIssueTest.java | 2 +-
.../camel/processor/SplitterUoWIssueTest.java | 2 +-
.../processor/WireTapStreamCachingTest.java | 2 +-
...tchConsumerSendEmptyMessageWhenIdleTest.java | 2 +-
.../AggregateSimpleExpressionIssueTest.java | 2 ++
...StrategyCompletionFromBatchConsumerTest.java | 2 +-
.../PollEnrichBridgeErrorHandlerTest.java | 2 +-
...EnrichFileCustomAggregationStrategyTest.java | 4 ++--
...nrichFileDefaultAggregationStrategyTest.java | 8 +++----
.../intercept/FromFileInterceptSendToIssue.java | 2 +-
22 files changed, 38 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
index b7bbc17..27b5a26 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
@@ -52,7 +52,7 @@ public class DeadLetterChannelUseOriginalInBodyWithFileTest extends ContextTestS
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:dead").disableRedelivery().logStackTrace(false).useOriginalMessage());
- from("file://target/originalexchange?noop=true")
+ from("file://target/originalexchange?initialDelay=0&delay=10&noop=true")
.transform(body().append(" World"))
.process(new MyThrowProcessor());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java b/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
index 16b60fa..d9bc663 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
@@ -36,9 +36,9 @@ public class DelayerTest extends ContextTestSupport {
// do not wait for the first message
resultEndpoint.expectedMessageCount(0);
- resultEndpoint.setResultWaitTime(500);
- template.sendBodyAndHeader("seda:a", "<hello>world!</hello>", "MyDelay", 1000);
- // we should not receive it as we wait at most 0.5 sec and it take 1 sec to send
+ resultEndpoint.setResultWaitTime(10);
+ template.sendBodyAndHeader("seda:a", "<hello>world!</hello>", "MyDelay", 100);
+ // we should not receive it as we wait at most 0.01 sec and it take 0.1 sec to send
resultEndpoint.assertIsSatisfied();
// now if we wait a bit longer we should receive the message!
@@ -50,8 +50,8 @@ public class DelayerTest extends ContextTestSupport {
public void testDelayConstant() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
- // should at least take 1 sec to complete
- resultEndpoint.setResultMinimumWaitTime(900);
+ // should at least take 0.1 sec to complete
+ resultEndpoint.setResultMinimumWaitTime(90);
template.sendBody("seda:b", "<hello>world!</hello>");
resultEndpoint.assertIsSatisfied();
}
@@ -59,8 +59,8 @@ public class DelayerTest extends ContextTestSupport {
public void testDelayBean() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
- // should at least take 1 sec to complete
- resultEndpoint.setResultMinimumWaitTime(900);
+ // should at least take 0.1 sec to complete
+ resultEndpoint.setResultMinimumWaitTime(90);
template.sendBody("seda:c", "<hello>world!</hello>");
resultEndpoint.assertIsSatisfied();
}
@@ -68,9 +68,9 @@ public class DelayerTest extends ContextTestSupport {
public void testExchangeAwareDelayBean() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
- // should at least take 1 sec to complete
- resultEndpoint.setResultMinimumWaitTime(900);
- template.sendBodyAndHeader("seda:d", "<hello>world!</hello>", BEAN_DELAYER_HEADER, 1000);
+ // should at least take 0.1 sec to complete
+ resultEndpoint.setResultMinimumWaitTime(90);
+ template.sendBodyAndHeader("seda:d", "<hello>world!</hello>", BEAN_DELAYER_HEADER, 100);
resultEndpoint.assertIsSatisfied();
}
@@ -82,7 +82,7 @@ public class DelayerTest extends ContextTestSupport {
// END SNIPPET: ex
// START SNIPPET: ex2
- from("seda:b").delay(1000).to("mock:result");
+ from("seda:b").delay(100).to("mock:result");
// END SNIPPET: ex2
// START SNIPPET: ex3
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java b/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
index 955d93d..511c943 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
@@ -40,8 +40,8 @@ public class DelayerWhileShutdownTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("seda:a").delay(5000).to("mock:result");
- from("seda:b").delay(10).to("mock:result");
+ from("seda:a").delay(500).to("mock:result");
+ from("seda:b").delay(1).to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/MyDelayCalcBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/MyDelayCalcBean.java b/camel-core/src/test/java/org/apache/camel/processor/MyDelayCalcBean.java
index 6f836c7..bfbc166 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/MyDelayCalcBean.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/MyDelayCalcBean.java
@@ -22,6 +22,6 @@ package org.apache.camel.processor;
public class MyDelayCalcBean {
public long delayMe(String body) {
- return 1000;
+ return 100;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
index 2535fc6..92e3045 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.component.mock.MockEndpoint;
*/
public class ShutdownCompleteAllTasksTest extends ContextTestSupport {
- private static String url = "file:target/pending";
+ private static String url = "file:target/pending?initialDelay=0&delay=10";
private static AtomicInteger counter = new AtomicInteger();
private static CountDownLatch latch = new CountDownLatch(2);
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
index 717a839..a2bd936 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint;
*/
public class ShutdownCompleteCurrentTaskOnlyTest extends ContextTestSupport {
- private static String url = "file:target/pending";
+ private static String url = "file:target/pending?initialDelay=0&delay=10";
@Override
protected void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
index b7cf4f6..a23fe67 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
@@ -75,7 +75,7 @@ public class ShutdownDeferTest extends ContextTestSupport {
// use file component to transfer files from route 1 -> route 2 as it
// will normally suspend, but by deferring this we can let route 1
// complete while shutting down
- MyDeferFileEndpoint defer = new MyDeferFileEndpoint("file://target/deferred", getContext().getComponent("file"));
+ MyDeferFileEndpoint defer = new MyDeferFileEndpoint("file://target/deferred?initialDelay=0&delay=10", getContext().getComponent("file"));
defer.setFile(new File("target/deferred"));
from(defer)
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
index 5ce82ff..5f62167 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
@@ -70,7 +70,7 @@ public class ShutdownNotDeferTest extends ContextTestSupport {
.to("file://target/deferred");
// use file component to transfer files from route 1 -> route 2
- MyDeferFileEndpoint defer = new MyDeferFileEndpoint("file://target/deferred", getContext().getComponent("file"));
+ MyDeferFileEndpoint defer = new MyDeferFileEndpoint("file://target/deferred?initialDelay=0&delay=10", getContext().getComponent("file"));
defer.setFile(new File("target/deferred"));
from(defer)
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTest.java
index 9bcc13d..6946b65 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTest.java
@@ -63,7 +63,7 @@ public class SplitGroupMultiXmlTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("file:target/pair")
+ from("file:target/pair?initialDelay=0&delay=10")
// split the order child tags, and inherit namespaces from the orders root tag
.split().tokenizeXML("order", "orders", 2)
.to("log:split")
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
index 67a1f90..f3d7214 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
@@ -65,7 +65,7 @@ public class SplitGroupMultiXmlTokenTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("file:target/pair")
+ from("file:target/pair?initialDelay=0&delay=10")
// split the order child tags, and inherit namespaces from the orders root tag
.split().xtokenize("//order", 'i', ns, 2)
.to("log:split")
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
index 4c1fa94..6eae929 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
@@ -68,7 +68,7 @@ public class SplitGroupWrappedMultiXmlTokenTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("file:target/pair")
+ from("file:target/pair?initialDelay=0&delay=10")
// split the order child tags, and inherit namespaces from the orders root tag
.split().xtokenize("//order", 'w', ns, 2)
.to("log:split")
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
index bad9a6c..a5e39f5 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
@@ -79,7 +79,7 @@ public class SplitterParallelBigFileTest extends ContextTestSupport {
// lower max pool to 10 for less number of concurrent threads
//context.getExecutorServiceStrategy().getDefaultThreadPoolProfile().setMaxPoolSize(10);
- from("file:target/split")
+ from("file:target/split?initialDelay=0&delay=10")
.split(body().tokenize(LS)).streaming().parallelProcessing()
.to("log:split?groupSize=1000")
.end()
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
index a267de7..782507a 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
@@ -55,7 +55,7 @@ public class SplitterStreamingUoWIssueTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/splitter?delete=true&sortBy=file:name")
+ from("file:target/splitter?initialDelay=0&delay=10&delete=true&sortBy=file:name")
.split(body().tokenize(",")).streaming()
.to("seda:queue")
.end()
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java
index f982f92..98b345f 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java
@@ -55,7 +55,7 @@ public class SplitterUoWIssueTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/splitter?delete=true&sortBy=file:name")
+ from("file:target/splitter?initialDelay=0&delay=10&delete=true&sortBy=file:name")
.split(body().tokenize(","))
.to("seda:queue")
.end()
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/WireTapStreamCachingTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/WireTapStreamCachingTest.java b/camel-core/src/test/java/org/apache/camel/processor/WireTapStreamCachingTest.java
index 1db7307..f631972 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/WireTapStreamCachingTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/WireTapStreamCachingTest.java
@@ -100,7 +100,7 @@ public class WireTapStreamCachingTest extends ContextTestSupport {
from("direct:x").process(processor).to("mock:x");
// even if a process takes more time then the others the wire tap shall work
- from("direct:y").delay(2000).process(processor).to("mock:y");
+ from("direct:y").delay(500).process(processor).to("mock:y");
from("direct:z").process(processor).to("mock:z");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java
index 1e6e15e..b51224f 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java
@@ -42,7 +42,7 @@ public class AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest exten
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/batch?sendEmptyMessageWhenIdle=true&delay=250")
+ from("file:target/batch?initialDelay=0&delay=10&sendEmptyMessageWhenIdle=true")
.aggregate(constant(true), new UseLatestAggregationStrategy()).completionFromBatchConsumer()
.to("mock:result");
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueTest.java
index 1b1abd8..a615f06 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueTest.java
@@ -30,12 +30,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StopWatch;
+import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
*/
+@Ignore("Manual unit test")
public class AggregateSimpleExpressionIssueTest extends ContextTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(AggregateSimpleExpressionIssueTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyCompletionFromBatchConsumerTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyCompletionFromBatchConsumerTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyCompletionFromBatchConsumerTest.java
index 987e3b9..18ecfc4 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyCompletionFromBatchConsumerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyCompletionFromBatchConsumerTest.java
@@ -55,7 +55,7 @@ public class CustomListAggregationStrategyCompletionFromBatchConsumerTest extend
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/batch?sortBy=file:name").routeId("foo").noAutoStartup()
+ from("file:target/batch?initialDelay=0&delay=10&sortBy=file:name").routeId("foo").noAutoStartup()
.aggregate(new MyListOfNumbersStrategy()).constant(true)
.completionFromBatchConsumer()
.to("mock:result");
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
index 6e47cfc..4d6d287 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
@@ -63,7 +63,7 @@ public class PollEnrichBridgeErrorHandlerTest extends ContextTestSupport {
from("seda:start")
// bridge the error handler when doing a polling so we can let Camel's error handler decide what to do
- .pollEnrich("file:target/foo?pollStrategy=#myPoll&consumer.bridgeErrorHandler=true", 10000, new UseLatestAggregationStrategy())
+ .pollEnrich("file:target/foo?initialDelay=0&delay=10&pollStrategy=#myPoll&consumer.bridgeErrorHandler=true", 10000, new UseLatestAggregationStrategy())
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
index 04af57e..78bee9f 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
@@ -61,9 +61,9 @@ public class PollEnrichFileCustomAggregationStrategyTest extends ContextTestSupp
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/enrich?move=.done")
+ from("file://target/enrich?initialDelay=0&delay=10&move=.done")
.to("mock:start")
- .pollEnrich("file://target/enrichdata?readLock=markerFile&move=.done", 10000, new ReplaceAggregationStrategy())
+ .pollEnrich("file://target/enrichdata?initialDelay=0&delay=10&readLock=markerFile&move=.done", 10000, new ReplaceAggregationStrategy())
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileDefaultAggregationStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileDefaultAggregationStrategyTest.java b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileDefaultAggregationStrategyTest.java
index 65163c7..eb537e8 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileDefaultAggregationStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileDefaultAggregationStrategyTest.java
@@ -45,8 +45,8 @@ public class PollEnrichFileDefaultAggregationStrategyTest extends ContextTestSup
template.sendBodyAndHeader("file://target/enrich", "Start", Exchange.FILE_NAME, "AAA.fin");
- log.info("Sleeping for 1 sec before writing enrichdata file");
- Thread.sleep(1000);
+ log.info("Sleeping for 0.25 sec before writing enrichdata file");
+ Thread.sleep(250);
template.sendBodyAndHeader("file://target/enrichdata", "Big file", Exchange.FILE_NAME, "AAA.dat");
log.info("... write done");
@@ -60,9 +60,9 @@ public class PollEnrichFileDefaultAggregationStrategyTest extends ContextTestSup
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/enrich?move=.done")
+ from("file://target/enrich?initialDelay=0&delay=10&move=.done")
.to("mock:start")
- .pollEnrich("file://target/enrichdata?readLock=markerFile&move=.done", 10000)
+ .pollEnrich("file://target/enrichdata?initialDelay=0&delay=10&readLock=markerFile&move=.done", 10000)
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/46b3eb44/camel-core/src/test/java/org/apache/camel/processor/intercept/FromFileInterceptSendToIssue.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/intercept/FromFileInterceptSendToIssue.java b/camel-core/src/test/java/org/apache/camel/processor/intercept/FromFileInterceptSendToIssue.java
index adb69ae..ad656e4 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/intercept/FromFileInterceptSendToIssue.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/intercept/FromFileInterceptSendToIssue.java
@@ -48,7 +48,7 @@ public class FromFileInterceptSendToIssue extends ContextTestSupport {
public void configure() throws Exception {
interceptSendToEndpoint("direct:foo").to("mock:foo");
- from("file://target/intercept")
+ from("file://target/intercept?initialDelay=0&delay=10")
.setHeader(Exchange.FILE_NAME, constant("hello.txt"))
.to("direct:foo");
}