You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2017/10/30 07:33:56 UTC
[camel] branch master updated: camel-mail: make tests run faster be
decreasing consumer delays
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4703172 camel-mail: make tests run faster be decreasing consumer delays
4703172 is described below
commit 4703172d1017009ab69fd51adce3f114d1434fcc
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Oct 30 08:32:11 2017 +0100
camel-mail: make tests run faster be decreasing consumer delays
---
.../camel/component/mail/AdditionalMailPropertiesTest.java | 4 ++--
.../org/apache/camel/component/mail/FromFileSendMailTest.java | 4 ++--
.../camel/component/mail/MailAttachmentDuplicateNamesTest.java | 7 ++-----
.../camel/component/mail/MailAttachmentRedeliveryTest.java | 7 ++-----
.../org/apache/camel/component/mail/MailAttachmentTest.java | 7 ++-----
.../camel/component/mail/MailAttachmentsUmlautIssueTest.java | 2 +-
.../org/apache/camel/component/mail/MailBatchConsumerTest.java | 2 +-
.../apache/camel/component/mail/MailCollectionHeaderTest.java | 2 +-
.../camel/component/mail/MailCommitOnCompletionTest.java | 4 ++--
.../camel/component/mail/MailConsumerIdleMessageTest.java | 2 +-
.../component/mail/MailConsumerUnsupportedCharsetTest.java | 2 +-
.../camel/component/mail/MailContentTypeResolverTest.java | 7 ++-----
.../org/apache/camel/component/mail/MailConvertersTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailCopyToTest.java | 2 +-
.../component/mail/MailDefaultDelayForMailConsumeTest.java | 10 +++++-----
.../org/apache/camel/component/mail/MailDisconnectTest.java | 6 +++---
.../component/mail/MailDoNotDeleteIfProcessFailsTest.java | 2 +-
.../org/apache/camel/component/mail/MailFetchSizeTest.java | 6 +++---
.../org/apache/camel/component/mail/MailFetchSizeZeroTest.java | 2 +-
.../mail/MailHeaderOverrulePreConfigurationRecipientsTest.java | 2 +-
.../apache/camel/component/mail/MailHtmlAttachmentTest.java | 4 ++--
.../mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java | 2 +-
.../component/mail/MailIdempotentRepositoryDuplicateTest.java | 2 +-
.../camel/component/mail/MailIdempotentRepositoryTest.java | 2 +-
.../camel/component/mail/MailMaxMessagesPerPollTest.java | 2 +-
.../apache/camel/component/mail/MailMimeDecodeHeadersTest.java | 4 ++--
.../camel/component/mail/MailMultipleRecipientsTest.java | 8 ++++----
.../camel/component/mail/MailNameAndEmailInRecipientTest.java | 4 ++--
.../apache/camel/component/mail/MailPollEnrichNoMailTest.java | 2 +-
.../org/apache/camel/component/mail/MailPollEnrichTest.java | 2 +-
.../apache/camel/component/mail/MailPostProcessActionTest.java | 2 +-
.../component/mail/MailProcessOnlyUnseenMessagesTest.java | 2 +-
.../component/mail/MailProducerUnsupportedCharsetTest.java | 4 ++--
.../java/org/apache/camel/component/mail/MailReplyToTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailRouteTest.java | 8 ++------
.../org/apache/camel/component/mail/MailSearchTermTest.java | 2 +-
.../component/mail/MailSearchTermUriConfigLast24HoursTest.java | 2 +-
.../camel/component/mail/MailSearchTermUriConfigTest.java | 2 +-
.../camel/component/mail/MailShutdownCompleteAllTasksTest.java | 2 +-
.../mail/MailShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailSortTermTest.java | 2 +-
.../org/apache/camel/component/mail/MailSortTermThreeTest.java | 2 +-
.../org/apache/camel/component/mail/MailSortTermTwoTest.java | 2 +-
.../apache/camel/component/mail/MailSplitAttachmentsTest.java | 6 +-----
.../java/org/apache/camel/component/mail/MailSubjectTest.java | 2 +-
.../camel/component/mail/MailUsernameWithAtSignTest.java | 2 +-
.../camel/component/mail/MailUsingCustomSessionTest.java | 2 +-
.../apache/camel/component/mail/MimeMessageConsumeTest.java | 4 ++--
.../camel/component/mail/MimeMultipartAlternativeTest.java | 5 +----
.../mail/MimeMultipartAlternativeWithContentTypeTest.java | 2 +-
.../mail/MimeMultipartAlternativeWithLongerFilenameTest.java | 5 +----
.../camel/component/mail/MultipleDestinationConsumeTest.java | 2 +-
.../camel/component/mail/NestedMimeMessageConsumeTest.java | 4 ++--
.../org/apache/camel/component/mail/RawMailMessageTest.java | 8 ++++----
.../mail/security/SslContextParametersMailRouteTest.java | 2 +-
55 files changed, 83 insertions(+), 109 deletions(-)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
index fa6565f..944847c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
@@ -34,7 +34,7 @@ public class AdditionalMailPropertiesTest extends CamelTestSupport {
// clear mailbox
Mailbox.clearAll();
- MailEndpoint endpoint = context.getEndpoint("pop3://localhost?username=james&mail.pop3.forgettopheaders=true", MailEndpoint.class);
+ MailEndpoint endpoint = context.getEndpoint("pop3://localhost?username=james&mail.pop3.forgettopheaders=true&consumer.initialDelay=100&consumer.delay=100", MailEndpoint.class);
Properties prop = endpoint.getConfiguration().getAdditionalJavaMailProperties();
assertEquals("true", prop.get("mail.pop3.forgettopheaders"));
}
@@ -59,7 +59,7 @@ public class AdditionalMailPropertiesTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://james@localhost?mail.pop3.forgettopheaders=true").to("mock:result");
+ from("pop3://james@localhost?mail.pop3.forgettopheaders=true&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
index 044cada..b084343 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
@@ -54,11 +54,11 @@ public class FromFileSendMailTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/mailtext")
+ from("file://target/mailtext?consumer.initialDelay=100&consumer.delay=100")
.setHeader("Subject", constant("Hello World"))
.setHeader("To", constant("james@localhost"))
.setHeader("From", constant("claus@localhost"))
- .to("smtp://localhost?password=secret&username=claus", "mock:result");
+ .to("smtp://localhost?password=secret&username=claus&consumer.initialDelay=100&consumer.delay=100", "mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
index 61be300..01955ab 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
@@ -62,13 +62,10 @@ public class MailAttachmentDuplicateNamesTest extends CamelTestSupport {
// END SNIPPET: e1
- // need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(2000);
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- Exchange out = mock.assertExchangeReceived(0);
mock.assertIsSatisfied();
+ Exchange out = mock.assertExchangeReceived(0);
// plain text
assertEquals("Hello World", out.getIn().getBody(String.class));
@@ -92,7 +89,7 @@ public class MailAttachmentDuplicateNamesTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://james@mymailserver.com?password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
index 998924a..c83191c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
@@ -61,13 +61,10 @@ public class MailAttachmentRedeliveryTest extends CamelTestSupport {
// and let it go (processes the exchange by sending the email)
producer.process(exchange);
- // need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(2000);
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- Exchange out = mock.assertExchangeReceived(0);
mock.assertIsSatisfied();
+ Exchange out = mock.assertExchangeReceived(0);
// plain text
assertEquals("Hello World", out.getIn().getBody(String.class));
@@ -100,7 +97,7 @@ public class MailAttachmentRedeliveryTest extends CamelTestSupport {
public void configure() throws Exception {
onException(IllegalArgumentException.class).maximumRedeliveries(3).redeliveryDelay(0);
- from("pop3://james@mymailserver.com?password=secret&consumer.delay=1000")
+ from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100")
.process(new Processor() {
private int counter;
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
index fce729e..28722a5 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
@@ -65,13 +65,10 @@ public class MailAttachmentTest extends CamelTestSupport {
// END SNIPPET: e1
- // need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(2000);
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- Exchange out = mock.assertExchangeReceived(0);
mock.assertIsSatisfied();
+ Exchange out = mock.assertExchangeReceived(0);
// plain text
assertEquals("Hello World", out.getIn().getBody(String.class));
@@ -100,7 +97,7 @@ public class MailAttachmentTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://james@mymailserver.com?password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
index cbd6947..f8e8864 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
@@ -94,7 +94,7 @@ public class MailAttachmentsUmlautIssueTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://james@mymailserver.com?password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
index 6f0ec89..7b01da2b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
@@ -87,7 +87,7 @@ public class MailBatchConsumerTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.delay=5000"
+ from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100"
+ "&delete=true").to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
index 58a10e1..ea4cb2b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
@@ -55,7 +55,7 @@ public class MailCollectionHeaderTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:a").to("smtp://localhost?username=james@localhost");
- from("pop3://localhost?username=james&password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://localhost?username=james&password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
index 6a6317f..3f18fdf 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
@@ -51,7 +51,7 @@ public class MailCommitOnCompletionTest extends CamelTestSupport {
mock.assertIsSatisfied();
// wait a bit because delete is on completion
- Thread.sleep(1000);
+ Thread.sleep(500);
assertEquals(0, mailbox.size());
}
@@ -80,7 +80,7 @@ public class MailCommitOnCompletionTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&delete=true")
+ from("pop3://jones@localhost?password=secret&delete=true&consumer.initialDelay=100&consumer.delay=100")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
// now f*** up and create a new OUT Message (without propagating the IN message)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
index 3c57a04..59ee6f1 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
@@ -41,7 +41,7 @@ public class MailConsumerIdleMessageTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://james@localhost?password=foo&delay=50&sendEmptyMessageWhenIdle=true")
+ from("pop3://james@localhost?password=foo&consumer.initialDelay=100&consumer.delay=100&sendEmptyMessageWhenIdle=true")
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
index d6377f0..68ec63b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
@@ -67,7 +67,7 @@ public class MailConsumerUnsupportedCharsetTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.delay=1000&ignoreUnsupportedCharset=true").to("mock:result");
+ from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&ignoreUnsupportedCharset=true").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
index 2397172..0e07375 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
@@ -56,13 +56,10 @@ public class MailContentTypeResolverTest extends CamelTestSupport {
// and let it go (processes the exchange by sending the email)
producer.process(exchange);
- // need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(4000);
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- Exchange out = mock.assertExchangeReceived(0);
mock.assertIsSatisfied();
+ Exchange out = mock.assertExchangeReceived(0);
// plain text
assertEquals("Hello World", out.getIn().getBody(String.class));
@@ -94,7 +91,7 @@ public class MailContentTypeResolverTest extends CamelTestSupport {
}
});
- from("pop3://james@mymailserver.com?password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
index 30c3465..23714e9 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
@@ -153,7 +153,7 @@ public class MailConvertersTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:a").to("smtp://localhost?username=james@localhost");
- from("pop3://localhost?username=james&password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://localhost?username=james&password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
index cf08c6e..4a17009 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
@@ -76,7 +76,7 @@ public class MailCopyToTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("imap://jones@localhost?password=secret©To=backup").to("mock:result");
+ from("imap://jones@localhost?password=secret©To=backup&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
index dfc089f..0088d47 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
@@ -44,25 +44,25 @@ public class MailDefaultDelayForMailConsumeTest extends CamelTestSupport {
mock.reset();
mock.expectedBodiesReceived("Hello Paris");
- mock.setResultWaitTime(5000L + 2000L);
+ mock.setResultWaitTime(1000L + 2000L);
StopWatch watch = new StopWatch();
template.sendBody("smtp://bond@localhost", "Hello Paris");
- // poll next mail and that is should be done within the default delay (overrule to 5 sec) + 2 sec slack
+ // poll next mail and that is should be done within the default delay (overrule to 1 sec) + 2 sec slack
mock.assertIsSatisfied();
long delta = watch.stop();
- assertTrue("Camel should not default poll the mailbox to often", delta > 5000 - 1000L);
+ assertTrue("Camel should not default poll the mailbox to often", delta > 1000 - 1000L);
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- // we overrule the default of 60 sec to 5 so the unit test is faster
- from("pop3://bond@localhost?delay=5000").to("mock:result");
+ // we overrule the default of 60 sec to 1 so the unit test is faster
+ from("pop3://bond@localhost?delay=1000").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
index 6b8997d..11d6e4a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
@@ -38,10 +38,10 @@ public class MailDisconnectTest extends CamelTestSupport {
Thread.sleep(500);
template.sendBodyAndHeader("smtp://jones@localhost", "C Bla bla", "Subject", "Hello C");
- Thread.sleep(1500);
+ Thread.sleep(500);
template.sendBodyAndHeader("smtp://jones@localhost", "D Bla bla", "Subject", "Hello D");
- Thread.sleep(1500);
+ Thread.sleep(500);
template.sendBodyAndHeader("smtp://jones@localhost", "E Bla bla", "Subject", "Hello E");
assertMockEndpointsSatisfied();
@@ -50,7 +50,7 @@ public class MailDisconnectTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&disconnect=true&delay=1000").to("mock:result");
+ from("pop3://jones@localhost?password=secret&disconnect=true&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
index 17c4171..e5981d1 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
@@ -84,7 +84,7 @@ public class MailDoNotDeleteIfProcessFailsTest extends CamelTestSupport {
// no redelivery for unit test as we want it to be polled next time
onException(IllegalArgumentException.class).to("mock:error");
- from("imap://localhost?username=claus&password=secret&unseen=true&delay=250")
+ from("imap://localhost?username=claus&password=secret&unseen=true&consumer.initialDelay=100&consumer.delay=100")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
counter++;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
index 35b5faf..3c9c459 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
@@ -57,8 +57,8 @@ public class MailFetchSizeTest extends CamelTestSupport {
mock.reset();
mock.expectedMessageCount(2);
mock.expectedBodiesReceived("Message 2", "Message 3");
- // should be done within 5 (delay) + 1 seconds (polling)
- mock.setResultWaitTime(7000L);
+ // should be done within 2 (delay) + 1 seconds (polling)
+ mock.setResultWaitTime(3000L);
mock.assertIsSatisfied();
Thread.sleep(500);
@@ -95,7 +95,7 @@ public class MailFetchSizeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&fetchSize=2&consumer.delay=5000"
+ from("pop3://jones@localhost?password=secret&fetchSize=2&consumer.delay=2000"
+ "&delete=true").to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
index 99f7ba9..d99d75d 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
@@ -77,7 +77,7 @@ public class MailFetchSizeZeroTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&fetchSize=0&consumer.delay=1000").to("mock:result");
+ from("pop3://bill@localhost?password=secret&fetchSize=0&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
index f9df11d..e8d7bfa 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
@@ -54,7 +54,7 @@ public class MailHeaderOverrulePreConfigurationRecipientsTest extends CamelTestS
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://claus@localhost?to=someone@outhere.com&cc=none@world.com&consumer.delay=1000").to("mock:result");
+ from("pop3://claus@localhost?to=someone@outhere.com&cc=none@world.com&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
index 5a14301..10f83e3 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
@@ -62,7 +62,7 @@ public class MailHtmlAttachmentTest extends CamelTestSupport {
// END SNIPPET: e1
// need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(2000);
+ Thread.sleep(500);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -97,7 +97,7 @@ public class MailHtmlAttachmentTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://james@mymailserver.com?password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
index 2c29626..f95e763 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
@@ -50,7 +50,7 @@ public class MailIdempotentRepositoryDuplicateNotRemoveTest extends MailIdempote
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&idempotentRepositoryRemoveOnCommit=false").routeId("foo").noAutoStartup()
+ from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&idempotentRepositoryRemoveOnCommit=false&consumer.initialDelay=100&consumer.delay=100").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
index 54a52e2..2f16bdd 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
@@ -97,7 +97,7 @@ public class MailIdempotentRepositoryDuplicateTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo").routeId("foo").noAutoStartup()
+ from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&consumer.initialDelay=100&consumer.delay=100").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
index e481426..61845b0 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
@@ -92,7 +92,7 @@ public class MailIdempotentRepositoryTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo").routeId("foo").noAutoStartup()
+ from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&consumer.initialDelay=100&consumer.delay=100").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
index 012ce85..0b5661b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
@@ -84,7 +84,7 @@ public class MailMaxMessagesPerPollTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.delay=3000&maxMessagesPerPoll=3"
+ from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&maxMessagesPerPoll=3"
+ "&delete=true").to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
index c5073b3..426d537 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
@@ -97,10 +97,10 @@ public class MailMimeDecodeHeadersTest extends CamelTestSupport {
.setHeader("subject", constant(nonAsciiSubject))
.to("smtp://plain@localhost", "smtp://decoded@localhost");
- from("pop3://localhost?username=plain&password=secret&consumer.delay=1000")
+ from("pop3://localhost?username=plain&password=secret&consumer.initialDelay=100&consumer.delay=100")
.to("mock:plain");
- from("pop3://localhost?username=decoded&password=secret&consumer.delay=1000&mimeDecodeHeaders=true")
+ from("pop3://localhost?username=decoded&password=secret&consumer.initialDelay=100&consumer.delay=100&mimeDecodeHeaders=true")
.to("mock:decoded");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
index 56a8410..cf96989 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
@@ -77,13 +77,13 @@ public class MailMultipleRecipientsTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://claus@localhost?consumer.delay=1000").to("mock:claus");
+ from("pop3://claus@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:claus");
- from("pop3://willem@localhost?consumer.delay=1000").to("mock:willem");
+ from("pop3://willem@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:willem");
- from("pop3://hadrian@localhost?consumer.delay=1000").to("mock:hadrian");
+ from("pop3://hadrian@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:hadrian");
- from("pop3://tracy@localhost?consumer.delay=1000").to("mock:tracy");
+ from("pop3://tracy@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:tracy");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
index 48f91b7..8c3fbf4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
@@ -55,9 +55,9 @@ public class MailNameAndEmailInRecipientTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://davsclaus@localhost?consumer.delay=1000").to("mock:davsclaus");
+ from("pop3://davsclaus@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:davsclaus");
- from("pop3://jstrachan@localhost?consumer.delay=1000").to("mock:jstrachan");
+ from("pop3://jstrachan@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:jstrachan");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
index d1d5cce..ee22839 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
@@ -71,7 +71,7 @@ public class MailPollEnrichNoMailTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .pollEnrich("pop3://bill@localhost?password=secret&delay=1000", 0)
+ .pollEnrich("pop3://bill@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100", 0)
.to("log:mail", "mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
index c84acef..1c1e364 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
@@ -89,7 +89,7 @@ public class MailPollEnrichTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .pollEnrich("pop3://bill@localhost?password=secret", 5000)
+ .pollEnrich("pop3://bill@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100", 5000)
.to("log:mail", "mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
index f7c67c5..0f95b83 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
@@ -100,7 +100,7 @@ public class MailPostProcessActionTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&postProcessAction=#postProcessAction").to("mock:result");
+ from("pop3://bill@localhost?password=secret&postProcessAction=#postProcessAction&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
index c73fb8f..1426c94 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
@@ -87,7 +87,7 @@ public class MailProcessOnlyUnseenMessagesTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:a").to("smtp://claus@localhost");
- from("imap://localhost?username=claus&password=secret&unseen=true&consumer.delay=1000").to("mock:result");
+ from("imap://localhost?username=claus&password=secret&unseen=true&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
index 0b5b878..2f1491a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
@@ -44,7 +44,7 @@ public class MailProducerUnsupportedCharsetTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&delay=1000&ignoreUnsupportedCharset=true").to("mock:result");
+ from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&ignoreUnsupportedCharset=true").to("mock:result");
}
});
context.start();
@@ -73,7 +73,7 @@ public class MailProducerUnsupportedCharsetTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&delay=1000&ignoreUnsupportedCharset=false").to("mock:result");
+ from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&ignoreUnsupportedCharset=false").to("mock:result");
}
});
context.start();
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
index 6d861fc..dcab796 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
@@ -82,7 +82,7 @@ public class MailReplyToTest extends CamelTestSupport {
from("direct:b")
.to("smtp://christian@localhost?subject=Camel&replyTo=noReply1@localhost,noReply2@localhost");
- from("pop3://localhost?username=christian&password=secret&consumer.delay=1000")
+ from("pop3://localhost?username=christian&password=secret&consumer.initialDelay=100&consumer.delay=100")
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
index 422d14e..69ad5c8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
@@ -52,10 +52,6 @@ public class MailRouteTest extends CamelTestSupport {
// lets test the first sent worked
assertMailboxReceivedMessages("route-test-james@localhost");
- // lets sleep to check that the mail poll does not redeliver duplicate
- // mails
- Thread.sleep(3000);
-
// lets test the receive worked
resultEndpoint.assertIsSatisfied();
@@ -117,7 +113,7 @@ public class MailRouteTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://route-test-james@localhost?consumer.delay=1000").to("direct:a");
+ from("pop3://route-test-james@localhost?consumer.initialDelay=100&consumer.delay=100").to("direct:a");
// must use fixed to option to send the mail to the given
// reciever, as we have polled
@@ -130,7 +126,7 @@ public class MailRouteTest extends CamelTestSupport {
.setHeader("to", constant("route-test-result@localhost; route-test-copy@localhost"))
.to("smtp://localhost");
- from("pop3://route-test-result@localhost?consumer.delay=1000").convertBodyTo(String.class)
+ from("pop3://route-test-result@localhost?consumer.initialDelay=100&consumer.delay=100").convertBodyTo(String.class)
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
index a54a975..4a9e031 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
@@ -121,7 +121,7 @@ public class MailSearchTermTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&searchTerm=#myTerm").to("mock:result");
+ from("pop3://bill@localhost?password=secret&searchTerm=#myTerm&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
index 3a5463c..05e79d5 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
@@ -116,7 +116,7 @@ public class MailSearchTermUriConfigLast24HoursTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&searchTerm.fromSentDate=now-24h").to("mock:result");
+ from("pop3://bill@localhost?password=secret&searchTerm.fromSentDate=now-24h&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
index 4306ef1..558d130 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
@@ -102,7 +102,7 @@ public class MailSearchTermUriConfigTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&searchTerm.subjectOrBody=Camel").to("mock:result");
+ from("pop3://bill@localhost?password=secret&searchTerm.subjectOrBody=Camel&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
index c8abb30..734b5fd 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
@@ -52,7 +52,7 @@ public class MailShutdownCompleteAllTasksTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&initialDelay=2s").routeId("route1")
+ from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100").routeId("route1")
// let it complete all tasks during shutdown
.shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks)
.delay(500).to("mock:bar");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
index 506d475..e9ba711 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
@@ -81,7 +81,7 @@ public class MailShutdownCompleteCurrentTaskOnlyTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret").routeId("route1")
+ from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100").routeId("route1")
// let it complete only current task so we shutdown faster
.shutdownRunningTask(ShutdownRunningTask.CompleteCurrentTaskOnly)
.delay(1000).to("seda:foo");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
index 26ea02f..559c752 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
@@ -106,7 +106,7 @@ public class MailSortTermTest extends CamelTestSupport {
public void configure() throws Exception {
context.setAutoStartup(false);
- from("pop3://bill@localhost?password=secret&searchTerm=#searchTerm&sortTerm=#sortAscendingDate").to("mock:resultAscending");
+ from("pop3://bill@localhost?password=secret&searchTerm=#searchTerm&sortTerm=#sortAscendingDate&consumer.initialDelay=100&consumer.delay=100").to("mock:resultAscending");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
index 730ee0b..6e3eb41 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
@@ -104,7 +104,7 @@ public class MailSortTermThreeTest extends CamelTestSupport {
public void configure() throws Exception {
context.setAutoStartup(false);
- from("imap://bill@localhost?password=secret&sortTerm=#sortDescendingDate").to("mock:resultDescendingImap");
+ from("imap://bill@localhost?password=secret&sortTerm=#sortDescendingDate&consumer.initialDelay=100&consumer.delay=100").to("mock:resultDescendingImap");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
index ba6bbd5..3d1bb11 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
@@ -104,7 +104,7 @@ public class MailSortTermTwoTest extends CamelTestSupport {
public void configure() throws Exception {
context.setAutoStartup(false);
- from("pop3://bill@localhost?password=secret&sortTerm=#sortDescendingDate").to("mock:resultDescending");
+ from("pop3://bill@localhost?password=secret&sortTerm=#sortDescendingDate&consumer.initialDelay=100&consumer.delay=100").to("mock:resultDescending");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
index 2ba65be..9609280 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
@@ -66,8 +66,6 @@ public class MailSplitAttachmentsTest extends CamelTestSupport {
producer.start();
producer.process(exchange);
- Thread.sleep(2000);
-
mock.assertIsSatisfied();
Message first = mock.getReceivedExchanges().get(0).getIn();
@@ -98,8 +96,6 @@ public class MailSplitAttachmentsTest extends CamelTestSupport {
producer.start();
producer.process(exchange);
- Thread.sleep(2000);
-
mock.assertIsSatisfied();
Message first = mock.getReceivedExchanges().get(0).getIn();
@@ -128,7 +124,7 @@ public class MailSplitAttachmentsTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("pop3://james@mymailserver.com?password=secret&consumer.delay=1000")
+ from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100")
.to("log:email")
// use the SplitAttachmentsExpression which will split the message per attachment
.split(splitAttachmentsExpression)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
index 146b1f5..8b677c9 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
@@ -53,7 +53,7 @@ public class MailSubjectTest extends CamelTestSupport {
from("direct:a").setHeader("subject", constant(subject)).to("smtp://james2@localhost");
// END SNIPPET: e1
- from("pop3://localhost?username=james2&password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://localhost?username=james2&password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
index e5eda1b..44b1e37 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
@@ -45,7 +45,7 @@ public class MailUsernameWithAtSignTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:a").to("smtp://localhost?username=james@localhost");
- from("pop3://localhost?username=james&password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://localhost?username=james&password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
index a77aab2..87d0dca 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
@@ -84,7 +84,7 @@ public class MailUsingCustomSessionTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://james@localhost?session=#myCustomMailSession&consumer.delay=1000").to("mock:result");
+ from("pop3://james@localhost?session=#myCustomMailSession&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
index 066ad45..71a352a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
@@ -135,8 +135,8 @@ public class MimeMessageConsumeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://james3@localhost?consumer.delay=1000").removeHeader("to").to("smtp://james4@localhost");
- from("pop3://james4@localhost?consumer.delay=2000").convertBodyTo(String.class).to("mock:result");
+ from("pop3://james3@localhost?consumer.initialDelay=100&consumer.delay=100").removeHeader("to").to("smtp://james4@localhost");
+ from("pop3://james4@localhost?consumer.initialDelay=200&consumer.delay=100").convertBodyTo(String.class).to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
index f16cfef..92e38f0 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
@@ -60,9 +60,6 @@ public class MimeMultipartAlternativeTest extends CamelTestSupport {
}
private void verifyTheRecivedEmail(String expectString) throws Exception {
- // need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(1000);
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.assertIsSatisfied();
@@ -98,7 +95,7 @@ public class MimeMultipartAlternativeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://ryan@mymailserver.com?password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://ryan@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
index 14f5294..39b1228 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
@@ -83,7 +83,7 @@ public class MimeMultipartAlternativeWithContentTypeTest extends CamelTestSuppor
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://sachin@mymailserver.com?password=secret&consumer.delay=1000&contentType=text/html; charset=UTF-8").to("mock:result");
+ from("pop3://sachin@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100&contentType=text/html; charset=UTF-8").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
index 310b527..64e88f1 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
@@ -60,9 +60,6 @@ public class MimeMultipartAlternativeWithLongerFilenameTest extends CamelTestSup
}
private void verifyTheRecivedEmail(String expectString) throws Exception {
- // need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(1000);
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.assertIsSatisfied();
@@ -98,7 +95,7 @@ public class MimeMultipartAlternativeWithLongerFilenameTest extends CamelTestSup
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://ryan@mymailserver.com?password=secret&consumer.delay=1000").to("mock:result");
+ from("pop3://ryan@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
index d04794e..67f44d0 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
@@ -112,7 +112,7 @@ public class MultipleDestinationConsumeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://james@localhost?password=foo").to("mock:result");
+ from("pop3://james@localhost?password=foo&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
index 8f25c35..9d16e36 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
@@ -90,8 +90,8 @@ public class NestedMimeMessageConsumeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://james3@localhost?consumer.delay=1000").removeHeader("to").to("smtp://james4@localhost");
- from("pop3://james4@localhost?consumer.delay=2000").convertBodyTo(String.class).to("mock:result");
+ from("pop3://james3@localhost?consumer.initialDelay=100&consumer.delay=100").removeHeader("to").to("smtp://james4@localhost");
+ from("pop3://james4@localhost?consumer.initialDelay=200&consumer.delay=100").convertBodyTo(String.class).to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index 619506c..f3cd445 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -154,16 +154,16 @@ public class RawMailMessageTest extends CamelTestSupport {
public void configure() throws Exception {
from("pop3://davsclaus@apache.org").to("mock:mail");
- from("pop3://jonesRawPop3@localhost?password=secret&consumer.delay=2000&delete=true&mapMailMessage=false")
+ from("pop3://jonesRawPop3@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&delete=true&mapMailMessage=false")
.to("mock://rawMessagePop3");
- from("imap://jonesRawImap@localhost?password=secret&consumer.delay=2000&delete=true&mapMailMessage=false")
+ from("imap://jonesRawImap@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&delete=true&mapMailMessage=false")
.to("mock://rawMessageImap");
- from("pop3://jonesPop3@localhost?password=secret&consumer.delay=2000&delete=true")
+ from("pop3://jonesPop3@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&delete=true")
.to("mock://normalMessagePop3");
- from("imap://jonesImap@localhost?password=secret&consumer.delay=2000&delete=true")
+ from("imap://jonesImap@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&delete=true")
.to("mock://normalMessageImap");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
index e394bff..e68630f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
@@ -50,7 +50,7 @@ public class SslContextParametersMailRouteTest extends CamelTestSupport {
public void configure() {
from("imaps://" + imapHost + "?username=" + username + "&password=" + password
- + "&delete=false&unseen=true&fetchSize=1&consumer.useFixedDelay=true&consumer.delay=1000")
+ + "&delete=false&unseen=true&fetchSize=1&consumer.useFixedDelay=true&consumer.initialDelay=100&consumer.delay=100")
.to("mock:in");
from("direct:in")
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].