You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/01/05 02:56:40 UTC
[21/44] james-project git commit: JAMES-2267 Factorize
ConditionFactory (awaitability) for mailet integration tests
JAMES-2267 Factorize ConditionFactory (awaitability) for mailet integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fb6e2f0c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fb6e2f0c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fb6e2f0c
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: fb6e2f0cc7084571127b543750809fe562425e05
Parents: bb56d23
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 14:14:10 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../james/mailets/AddDeliveredToHeaderTest.java | 12 ++-----
.../james/mailets/BounceIntegrationTest.java | 18 ++---------
.../mailets/CommonMailetConfigurationTest.java | 7 ++--
.../GatewayRemoteDeliveryIntegrationTest.java | 12 +------
.../mailets/NetworkMatcherIntegrationTest.java | 16 +--------
.../RecipientRewriteTableIntegrationTest.java | 7 ++--
.../org/apache/james/mailets/SieveDelivery.java | 7 ++--
.../james/mailets/SmtpAuthIntegrationTest.java | 12 +------
.../james/mailets/configuration/AwaitUtils.java | 34 ++++++++++++++++++++
.../crypto/SMIMEDecryptIntegrationTest.java | 6 +---
.../crypto/SMIMESignIntegrationTest.java | 6 +---
.../james/smtp/SmtpAuthorizedAddressesTest.java | 11 +------
.../james/smtp/SmtpBracketEnforcementTest.java | 17 ++--------
.../smtp/SmtpIdentityVerificationTest.java | 17 ++--------
.../james/smtp/SmtpSizeLimitationTest.java | 17 ++--------
.../mailets/AmqpForwardAttachmentTest.java | 11 +------
.../transport/mailets/ContactExtractorTest.java | 5 ++-
.../transport/mailets/GroupMappingTest.java | 7 +---
.../mailets/ICSAttachmentWorkflowTest.java | 6 +---
.../transport/mailets/StripAttachmentTest.java | 6 +---
20 files changed, 62 insertions(+), 172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.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 e281064..0de42e5 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.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 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
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
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 41c642a..862f51c 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.DataProbeImpl;
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();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
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 89409a2..5e121f2 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.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 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
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
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 e4fa011..9756adc 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.EncoderConfig.encoderConfig;
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.RuleChain;
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()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
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 9d9b0ce..311da8e 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.IMAPMessageReader;
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()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
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 d5eef85..ca90233 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.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 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);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
----------------------------------------------------------------------
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 07dbae4..c67bb9b 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.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 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
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
----------------------------------------------------------------------
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 5b9b612..8b5ecac 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.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 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 class SmtpAuthIntegrationTest {
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() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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/configuration/AwaitUtils.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java
new file mode 100644
index 0000000..6ecbaa8
--- /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();
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
----------------------------------------------------------------------
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 ef7cd83..a7f42c3 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.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 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 class SMIMEDecryptIntegrationTest {
.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);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
----------------------------------------------------------------------
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 391dfe0..4c8dc82 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.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 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 class SMIMESignIntegrationTest {
.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);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
----------------------------------------------------------------------
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 716df0f..3f95345 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 @@ package org.apache.james.smtp;
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.RuleChain;
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()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
----------------------------------------------------------------------
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 5f525ad..70364d9 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.transport.matchers.RecipientIsLocal;
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()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
----------------------------------------------------------------------
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 ec42324..a360625 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.transport.matchers.RecipientIsLocal;
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()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
----------------------------------------------------------------------
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 cfc5aa8..40e5873 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.transport.matchers.RecipientIsLocal;
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()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
----------------------------------------------------------------------
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 8b32a50..5b4f451 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.Test;
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 class AmqpForwardAttachmentTest {
.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);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
----------------------------------------------------------------------
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 380b64c..94652f1 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.Test;
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 class ContactExtractorTest {
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<String> actual = amqpRule.readContent();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
----------------------------------------------------------------------
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 54bf94f..ca7d04a 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.Test;
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 class GroupMappingTest {
.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);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
----------------------------------------------------------------------
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 cdce474..bdc0897 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.RuleChain;
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 class ICSAttachmentWorkflowTest {
.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);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
----------------------------------------------------------------------
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 a26aa5a..b741b1f 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.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 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 class StripAttachmentTest {
.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);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org