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 ma...@apache.org on 2019/11/12 21:37:29 UTC
[james-project] 07/15: [Refactoring] move createMockMail2Recipients
util function to the only class using it
This is an automated email from the ASF dual-hosted git repository.
matthieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f8f5d408934bfe1bad3647bc34104f7707a51588
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Thu Nov 7 22:33:50 2019 +0100
[Refactoring] move createMockMail2Recipients util function to the only class using it
---
.../james/smtpserver/SetMimeHeaderHandlerTest.java | 16 ++++++++++++++--
.../src/test/java/org/apache/james/smtpserver/Util.java | 12 ------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
index e79e909..f9f6055 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
@@ -20,12 +20,15 @@ package org.apache.james.smtpserver;
import static org.assertj.core.api.Assertions.assertThat;
+import java.util.concurrent.ThreadLocalRandom;
+
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.apache.mailet.Mail;
+import org.apache.mailet.base.test.FakeMail;
import org.junit.Before;
import org.junit.Test;
@@ -74,7 +77,7 @@ public class SetMimeHeaderHandlerTest {
setHeaderValue(HEADER_VALUE);
setupMockedMimeMessage();
- mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ mockedMail = createMockMail2Recipients(mockedMimeMessage);
SetMimeHeaderHandler header = new SetMimeHeaderHandler();
@@ -92,7 +95,7 @@ public class SetMimeHeaderHandlerTest {
setHeaderValue(headerValue);
setupMockedMimeMessage();
- mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ mockedMail = createMockMail2Recipients(mockedMimeMessage);
SetMimeHeaderHandler header = new SetMimeHeaderHandler();
@@ -102,4 +105,13 @@ public class SetMimeHeaderHandlerTest {
assertThat(mockedMail.getMessage().getHeader(HEADER_NAME)[0]).isEqualTo(HEADER_VALUE);
}
+
+ private static Mail createMockMail2Recipients(MimeMessage m) throws MessagingException {
+ return FakeMail.builder()
+ .name("ID=" + ThreadLocalRandom.current().nextLong())
+ .mimeMessage(m)
+ .recipients("test@james.apache.org", "test2@james.apache.org")
+ .build();
+ }
+
}
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
index 91c6f93..5413c8b 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
@@ -18,28 +18,16 @@
****************************************************************/
package org.apache.james.smtpserver;
-import java.util.concurrent.ThreadLocalRandom;
-
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import org.apache.james.core.builder.MimeMessageBuilder;
-import org.apache.mailet.Mail;
-import org.apache.mailet.base.test.FakeMail;
/**
* some utilities for James unit testing
*/
public class Util {
- public static Mail createMockMail2Recipients(MimeMessage m) throws MessagingException {
- return FakeMail.builder()
- .name("ID=" + ThreadLocalRandom.current().nextLong())
- .mimeMessage(m)
- .recipients("test@james.apache.org", "test2@james.apache.org")
- .build();
- }
-
public static MimeMessage createMimeMessage(String headerName, String headerValue) throws MessagingException {
String sender = "test@james.apache.org";
String rcpt = "test2@james.apache.org";
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org