[james-project] 08/15: [Refactoring] inline createMockMail2Recipients and replace it with MailImpl.builder

[matthieu]

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 3c123e4a727a27d1f4f4af20bd3532ca8537c9df
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Thu Nov 7 22:38:54 2019 +0100

    [Refactoring] inline createMockMail2Recipients and replace it with 
MailImpl.builder
---
 .../james/smtpserver/SetMimeHeaderHandlerTest.java | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 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 f9f6055..2315524 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
@@ -27,8 +27,8 @@ import javax.mail.internet.MimeMessage;
 
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
+import org.apache.james.server.core.MailImpl;
 import org.apache.mailet.Mail;
-import org.apache.mailet.base.test.FakeMail;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -39,7 +39,7 @@ public class SetMimeHeaderHandlerTest {
 
     private SMTPSession mockedSMTPSession;
     private MimeMessage mockedMimeMessage;
-    private Mail mockedMail;
+    private Mail mail;
     private String headerName = "defaultHeaderName";
     private String headerValue = "defaultHeaderValue";
 
@@ -77,15 +77,19 @@ public class SetMimeHeaderHandlerTest {
         setHeaderValue(HEADER_VALUE);
 
         setupMockedMimeMessage();
-        mockedMail = createMockMail2Recipients(mockedMimeMessage);
+        mail = MailImpl.builder()
+            .name("ID=" + ThreadLocalRandom.current().nextLong())
+            .mimeMessage(mockedMimeMessage)
+            .addRecipients("t...@james.apache.org", "te...@james.apache.org")
+            .build();
 
         SetMimeHeaderHandler header = new SetMimeHeaderHandler();
 
         header.setHeaderName(HEADER_NAME);
         header.setHeaderValue(HEADER_VALUE);
-        header.onMessage(mockedSMTPSession, mockedMail);
+        header.onMessage(mockedSMTPSession, mail);
 
-        
assertThat(mockedMail.getMessage().getHeader(HEADER_NAME)[0]).isEqualTo(HEADER_VALUE);
+        
assertThat(mail.getMessage().getHeader(HEADER_NAME)[0]).isEqualTo(HEADER_VALUE);
     }
 
     // test if the Header was replaced
@@ -95,23 +99,19 @@ public class SetMimeHeaderHandlerTest {
         setHeaderValue(headerValue);
 
         setupMockedMimeMessage();
-        mockedMail = createMockMail2Recipients(mockedMimeMessage);
+        mail = MailImpl.builder()
+            .name("ID=" + ThreadLocalRandom.current().nextLong())
+            .mimeMessage(mockedMimeMessage)
+            .addRecipients("t...@james.apache.org", "te...@james.apache.org")
+            .build();
 
         SetMimeHeaderHandler header = new SetMimeHeaderHandler();
 
         header.setHeaderName(HEADER_NAME);
         header.setHeaderValue(HEADER_VALUE);
-        header.onMessage(mockedSMTPSession, mockedMail);
+        header.onMessage(mockedSMTPSession, mail);
 
-        
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("t...@james.apache.org", "te...@james.apache.org")
-            .build();
+        
assertThat(mail.getMessage().getHeader(HEADER_NAME)[0]).isEqualTo(HEADER_VALUE);
     }
 
 }


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