JAMES-1914 Factorize testing tools in a new project

apache · Feb 1, 2017 · 5ab896a · 5ab896a
1 parent 0f5c76f
commit 5ab896a
Show file tree

Hide file tree

Showing 16 changed files with 253 additions and 30 deletions.
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
@@ -192,6 +192,11 @@
                   <type>test-jar</type>
                   <scope>test</scope>
               </dependency>
+              <dependency>
+                  <groupId>org.apache.james</groupId>
+                  <artifactId>james-server-testing</artifactId>
+                  <scope>test</scope>
+              </dependency>
               <dependency>
                   <groupId>ch.qos.logback</groupId>
                   <artifactId>logback-classic</artifactId>

diff --git a/...gration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/...gration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -22,8 +22,8 @@
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailets.configuration.CommonProcessors;
 import org.apache.james.mailets.configuration.MailetContainer;
-import org.apache.james.mailets.utils.IMAPMessageReader;
 import org.apache.james.mailets.utils.SMTPMessageSender;
+import org.apache.james.utils.IMAPMessageReader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/...-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -22,9 +22,9 @@
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailets.configuration.CommonProcessors;
 import org.apache.james.mailets.configuration.MailetContainer;
-import org.apache.james.mailets.utils.IMAPMessageReader;
 import org.apache.james.mailets.utils.SMTPMessageSender;
 import org.apache.james.utils.GuiceServerProbe;
+import org.apache.james.utils.IMAPMessageReader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

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
@@ -22,8 +22,8 @@
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailets.configuration.CommonProcessors;
 import org.apache.james.mailets.configuration.MailetContainer;
-import org.apache.james.mailets.utils.IMAPMessageReader;
 import org.apache.james.mailets.utils.SMTPMessageSender;
+import org.apache.james.utils.IMAPMessageReader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...on-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java b/...on-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
@@ -30,9 +30,9 @@
 import org.apache.james.mailets.configuration.MailetConfiguration;
 import org.apache.james.mailets.configuration.MailetContainer;
 import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.mailets.utils.IMAPMessageReader;
 import org.apache.james.mailets.utils.SMTPMessageSender;
 import org.apache.james.util.date.ZonedDateTimeProvider;
+import org.apache.james.utils.IMAPMessageReader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...ation-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/...ation-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
@@ -29,9 +29,9 @@
 import org.apache.james.mailets.configuration.MailetConfiguration;
 import org.apache.james.mailets.configuration.MailetContainer;
 import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.mailets.utils.IMAPMessageReader;
 import org.apache.james.mailets.utils.SMTPMessageSender;
 import org.apache.james.util.date.ZonedDateTimeProvider;
+import org.apache.james.utils.IMAPMessageReader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...n-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/...n-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -29,10 +29,10 @@
 import org.apache.james.mailets.configuration.MailetConfiguration;
 import org.apache.james.mailets.configuration.MailetContainer;
 import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.mailets.utils.IMAPMessageReader;
 import org.apache.james.mailets.utils.SMTPMessageSender;
 import org.apache.james.transport.mailets.amqp.AmqpRule;
 import org.apache.james.util.streams.SwarmGenericContainer;
+import org.apache.james.utils.IMAPMessageReader;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.base.test.FakeMail;

diff --git a/...n-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/...n-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -31,10 +31,10 @@
 import org.apache.james.mailets.configuration.MailetConfiguration;
 import org.apache.james.mailets.configuration.MailetContainer;
 import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.mailets.utils.IMAPMessageReader;
 import org.apache.james.mailets.utils.SMTPMessageSender;
 import org.apache.james.transport.mailets.amqp.AmqpRule;
 import org.apache.james.util.streams.SwarmGenericContainer;
+import org.apache.james.utils.IMAPMessageReader;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.base.test.FakeMail;

diff --git a/...gration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/...gration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -29,8 +29,8 @@
 import org.apache.james.mailets.configuration.MailetConfiguration;
 import org.apache.james.mailets.configuration.MailetContainer;
 import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.mailets.utils.IMAPMessageReader;
 import org.apache.james.mailets.utils.SMTPMessageSender;
+import org.apache.james.utils.IMAPMessageReader;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.base.test.FakeMail;

diff --git a/server/pom.xml b/server/pom.xml
@@ -107,6 +107,8 @@
         <module>queue/queue-activemq</module>
         <module>protocols/webadmin</module>
         <module>protocols/webadmin-integration-test</module>
+
+        <module>testing</module>
     </modules>
 
     <distributionManagement>
@@ -329,6 +331,11 @@
                 <scope>test</scope>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>james-server-testing</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.james</groupId>
                 <artifactId>apache-james-backends-cassandra</artifactId>
@@ -637,12 +644,6 @@
                 <type>test-jar</type>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.james</groupId>
-                <artifactId>james-server-mailets-integration-testing</artifactId>
-                <version>${project.version}</version>
-                <type>test-jar</type>
-            </dependency>
             <dependency>
                 <groupId>org.apache.james</groupId>
                 <artifactId>james-server-webadmin</artifactId>
@@ -1064,7 +1065,6 @@
                 <groupId>commons-net</groupId>
                 <artifactId>commons-net</artifactId>
                 <version>${commons-net.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -185,9 +185,8 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>james-server-mailets-integration-testing</artifactId>
+                    <artifactId>james-server-testing</artifactId>
                     <scope>test</scope>
-                    <type>test-jar</type>
                 </dependency>
                 <dependency>
                     <groupId>com.jayway.restassured</groupId>

diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -163,13 +163,12 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>james-server-util-java8</artifactId>
+                    <artifactId>james-server-testing</artifactId>
                     <scope>test</scope>
-                    <type>test-jar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>james-server-mailets-integration-testing</artifactId>
+                    <artifactId>james-server-util-java8</artifactId>
                     <scope>test</scope>
                     <type>test-jar</type>
                 </dependency>
@@ -271,6 +270,11 @@
                     <scope>test</scope>
                     <type>test-jar</type>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.james</groupId>
+                    <artifactId>james-server-testing</artifactId>
+                    <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
                     <artifactId>james-server-util-java8</artifactId>

diff --git a/...common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java b/...common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
@@ -25,7 +25,7 @@
 
 import javax.inject.Inject;
 
-import org.apache.james.mailets.utils.IMAPMessageReader;
+import org.apache.james.utils.IMAPMessageReader;
 
 import com.google.common.collect.Maps;
 

diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -162,14 +162,13 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>james-server-memory-guice</artifactId>
+                    <artifactId>james-server-testing</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>james-server-mailets-integration-testing</artifactId>
+                    <artifactId>james-server-memory-guice</artifactId>
                     <scope>test</scope>
-                    <type>test-jar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>