Fixed test on slow CI box
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/43d021b5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/43d021b5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/43d021b5 Branch: refs/heads/master Commit: 43d021b53c0c2cb924bd1e965ec2b13c6a358a4e Parents: 1125ab0 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Sep 27 11:32:19 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Sep 27 11:40:55 2017 +0200 ---------------------------------------------------------------------- .../camel/component/file/FileConsumerFileExpressionTest.java | 6 ++++-- .../camel/component/file/FileProducerFileExistAppendTest.java | 4 ++-- .../processor/aggregator/AggregateLostGroupIssueTest.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/43d021b5/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java index 22cbe83..a688bc1 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java @@ -59,12 +59,13 @@ public class FileConsumerFileExpressionTest extends ContextTestSupport { + "?initialDelay=0&delay=10&fileName=${bean:counter.next}.txt&delete=true").to("mock:result"); } }); - context.start(); // we should only get one as we only poll a single file using the file expression MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Goodday World"); + context.start(); + assertMockEndpointsSatisfied(); } @@ -82,12 +83,13 @@ public class FileConsumerFileExpressionTest extends ContextTestSupport { // END SNIPPET: e1 } }); - context.start(); // we should only get one as we only poll a single file using the file expression MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Goodday World"); + context.start(); + assertMockEndpointsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/43d021b5/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java index b6cf181..19b8c76 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java @@ -35,14 +35,14 @@ public class FileProducerFileExistAppendTest extends ContextTestSupport { public void testAppend() throws Exception { template.sendBodyAndHeader("file://target/file", "Hello World\n", Exchange.FILE_NAME, "hello.txt"); - context.startAllRoutes(); - MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World\nBye World"); mock.expectedFileExists("target/file/hello.txt", "Hello World\nBye World"); template.sendBodyAndHeader("file://target/file?fileExist=Append", "Bye World", Exchange.FILE_NAME, "hello.txt"); + context.startAllRoutes(); + assertMockEndpointsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/43d021b5/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java index 4c9ea79..09b42c0 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java @@ -68,7 +68,7 @@ public class AggregateLostGroupIssueTest extends ContextTestSupport { oldExchange.getIn().setBody(oldBody + "," + newBody); return oldExchange; } - }).completionSize(10).completionTimeout(100).completionTimeoutCheckerInterval(10) + }).completionSize(10).completionTimeout(200).completionTimeoutCheckerInterval(10) .to("log:aggregated") .to("mock:result"); }
