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:33 UTC
[14/44] james-project git commit: JAMES-2267 Factorize mailet
integration common constants
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 7c2fd11..c4c5ae7 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
@@ -21,7 +21,12 @@ package org.apache.james.transport.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.with;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
+import static org.apache.james.mailets.configuration.Constants.IMAP_PORT;
+import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
+import static org.apache.james.mailets.configuration.Constants.PASSWORD;
+import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
+import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -66,11 +71,6 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.specification.RequestSpecification;
public class GroupMappingTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
private static final String DOMAIN1 = "domain1.com";
private static final String DOMAIN2 = "domain2.com";
@@ -98,6 +98,8 @@ public class GroupMappingTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private InetAddress containerIp;
@Before
@@ -183,17 +185,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@Test
@@ -206,16 +206,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@Test
@@ -230,20 +229,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -258,16 +256,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
- assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@Test
@@ -284,15 +281,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -305,15 +301,14 @@ public class GroupMappingTest {
.recipients(new MailAddress(GROUP_ON_DOMAIN1), new MailAddress(USER_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -330,20 +325,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN2))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -362,20 +356,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -390,15 +383,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -413,15 +405,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
}
@Test
@@ -436,15 +427,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -459,15 +449,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(groupWithSlash))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -483,15 +472,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(userWithSlash, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(userWithSlash, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -506,15 +494,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -528,28 +515,27 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- calmlyAwait.atMost(1, TimeUnit.MINUTES)
- .until(() -> {
- try {
- with()
- .baseUri("http://" + containerIp.getHostAddress())
- .port(80)
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("[0].from", equalTo(SENDER))
- .body("[0].to[0]", equalTo(externalMail))
- .body("[0].text", equalTo(MESSAGE_CONTENT));
-
- return true;
- } catch(AssertionError e) {
- return false;
- }
- });
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ calmlyAwait.atMost(1, TimeUnit.MINUTES)
+ .until(() -> {
+ try {
+ with()
+ .baseUri("http://" + containerIp.getHostAddress())
+ .port(80)
+ .get("/api/email")
+ .then()
+ .statusCode(200)
+ .body("[0].from", equalTo(SENDER))
+ .body("[0].to[0]", equalTo(externalMail))
+ .body("[0].text", equalTo(MESSAGE_CONTENT));
+
+ return true;
+ } catch(AssertionError e) {
+ return false;
+ }
+ });
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 799f210..fddaca5 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
@@ -20,7 +20,12 @@
package org.apache.james.transport.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
+import static org.apache.james.mailets.configuration.Constants.IMAP_PORT;
+import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
+import static org.apache.james.mailets.configuration.Constants.PASSWORD;
+import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
+import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -64,16 +69,8 @@ import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.Option;
public class ICSAttachmentWorkflowTest {
-
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
-
- private static final String FROM = "fromUser@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "touser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromUser@" + DEFAULT_DOMAIN;
+ private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
private static final String MAIL_ATTRIBUTE = "ical.attachments";
private static final String PARSED_ICAL_MAIL_ATTRIBUTE = "ical.parsed";
@@ -503,7 +500,7 @@ public class ICSAttachmentWorkflowTest {
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
@@ -574,7 +571,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -595,7 +592,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -632,7 +629,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -658,7 +655,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -683,7 +680,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -708,7 +705,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -738,7 +735,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -769,7 +766,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -794,7 +791,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -836,7 +833,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 07ebb67..7849834 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
@@ -20,7 +20,12 @@
package org.apache.james.transport.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
+import static org.apache.james.mailets.configuration.Constants.IMAP_PORT;
+import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
+import static org.apache.james.mailets.configuration.Constants.PASSWORD;
+import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
+import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.internet.MimeMessage;
@@ -50,16 +55,8 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class StripAttachmentTest {
-
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
-
- private static final String FROM = "fromUser@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "touser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromUser@" + DEFAULT_DOMAIN;
+ private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -99,7 +96,7 @@ public class StripAttachmentTest {
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
@@ -139,7 +136,7 @@ public class StripAttachmentTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org