Repository: camel Updated Branches: refs/heads/master 46b3eb44b -> 9c37b5648
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/9c37b564 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9c37b564 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9c37b564 Branch: refs/heads/master Commit: 9c37b5648373774cfb94e108b4b1e87e1c70b152 Parents: 46b3eb4 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Jul 15 17:06:23 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jul 15 17:06:23 2017 +0200 ---------------------------------------------------------------------- .../file/FileKeepLastModifiedTest.java | 19 ++++++++++------ .../impl/DefaultProducerTemplateAsyncTest.java | 24 ++++++++++---------- 2 files changed, 24 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9c37b564/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java index 30af17b..e05aa21 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java @@ -32,7 +32,6 @@ public class FileKeepLastModifiedTest extends ContextTestSupport { protected void setUp() throws Exception { deleteDirectory("target/keep"); super.setUp(); - template.sendBodyAndHeader("file://target/keep", "Hello World", "CamelFileName", "hello.txt"); } public void testKeepLastModified() throws Exception { @@ -40,16 +39,18 @@ public class FileKeepLastModifiedTest extends ContextTestSupport { @Override public void configure() throws Exception { from("file://target/keep?noop=true?initialDelay=0&delay=10") - .delay(100).to("file://target/keep/out?keepLastModified=true", "mock:result"); + .delay(10) + .to("file://target/keep/out?keepLastModified=true", "mock:result"); } }); context.start(); MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.expectedFileExists("target/keep/out/hello.txt"); mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull(); + template.sendBodyAndHeader("file://target/keep", "Hello World", "CamelFileName", "hello.txt"); + assertMockEndpointsSatisfied(); long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class); @@ -63,16 +64,18 @@ public class FileKeepLastModifiedTest extends ContextTestSupport { @Override public void configure() throws Exception { from("file://target/keep?noop=true?initialDelay=0&delay=10") - .delay(100).to("file://target/keep/out?keepLastModified=false", "mock:result"); + .delay(10) + .to("file://target/keep/out?keepLastModified=false", "mock:result"); } }); context.start(); MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.expectedFileExists("target/keep/out/hello.txt"); mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull(); + template.sendBodyAndHeader("file://target/keep", "Hello World", "CamelFileName", "hello.txt"); + assertMockEndpointsSatisfied(); long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class); @@ -86,16 +89,18 @@ public class FileKeepLastModifiedTest extends ContextTestSupport { @Override public void configure() throws Exception { from("file://target/keep?noop=true&initialDelay=0&delay=10") - .delay(100).to("file://target/keep/out", "mock:result"); + .delay(10) + .to("file://target/keep/out", "mock:result"); } }); context.start(); MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.expectedFileExists("target/keep/out/hello.txt"); mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull(); + template.sendBodyAndHeader("file://target/keep", "Hello World", "CamelFileName", "hello.txt"); + assertMockEndpointsSatisfied(); long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class); http://git-wip-us.apache.org/repos/asf/camel/blob/9c37b564/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java index 44e921f..323e091 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java @@ -54,7 +54,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { long delta = System.currentTimeMillis() - start; assertEquals("Hello World", result.getIn().getBody()); - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); assertMockEndpointsSatisfied(); } @@ -75,7 +75,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { long delta = System.currentTimeMillis() - start; assertEquals("Hello World", result.getIn().getBody()); - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testRequestAsyncBody() throws Exception { @@ -91,7 +91,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { long delta = System.currentTimeMillis() - start; assertEquals("Hello World", result); - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testRequestAsyncBodyType() throws Exception { @@ -107,7 +107,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { long delta = System.currentTimeMillis() - start; assertEquals("Hello World", result); - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testRequestAsyncBodyAndHeader() throws Exception { @@ -129,7 +129,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { long delta = System.currentTimeMillis() - start; assertEquals("Hello World", result); - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testRequestAsyncBodyAndHeaderType() throws Exception { @@ -151,7 +151,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { long delta = System.currentTimeMillis() - start; assertEquals("Hello World", result); - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testRequestAsyncBodyAndHeaders() throws Exception { @@ -177,7 +177,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { long delta = System.currentTimeMillis() - start; assertEquals("Hello World", result); - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testRequestAsyncBodyAndHeadersType() throws Exception { @@ -203,7 +203,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { long delta = System.currentTimeMillis() - start; assertEquals("Hello World", result); - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testRequestAsyncErrorWhenProcessing() throws Exception { @@ -225,7 +225,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { } long delta = System.currentTimeMillis() - start; - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testRequestAsyncBodyErrorWhenProcessing() throws Exception { @@ -244,7 +244,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { } long delta = System.currentTimeMillis() - start; - assertTrue("Should take longer than: " + delta, delta > 250); + assertTrue("Should take longer than: " + delta, delta > 50); } public void testAsyncCallbackExchangeInOnly() throws Exception { @@ -570,11 +570,11 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport { @Override public void configure() throws Exception { from("direct:start") - .delay(400).asyncDelayed() + .delay(200).asyncDelayed() .transform(body().append(" World")).to("mock:result"); from("direct:error") - .delay(400).asyncDelayed() + .delay(200).asyncDelayed() .process(new Processor() { public void process(Exchange exchange) throws Exception { throw new IllegalArgumentException("Damn forced by unit test");
