Repository: camel Updated Branches: refs/heads/master 32edf80c5 -> 9776b8494
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/9776b849 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9776b849 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9776b849 Branch: refs/heads/master Commit: 9776b84941ffb69ee7f4663b9f363d254b88abb5 Parents: 32edf80 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Jul 15 15:31:38 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jul 15 15:43:29 2017 +0200 ---------------------------------------------------------------------- .../org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java | 2 +- .../java/org/apache/camel/impl/DefaultConsumerTemplateTest.java | 2 +- .../java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java | 2 +- .../apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java | 4 ++-- .../java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java | 2 +- .../apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java | 4 ++-- .../camel/issues/RecipientListUseOriginalMessageIssueTest.java | 2 +- .../org/apache/camel/issues/SedaFileIdempotentIssueTest.java | 3 +-- .../camel/issues/SedaFileIdempotentNoTimeoutIssueTest.java | 3 +-- .../apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java | 3 +-- .../language/TokenPairIteratorSplitChoicePerformanceTest.java | 4 +++- .../java/org/apache/camel/language/TokenPairPredicateTest.java | 2 +- .../camel/language/TokenXMLPairMultiNamespaceSplitTest.java | 2 ++ .../apache/camel/language/TokenXMLPairNamespaceSplitTest.java | 4 ++-- .../test/java/org/apache/camel/language/XMLTokenSplitTest.java | 4 ++-- .../org/apache/camel/language/XPathFromFileExceptionTest.java | 2 +- .../apache/camel/language/XPathSplitChoicePerformanceTest.java | 4 +++- .../language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java | 2 +- 18 files changed, 27 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java b/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java index 029ff70..30f38a8 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java @@ -36,7 +36,7 @@ public class ConsumerCacheZeroCapacityTest extends ContextTestSupport { assertEquals("Size should be 0", 0, cache.size()); - Endpoint endpoint = context.getEndpoint("file:target/foo?fileName=foo.txt&delay=10"); + Endpoint endpoint = context.getEndpoint("file:target/foo?fileName=foo.txt&initialDelay=0&delay=10"); PollingConsumer consumer = cache.acquirePollingConsumer(endpoint); assertNotNull(consumer); assertEquals("Started", ((org.apache.camel.support.ServiceSupport) consumer).getStatus().name()); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java index 8c3e545..524ee47 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java @@ -350,7 +350,7 @@ public class DefaultConsumerTemplateTest extends ContextTestSupport { deleteDirectory("target/foo"); template.sendBodyAndHeader("file:target/foo", "Hello World", Exchange.FILE_NAME, "hello.txt"); - Exchange exchange = consumer.receive("file:target/foo?delete=true"); + Exchange exchange = consumer.receive("file:target/foo?initialDelay=0&delay=10&delete=true"); assertNotNull(exchange); assertEquals("Hello World", exchange.getIn().getBody(String.class)); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java b/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java index ccb0c7d..b100496 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java @@ -54,7 +54,7 @@ public class GzipDataFormatFileDeleteTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/gzip?delete=true") + from("file:target/gzip?initialDelay=0&delay=10&delete=true") .marshal().gzip() .to("file:target/gzip/out?fileName=${file:name}.gz") .to("mock:result"); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java b/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java index 44f82a4..a528ffc 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java @@ -56,11 +56,11 @@ public class GzipDataFormatFileUnmarshalDeleteTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/gzip?delete=true") + from("file:target/gzip?initialDelay=0&delay=10&delete=true") .marshal().gzip() .to("file:target/gzip/out?fileName=${file:name}.gz"); - from("file:target/gzip/out?delete=true") + from("file:target/gzip/out?initialDelay=0&delay=10&delete=true") .unmarshal().gzip() .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java b/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java index 3963d69..c57a7f4 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java @@ -53,7 +53,7 @@ public class ZipDataFormatFileDeleteTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/zip?delete=true") + from("file:target/zip?initialDelay=0&delay=10&delete=true") .marshal().zip() .to("file:target/zip/out?fileName=${file:name}.zip") .to("mock:result"); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java b/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java index 2bbad72..b717026 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java @@ -56,11 +56,11 @@ public class ZipDataFormatFileUnmarshalDeleteTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/zip?delete=true") + from("file:target/zip?initialDelay=0&delay=10&delete=true") .marshal().zip() .to("file:target/zip/out?fileName=${file:name}.zip"); - from("file:target/zip/out?delete=true") + from("file:target/zip/out?initialDelay=0&delay=10&delete=true") .unmarshal().zip() .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageIssueTest.java index e6c7c05..b91aae0 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/RecipientListUseOriginalMessageIssueTest.java @@ -57,7 +57,7 @@ public class RecipientListUseOriginalMessageIssueTest extends ContextTestSupport .to("file://target/outbox") .to("mock:error"); - from("file://target/inbox").process(new Processor() { + from("file://target/inbox?initialDelay=0&delay=10").process(new Processor() { @Override public void process(Exchange exchange) throws Exception { exchange.getIn().setBody("B"); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java index de360f4..900e938 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java @@ -67,12 +67,11 @@ public class SedaFileIdempotentIssueTest extends ContextTestSupport { public void configure() throws Exception { onException(RuntimeException.class).process(new ShutDown()); - from("file:target/inbox?idempotent=true&noop=true&idempotentRepository=#repo&delay=1000") + from("file:target/inbox?idempotent=true&noop=true&idempotentRepository=#repo&initialDelay=0&delay=10") .to("log:begin") .inOut("seda:process"); from("seda:process") - .delay(1000) .throwException(new RuntimeException("Testing with exception")); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentNoTimeoutIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentNoTimeoutIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentNoTimeoutIssueTest.java index ec8783f..376d737 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentNoTimeoutIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentNoTimeoutIssueTest.java @@ -30,12 +30,11 @@ public class SedaFileIdempotentNoTimeoutIssueTest extends SedaFileIdempotentIssu public void configure() throws Exception { onException(RuntimeException.class).process(new ShutDown()); - from("file:target/inbox?idempotent=true&noop=true&idempotentRepository=#repo&delay=1000") + from("file:target/inbox?idempotent=true&noop=true&idempotentRepository=#repo&initialDelay=0&delay=10") .to("log:begin") .inOut("seda:process?timeout=-1"); from("seda:process") - .delay(1000) .throwException(new RuntimeException("Testing with exception")); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java index 736623f..31dbaa0 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java @@ -30,12 +30,11 @@ public class SedaFileIdempotentTimeoutIssueTest extends SedaFileIdempotentIssueT public void configure() throws Exception { onException(RuntimeException.class).process(new ShutDown()); - from("file:target/inbox?idempotent=true&noop=true&idempotentRepository=#repo&delay=1000") + from("file:target/inbox?idempotent=true&noop=true&idempotentRepository=#repo&initialDelay=0&delay=10") .to("log:begin") .inOut("seda:process?timeout=100"); from("seda:process") - .delay(1000) .throwException(new RuntimeException("Testing with exception")); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java b/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java index dfe3e7a..321a75b 100644 --- a/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java @@ -28,11 +28,13 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.StopWatch; import org.apache.camel.util.TimeUtils; +import org.junit.Ignore; import org.slf4j.Logger; /** * */ +@Ignore("Test manually") public class TokenPairIteratorSplitChoicePerformanceTest extends ContextTestSupport { private int size = 20 * 1000; @@ -76,7 +78,7 @@ public class TokenPairIteratorSplitChoicePerformanceTest extends ContextTestSupp return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/data?noop=true") + from("file:target/data?initialDelay=0&delay=10&noop=true") .process(new Processor() { public void process(Exchange exchange) throws Exception { log.info("Starting to process file"); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/language/TokenPairPredicateTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/TokenPairPredicateTest.java b/camel-core/src/test/java/org/apache/camel/language/TokenPairPredicateTest.java index f6a8c21..1725d7e 100644 --- a/camel-core/src/test/java/org/apache/camel/language/TokenPairPredicateTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/TokenPairPredicateTest.java @@ -54,7 +54,7 @@ public class TokenPairPredicateTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/pair?move=ok") + from("file:target/pair?initialDelay=0&delay=10&move=ok") .choice() // does not make so much sense to use a tokenPair in a predicate // but you can do it nevertheless http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java b/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java index b410372..347f19e 100644 --- a/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java @@ -18,6 +18,7 @@ package org.apache.camel.language; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; +import org.junit.Ignore; /** * @@ -37,6 +38,7 @@ public class TokenXMLPairMultiNamespaceSplitTest extends TokenXMLPairNamespaceSp assertMockEndpointsSatisfied(); } + @Ignore public void testTokenXMLPair2() throws Exception { // noop } http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java b/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java index dd74896..3e09e09 100644 --- a/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java @@ -75,13 +75,13 @@ public class TokenXMLPairNamespaceSplitTest 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") .to("mock:split"); // END SNIPPET: e1 - from("file:target/pair2") + from("file:target/pair2?initialDelay=0&delay=10") // split the order child tags, and inherit namespaces from the orders root tag .split(body().tokenizeXML("order", "orders")) .to("mock:split"); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java b/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java index c2cd263..15ec7cd 100644 --- a/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java @@ -78,13 +78,13 @@ public class XMLTokenSplitTest extends ContextTestSupport { @Override public void configure() throws Exception { // START SNIPPET: e1 - from("file:target/xtokenizer") + from("file:target/xtokenizer?initialDelay=0&delay=10") // split the order child tags, and inherit namespaces from the orders root tag .split().xtokenize("//orders/order", ns) .to("mock:split"); // END SNIPPET: e1 - from("file:target/xtokenizer2") + from("file:target/xtokenizer2?initialDelay=0&delay=10") // split the order child tags, and inherit namespaces from the orders root tag .split(body().xtokenize("//orders/order", ns)) .to("mock:split"); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/language/XPathFromFileExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/XPathFromFileExceptionTest.java b/camel-core/src/test/java/org/apache/camel/language/XPathFromFileExceptionTest.java index 405e6e1..f470f5a 100644 --- a/camel-core/src/test/java/org/apache/camel/language/XPathFromFileExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/XPathFromFileExceptionTest.java @@ -73,7 +73,7 @@ public class XPathFromFileExceptionTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/xpath?moveFailed=error&move=ok") + from("file:target/xpath?initialDelay=0&delay=10&moveFailed=error&move=ok") .onException(Exception.class) .to("mock:error") .end() http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java b/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java index 164c9f2..dd28ef6 100644 --- a/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java @@ -28,11 +28,13 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.StopWatch; import org.apache.camel.util.TimeUtils; +import org.junit.Ignore; import org.slf4j.Logger; /** * */ +@Ignore("Test manually") public class XPathSplitChoicePerformanceTest extends ContextTestSupport { private int size = 20 * 1000; @@ -76,7 +78,7 @@ public class XPathSplitChoicePerformanceTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/data?noop=true") + from("file:target/data?initialDelay=0&delay=10&noop=true") .process(new Processor() { public void process(Exchange exchange) throws Exception { log.info("Starting to process file"); http://git-wip-us.apache.org/repos/asf/camel/blob/9776b849/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java b/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java index 4b84300..c1ad22f 100644 --- a/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java @@ -54,7 +54,7 @@ public class XMLTokenizeLanguageStreamingFileTest extends ContextTestSupport { return new RouteBuilder() { Namespaces ns = new Namespaces("C", "urn:c"); public void configure() { - from("file:target/xmltokenize") + from("file:target/xmltokenize?initialDelay=0&delay=10") .split().xtokenize("//C:child", ns).streaming() .to("mock:result") .end();
