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 ro...@apache.org on 2018/01/15 09:56:05 UTC
[6/9] james-project git commit: JAMES-2286 Rely on MimeMessageBuilder
rather than handcrafting messages
JAMES-2286 Rely on MimeMessageBuilder rather than handcrafting messages
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/609c6ed3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/609c6ed3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/609c6ed3
Branch: refs/heads/master
Commit: 609c6ed36d994775ea3e9d76053bb5680eab2927
Parents: 3f0ba0b
Author: benwa <bt...@linagora.com>
Authored: Fri Jan 12 10:00:13 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Mon Jan 15 16:54:02 2018 +0700
----------------------------------------------------------------------
.../mailrepository/MailRepositoryContract.java | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/609c6ed3/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java
index fc09978..4c2cddc 100644
--- a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java
+++ b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java
@@ -22,17 +22,14 @@ package org.apache.james.mailrepository;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
import java.util.List;
-import java.util.StringJoiner;
import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
import org.apache.james.core.MailAddress;
import org.apache.james.core.builder.MimeMessageBuilder;
import org.apache.james.mailrepository.api.MailRepository;
-import org.apache.james.mime4j.io.InputStreams;
import org.apache.james.server.core.MailImpl;
import org.apache.mailet.Mail;
import org.junit.jupiter.api.Test;
@@ -48,7 +45,7 @@ public interface MailRepositoryContract {
}
default Mail createMail(String name, String body) throws MessagingException {
- InputStream mailContent = generateMailContent(body);
+ MimeMessage mailContent = generateMailContent(body);
List<MailAddress> recipients = ImmutableList
.of(new MailAddress("rec1@domain.com"),
new MailAddress("rec2@domain.com"));
@@ -59,14 +56,11 @@ public interface MailRepositoryContract {
}
- default InputStream generateMailContent(String body) {
- String headers = new StringJoiner("\r\n")
- .add("Subject: test")
- .add("Content-Type: text/plain")
- .toString();
- String headerBodySeparator = "\r\n\r\n";
- String end = "\r\n.\r\n";
- return InputStreams.create(headers + headerBodySeparator + body + end, StandardCharsets.UTF_8);
+ default MimeMessage generateMailContent(String body) throws MessagingException {
+ return MimeMessageBuilder.mimeMessageBuilder()
+ .setSubject("test")
+ .setText(body)
+ .build();
}
default void checkMailEquality(Mail actual, Mail expected) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org