james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [2/4] james-project git commit: pollDelay becomes useless with untilAsserted
Date Mon, 01 Oct 2018 02:05:29 GMT
pollDelay becomes useless with untilAsserted


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ffa94df9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ffa94df9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ffa94df9

Branch: refs/heads/master
Commit: ffa94df92d1bf0de9c06e282ed857b1d276b882c
Parents: 843a4c2
Author: Matthieu Baechler <matthieu@apache.org>
Authored: Fri Sep 28 16:03:43 2018 +0200
Committer: Matthieu Baechler <matthieu@apache.org>
Committed: Fri Sep 28 16:03:43 2018 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java  | 3 ---
 .../mailets/DirectResolutionRemoteDeliveryIntegrationTest.java    | 2 --
 .../james/mailets/GatewayRemoteDeliveryIntegrationTest.java       | 3 ---
 .../java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java   | 2 --
 .../org/apache/james/transport/mailets/GroupMappingRelayTest.java | 1 -
 5 files changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
index 430f3f8..19f934c 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
@@ -43,9 +43,6 @@ public abstract class ForwardSmtpTest {
     public static final Duration slowPacedPollInterval = ONE_HUNDRED_MILLISECONDS;
     public static final ConditionFactory calmlyAwait = Awaitility.with()
         .pollInterval(slowPacedPollInterval)
-        .and()
-        .with()
-        .pollDelay(slowPacedPollInterval)
         .await();
 
     @ClassRule

http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
index ef36921..9ca5da5 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
@@ -119,7 +119,6 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
             .sendMessage(FROM, RECIPIENT);
 
         awaitAtMostOneMinute
-            .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
             .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
     }
 
@@ -148,7 +147,6 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
             .sendMessage(FROM, RECIPIENT);
 
         awaitAtMostOneMinute
-            .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
             .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/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 8aa6230..49cd2cc 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
@@ -107,7 +107,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
             .sendMessage(FROM, RECIPIENT);
 
         awaitAtMostOneMinute
-            .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
             .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
     }
 
@@ -147,7 +146,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
             .sendMessage(FROM, RECIPIENT);
 
         awaitAtMostOneMinute
-            .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
             .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
     }
 
@@ -168,7 +166,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
             .sendMessage(FROM, RECIPIENT);
 
         awaitAtMostOneMinute
-            .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
             .untilAsserted(this::assertMessageReceivedByTheSmtpServer);
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/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 830e15c..bb3cf40 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
@@ -110,7 +110,6 @@ public class SmtpAuthorizedAddressesTest {
             .sendMessage(FROM, TO);
 
         awaitAtMostOneMinute
-            .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
             .untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
                 .body("", hasSize(1))
                 .body("[0].from", equalTo(FROM))
@@ -140,7 +139,6 @@ public class SmtpAuthorizedAddressesTest {
             .sendMessage(FROM, TO);
 
         awaitAtMostOneMinute
-            .pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
             .untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
                 .body("", hasSize(1))
                 .body("[0].from", equalTo(FROM))

http://git-wip-us.apache.org/repos/asf/james-project/blob/ffa94df9/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
index afac261..4f97b49 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
@@ -160,7 +160,6 @@ public class GroupMappingRelayTest {
                 .recipient(GROUP_ON_DOMAIN1));
 
         awaitAtMostOneMinute
-            .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
             .untilAsserted(() -> fakeSmtp.assertEmailReceived(response -> response
                 .body("[0].from", equalTo(SENDER))
                 .body("[0].to[0]", equalTo(externalMail))


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message