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 e6f9d69d3e71b72cac922e5a9b68727c9e16edc3
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Thu Nov 7 22:52:00 2019 +0100
[Refactoring] refactor tests to actually test what's expected
---
.../james/smtpserver/SetMimeHeaderHandlerTest.java | 26 +++++++++-------------
1 file changed, 10 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 73b5c7c..ba47a3d 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
@@ -29,7 +29,6 @@ import org.apache.james.core.builder.MimeMessageBuilder;
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.junit.Before;
import org.junit.Test;
@@ -39,8 +38,6 @@ public class SetMimeHeaderHandlerTest {
private static final String HEADER_VALUE = "test-value";
private SMTPSession mockedSMTPSession;
- private MimeMessage mimeMessage;
- private Mail mail;
@Before
public void setUp() throws Exception {
@@ -57,56 +54,53 @@ public class SetMimeHeaderHandlerTest {
};
}
- // test if the Header was add
@Test
- public void testHeaderIsPresent() throws MessagingException {
- mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
- .addHeader(HEADER_NAME, HEADER_VALUE)
+ public void setMimeHeaderHandlerShouldAddSpecifiedHeader() throws
MessagingException {
+ MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setSubject("testmail")
.setText("testtext")
.addToRecipient("te...@james.apache.org")
.addFrom("t...@james.apache.org")
.build();
- mail = MailImpl.builder()
+ MailImpl mail = MailImpl.builder()
.name("ID=" + ThreadLocalRandom.current().nextLong())
.mimeMessage(mimeMessage)
.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, mail);
-
assertThat(mail.getMessage().getHeader(HEADER_NAME)[0]).isEqualTo(HEADER_VALUE);
+
assertThat(mail.getMessage().getHeader(HEADER_NAME)).containsOnly(HEADER_VALUE);
}
- // test if the Header was replaced
@Test
- public void testHeaderIsReplaced() throws MessagingException {
+ public void setMimeHeaderHandlerShouldReplaceSpecifiedHeader() throws
MessagingException {
- mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessage 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()
+ MailImpl mail = MailImpl.builder()
.name("ID=" + ThreadLocalRandom.current().nextLong())
.mimeMessage(mimeMessage)
.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, mail);
-
assertThat(mail.getMessage().getHeader(HEADER_NAME)[0]).isEqualTo(HEADER_VALUE);
+
assertThat(mail.getMessage().getHeader(HEADER_NAME)).containsOnly(HEADER_VALUE);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
