[james-project] 18/27: JAMES-2979 move MailsShouldBeWellReceived test to guice-common

[btellier]

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit eef3d71f5ca3c1107dc2432aed967993f634ef78
Author: Rémi KOWALSKI <rkowal...@linagora.com>
AuthorDate: Wed Nov 20 15:36:19 2019 +0100

    JAMES-2979 move MailsShouldBeWellReceived test to guice-common
---
 server/container/guice/guice-common/pom.xml                   | 11 +++++++++++
 .../test/java/org/apache/james/MailsShouldBeWellReceived.java |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/container/guice/guice-common/pom.xml 
b/server/container/guice/guice-common/pom.xml
index b09cc05..0ca1dbd 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -110,6 +110,17 @@
         </dependency>
         <dependency>
             <groupId>${james.groupId}</groupId>
+            <artifactId>james-server-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${james.groupId}</groupId>
+            <artifactId>james-server-util</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${james.groupId}</groupId>
             <artifactId>metrics-api</artifactId>
         </dependency>
         <dependency>
diff --git 
a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
 
b/server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
similarity index 93%
rename from 
server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
rename to 
server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
index 9c8adbf..99822cc 100644
--- 
a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
+++ 
b/server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java
@@ -19,8 +19,6 @@
 
 package org.apache.james;
 
-import static org.awaitility.Duration.ONE_HUNDRED_MILLISECONDS;
-
 import org.apache.james.core.Domain;
 import org.apache.james.modules.protocols.ImapGuiceProbe;
 import org.apache.james.modules.protocols.SmtpGuiceProbe;
@@ -29,6 +27,7 @@ import org.apache.james.utils.IMAPMessageReader;
 import org.apache.james.utils.SMTPMessageSender;
 import org.apache.james.utils.SpoolerProbe;
 import org.awaitility.Awaitility;
+import org.awaitility.Duration;
 import org.awaitility.core.ConditionFactory;
 import org.junit.jupiter.api.Test;
 
@@ -39,8 +38,8 @@ interface MailsShouldBeWellReceived {
     String JAMES_USER = "james-user@" + DOMAIN;
     String PASSWORD = "secret";
     ConditionFactory CALMLY_AWAIT = Awaitility
-        .with().pollInterval(ONE_HUNDRED_MILLISECONDS)
-        .and().pollDelay(ONE_HUNDRED_MILLISECONDS)
+        .with().pollInterval(Duration.ONE_HUNDRED_MILLISECONDS)
+        .and().pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
         .await();
 
     @Test
@@ -63,4 +62,5 @@ interface MailsShouldBeWellReceived {
                 .awaitMessage(CALMLY_AWAIT);
         }
     }
+
 }


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