From fb6e2f0cc7084571127b543750809fe562425e05 Mon Sep 17 00:00:00 2001 From: benwa Date: Tue, 19 Dec 2017 14:14:10 +0700 Subject: [PATCH] JAMES-2267 Factorize ConditionFactory (awaitability) for mailet integration tests --- .../mailets/AddDeliveredToHeaderTest.java | 12 ++----- .../james/mailets/BounceIntegrationTest.java | 18 ++-------- .../CommonMailetConfigurationTest.java | 7 ++-- .../GatewayRemoteDeliveryIntegrationTest.java | 12 +------ .../NetworkMatcherIntegrationTest.java | 16 +-------- .../RecipientRewriteTableIntegrationTest.java | 7 ++-- .../apache/james/mailets/SieveDelivery.java | 7 ++-- .../mailets/SmtpAuthIntegrationTest.java | 12 +------ .../mailets/configuration/AwaitUtils.java | 34 +++++++++++++++++++ .../crypto/SMIMEDecryptIntegrationTest.java | 6 +--- .../crypto/SMIMESignIntegrationTest.java | 6 +--- .../smtp/SmtpAuthorizedAddressesTest.java | 11 +----- .../smtp/SmtpBracketEnforcementTest.java | 17 ++-------- .../smtp/SmtpIdentityVerificationTest.java | 17 ++-------- .../james/smtp/SmtpSizeLimitationTest.java | 17 ++-------- .../mailets/AmqpForwardAttachmentTest.java | 11 +----- .../mailets/ContactExtractorTest.java | 5 ++- .../transport/mailets/GroupMappingTest.java | 7 +--- .../mailets/ICSAttachmentWorkflowTest.java | 6 +--- .../mailets/StripAttachmentTest.java | 6 +--- 20 files changed, 62 insertions(+), 172 deletions(-) create mode 100644 server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java index e2810649d07..0de42e5a011 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java @@ -19,6 +19,8 @@ package org.apache.james.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; + import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; @@ -32,9 +34,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class AddDeliveredToHeaderTest { @@ -48,18 +48,10 @@ public class AddDeliveredToHeaderTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; @Before public void setup() throws Exception { jamesServer = TemporaryJamesServer.builder().build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); } @After diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java index 41c642a9c2d..862f51c7b4b 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; + import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailets.configuration.CommonProcessors; @@ -41,14 +43,11 @@ import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; import org.junit.After; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class BounceIntegrationTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -65,21 +64,8 @@ public class BounceIntegrationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; private DataProbe dataProbe; - - @Before - public void setup() throws Exception { - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); - } - @After public void tearDown() { jamesServer.shutdown(); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java index 89409a2518d..5e121f21087 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java @@ -19,6 +19,8 @@ package org.apache.james.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; + import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; @@ -31,9 +33,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class CommonMailetConfigurationTest { @@ -47,13 +47,10 @@ public class CommonMailetConfigurationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; @Before public void setup() throws Exception { jamesServer = TemporaryJamesServer.builder().build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); } @After diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java index e4fa011481d..9756adca39f 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java @@ -24,6 +24,7 @@ import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.MemoryJamesServerMain.SMTP_AND_IMAP_MODULE; import static org.apache.james.MemoryJamesServerMain.SMTP_ONLY_MODULE; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -58,9 +59,7 @@ import org.junit.rules.TemporaryFolder; import org.testcontainers.containers.wait.HostPortWaitStrategy; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; @@ -90,19 +89,10 @@ public class GatewayRemoteDeliveryIntegrationTest { public final RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; private DataProbe dataProbe; @Before public void setup() throws Exception { - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); RestAssured.requestSpecification = new RequestSpecBuilder() diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java index 9d9b0ce5667..311da8eddf6 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.james.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.MemoryJamesServerMain; @@ -38,14 +39,11 @@ import org.apache.james.utils.MailRepositoryProbeImpl; import org.apache.james.utils.SMTPMessageSender; import org.junit.After; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class NetworkMatcherIntegrationTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -61,18 +59,6 @@ public class NetworkMatcherIntegrationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; - - @Before - public void setup() throws Exception { - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); - } private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception { TemporaryJamesServer temporaryJamesServer = TemporaryJamesServer.builder() diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java index d5eef8503f4..ca902332a32 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; + import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; @@ -31,9 +33,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class RecipientRewriteTableIntegrationTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -56,15 +56,12 @@ public class RecipientRewriteTableIntegrationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; private DataProbe dataProbe; @Before public void setup() throws Exception { jamesServer = TemporaryJamesServer.builder().build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(JAMES_APACHE_ORG); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java index 07dbae48ff6..c67bb9b7745 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java @@ -19,6 +19,8 @@ package org.apache.james.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; + import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; @@ -33,9 +35,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class SieveDelivery { @@ -49,13 +49,10 @@ public class SieveDelivery { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; @Before public void setup() throws Exception { jamesServer = TemporaryJamesServer.builder().build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); } @After diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java index 5b9b612432b..8b5ecac6190 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.james.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.MemoryJamesServerMain; @@ -42,9 +43,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class SmtpAuthIntegrationTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -61,7 +60,6 @@ public class SmtpAuthIntegrationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; @Before public void setup() throws Exception { @@ -91,14 +89,6 @@ public void setup() throws Exception { DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(JAMES_APACHE_ORG); dataProbe.addUser(FROM, PASSWORD); - - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); } private ProcessorConfiguration deliverOnlyTransport() { diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java new file mode 100644 index 00000000000..6ecbaa8240d --- /dev/null +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java @@ -0,0 +1,34 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.mailets.configuration; + +import com.jayway.awaitility.Awaitility; +import com.jayway.awaitility.Duration; +import com.jayway.awaitility.core.ConditionFactory; + +public class AwaitUtils { + public static Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; + public static ConditionFactory calmlyAwait = Awaitility.with() + .pollInterval(slowPacedPollInterval) + .and() + .with() + .pollDelay(slowPacedPollInterval) + .await(); +} diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java index ef7cd831ba4..a7f42c3f856 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.james.mailets.crypto; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -47,9 +48,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class SMIMEDecryptIntegrationTest { private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z"); @@ -65,7 +64,6 @@ public class SMIMEDecryptIntegrationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; @Before public void setup() throws Exception { @@ -92,8 +90,6 @@ public void setup() throws Exception { .withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015)) .withMailetContainer(mailetContainer) .build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); DataProbeImpl serverProbe = jamesServer.getProbe(DataProbeImpl.class); serverProbe.addDomain(DEFAULT_DOMAIN); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java index 391dfe03267..4c8dc829f5b 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.james.mailets.crypto; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -48,9 +49,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class SMIMESignIntegrationTest { @@ -66,7 +65,6 @@ public class SMIMESignIntegrationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; public static final String FROM = "user@" + DEFAULT_DOMAIN; public static final String RECIPIENT = "user2@" + DEFAULT_DOMAIN; @@ -106,8 +104,6 @@ public void setup() throws Exception { .withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015)) .withMailetContainer(mailetContainer) .build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(DEFAULT_DOMAIN); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java index 716df0f949e..3f95345aead 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java @@ -22,6 +22,7 @@ import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.config.EncoderConfig.encoderConfig; import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -53,9 +54,7 @@ import org.junit.rules.TemporaryFolder; import org.testcontainers.containers.wait.HostPortWaitStrategy; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; @@ -83,17 +82,9 @@ public class SmtpAuthorizedAddressesTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; @Before public void setup() throws Exception { - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); RestAssured.requestSpecification = new RequestSpecBuilder() diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java index 5f525adb445..70364d9e765 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java @@ -19,6 +19,8 @@ package org.apache.james.smtp; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; + import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.CommonProcessors; @@ -34,14 +36,11 @@ import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; import org.junit.After; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class SmtpBracketEnforcementTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -55,18 +54,6 @@ public class SmtpBracketEnforcementTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; - - @Before - public void setup() throws Exception { - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); - } private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception { MailetContainer mailetContainer = MailetContainer.builder() diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java index ec423246ca1..a36062520aa 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java @@ -19,6 +19,8 @@ package org.apache.james.smtp; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; + import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.CommonProcessors; @@ -34,14 +36,11 @@ import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; import org.junit.After; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class SmtpIdentityVerificationTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -57,18 +56,6 @@ public class SmtpIdentityVerificationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; - - @Before - public void setup() throws Exception { - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); - } private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception { MailetContainer mailetContainer = MailetContainer.builder() diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java index cfc5aa869b6..40e5873670a 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java @@ -19,6 +19,8 @@ package org.apache.james.smtp; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; + import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.CommonProcessors; @@ -34,15 +36,12 @@ import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; import org.junit.After; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import com.google.common.base.Strings; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class SmtpSizeLimitationTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -56,18 +55,6 @@ public class SmtpSizeLimitationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; - - @Before - public void setup() throws Exception { - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); - } private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception { MailetContainer mailetContainer = MailetContainer.builder() diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java index 8b32a5025a9..5b4f4516ecc 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java @@ -19,6 +19,7 @@ package org.apache.james.transport.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -51,9 +52,7 @@ import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class AmqpForwardAttachmentTest { @@ -83,7 +82,6 @@ public class AmqpForwardAttachmentTest { public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; @Before public void setup() throws Exception { @@ -117,13 +115,6 @@ public void setup() throws Exception { .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE) .withMailetContainer(mailetContainer) .build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with() - .pollInterval(slowPacedPollInterval) - .and() - .with() - .pollDelay(slowPacedPollInterval) - .await(); DataProbe dataprobe = jamesServer.getProbe(DataProbeImpl.class); dataprobe.addDomain(JAMES_APACHE_ORG); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java index 380b64c74bc..94652f15373 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java @@ -19,6 +19,7 @@ package org.apache.james.transport.mailets; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; @@ -48,7 +49,6 @@ import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; public class ContactExtractorTest { @@ -136,8 +136,7 @@ public void recipientsShouldBePublishedToAmqpWhenSendingEmail() throws Exception IMAPMessageReader imap = new IMAPMessageReader("localhost", 1143)) { messageSender.sendMessage(mail); - Awaitility.await().pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS) - .atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(Duration.ONE_MINUTE) .until(() -> imap.userReceivedMessage(TO, PASSWORD)); Optional actual = amqpRule.readContent(); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java index 54bf94f052e..ca7d04abb98 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java @@ -20,6 +20,7 @@ package org.apache.james.transport.mailets; import static com.jayway.restassured.RestAssured.with; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -60,9 +61,7 @@ import org.junit.rules.TemporaryFolder; import org.testcontainers.containers.wait.HostPortWaitStrategy; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; import com.jayway.restassured.RestAssured; import com.jayway.restassured.specification.RequestSpecification; @@ -84,7 +83,6 @@ public class GroupMappingTest { private static final String MESSAGE_CONTENT = "any text"; private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; private MimeMessage message; private DataProbe dataProbe; private RequestSpecification restApiRequest; @@ -145,9 +143,6 @@ public void setup() throws Exception { .withMailetContainer(mailetContainer) .build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); dataProbe = jamesServer.getProbe(DataProbeImpl.class); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java index cdce474b0e8..bdc0897a236 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java @@ -19,6 +19,7 @@ package org.apache.james.transport.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -56,9 +57,7 @@ import org.junit.rules.TemporaryFolder; import com.google.common.collect.ImmutableList; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; @@ -443,7 +442,6 @@ public class ICSAttachmentWorkflowTest { @Rule public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule); - private ConditionFactory calmlyAwait; private TemporaryJamesServer jamesServer; private MimeMessage messageWithoutICSAttached; private MimeMessage messageWithICSAttached; @@ -501,8 +499,6 @@ public void setup() throws Exception { .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE) .withMailetContainer(mailetContainer) .build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(JAMES_APACHE_ORG); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java index a26aa5a1e86..b741b1f6579 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java @@ -19,6 +19,7 @@ package org.apache.james.transport.mailets; +import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import javax.mail.internet.MimeMessage; @@ -47,9 +48,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class StripAttachmentTest { @@ -67,7 +66,6 @@ public class StripAttachmentTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private TemporaryJamesServer jamesServer; - private ConditionFactory calmlyAwait; @Before public void setup() throws Exception { @@ -98,8 +96,6 @@ public void setup() throws Exception { .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE) .withMailetContainer(mailetContainer) .build(temporaryFolder); - Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; - calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await(); DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(JAMES_APACHE_ORG);