[james-project] 10/15: [Refactoring] inline mimemessage construction

[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 eee987abfb49775469e5514f82617524f6064c16
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Thu Nov 7 22:47:17 2019 +0100

    [Refactoring] inline mimemessage construction
---
 .../james/smtpserver/SetMimeHeaderHandlerTest.java | 52 +++++++---------------
 1 file changed, 17 insertions(+), 35 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 3681970..73b5c7c 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
@@ -39,28 +39,14 @@ public class SetMimeHeaderHandlerTest {
     private static final String HEADER_VALUE = "test-value";
 
     private SMTPSession mockedSMTPSession;
-    private MimeMessage mockedMimeMessage;
+    private MimeMessage mimeMessage;
     private Mail mail;
-    private String headerName = "defaultHeaderName";
-    private String headerValue = "defaultHeaderValue";
 
     @Before
     public void setUp() throws Exception {
         setupMockedSMTPSession();
     }
 
-    private void setHeaderName(String headerName) {
-        this.headerName = headerName;
-    }
-
-    private void setHeaderValue(String headerValue) {
-        this.headerValue = headerValue;
-    }
-
-    private void setupMockedMimeMessage() throws MessagingException {
-        mockedMimeMessage = createMimeMessage(headerName, headerValue);
-    }
-
     private void setupMockedSMTPSession() {
         mockedSMTPSession = new BaseFakeSMTPSession() {
 
@@ -74,13 +60,17 @@ public class SetMimeHeaderHandlerTest {
     // test if the Header was add
     @Test
     public void testHeaderIsPresent() throws MessagingException {
-        setHeaderName(HEADER_NAME);
-        setHeaderValue(HEADER_VALUE);
+        mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
+            .addHeader(HEADER_NAME, HEADER_VALUE)
+            .setSubject("testmail")
+            .setText("testtext")
+            .addToRecipient("te...@james.apache.org")
+            .addFrom("t...@james.apache.org")
+            .build();
 
-        setupMockedMimeMessage();
         mail = MailImpl.builder()
             .name("ID=" + ThreadLocalRandom.current().nextLong())
-            .mimeMessage(mockedMimeMessage)
+            .mimeMessage(mimeMessage)
             .addRecipients("t...@james.apache.org", "te...@james.apache.org")
             .build();
 
@@ -96,13 +86,17 @@ public class SetMimeHeaderHandlerTest {
     // test if the Header was replaced
     @Test
     public void testHeaderIsReplaced() throws MessagingException {
-        setHeaderName(HEADER_NAME);
-        setHeaderValue(headerValue);
 
-        setupMockedMimeMessage();
+        mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
+            .addHeader(HEADER_NAME, "defaultHeaderValue")
+            .setSubject("testmail")
+            .setText("testtext")
+            .addToRecipient("te...@james.apache.org")
+            .addFrom("t...@james.apache.org")
+            .build();
         mail = MailImpl.builder()
             .name("ID=" + ThreadLocalRandom.current().nextLong())
-            .mimeMessage(mockedMimeMessage)
+            .mimeMessage(mimeMessage)
             .addRecipients("t...@james.apache.org", "te...@james.apache.org")
             .build();
 
@@ -115,16 +109,4 @@ public class SetMimeHeaderHandlerTest {
         
assertThat(mail.getMessage().getHeader(HEADER_NAME)[0]).isEqualTo(HEADER_VALUE);
     }
 
-    private static MimeMessage createMimeMessage(String headerName, String 
headerValue) throws MessagingException {
-        String sender = "t...@james.apache.org";
-        String rcpt = "te...@james.apache.org";
-        return MimeMessageBuilder.mimeMessageBuilder()
-            .addHeader(headerName, headerValue)
-            .setSubject("testmail")
-            .setText("testtext")
-            .addToRecipient(rcpt)
-            .addFrom(sender)
-            .build();
-    }
-
 }


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