This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a11449d18cd05c5908ed55ec8cad9be6a0775ec6 Author: Rene Cordier <rcord...@linagora.com> AuthorDate: Thu Dec 5 17:05:30 2019 +0700 [Refactoring] Move PartContentBuilderMultipartAlternativeTest to JUnit 5 --- ...PartContentBuilderMultipartAlternativeTest.java | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java index 5c937b6..813c039 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java @@ -30,36 +30,36 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.model.Header; import org.apache.james.mailbox.store.streaming.PartContentBuilder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -public class PartContentBuilderMultipartAlternativeTest { +class PartContentBuilderMultipartAlternativeTest { - private static final String CONTENT_TYPE_PLAIN = "text/plain;charset=us-ascii"; + static final String CONTENT_TYPE_PLAIN = "text/plain;charset=us-ascii"; - private static final String CONTENT_TYPE_HTML = "text/html;charset=us-ascii"; + static final String CONTENT_TYPE_HTML = "text/html;charset=us-ascii"; - private static final String CONTENT_TYPE_XHTML = "application/xhtml;charset=us-ascii"; + static final String CONTENT_TYPE_XHTML = "application/xhtml;charset=us-ascii"; - private static final String CONTENT_TYPE = "Content-Type"; + static final String CONTENT_TYPE = "Content-Type"; - private static final String ALT_PLAIN_BODY = "Rhubarb!Rhubard!Rhubard!\r\n"; + static final String ALT_PLAIN_BODY = "Rhubarb!Rhubard!Rhubard!\r\n"; - private static final String ALT_XHTML_BODY = "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>" + static final String ALT_XHTML_BODY = "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>" + "<html><head><title>Rhubard!</title></head><body><p>Rhubarb!Rhubard!Rhubard!</p></body></html>\r\n"; - private static final String ALT_HTML_BODY = "<html><head><title>Rhubard!</title></head><body><p>Rhubarb!Rhubard!Rhubard!</p></body></html>\r\n"; + static final String ALT_HTML_BODY = "<html><head><title>Rhubard!</title></head><body><p>Rhubarb!Rhubard!Rhubard!</p></body></html>\r\n"; - private static final String ALT_PART_XHTML = CONTENT_TYPE + ": " + static final String ALT_PART_XHTML = CONTENT_TYPE + ": " + CONTENT_TYPE_XHTML + "\r\n" + "\r\n" + ALT_XHTML_BODY; - private static final String ALT_PART_HTML = CONTENT_TYPE + ": " + static final String ALT_PART_HTML = CONTENT_TYPE + ": " + CONTENT_TYPE_HTML + "\r\n" + "\r\n" + ALT_HTML_BODY; - private static final String ALT_PART_PLAIN = CONTENT_TYPE + ": " + static final String ALT_PART_PLAIN = CONTENT_TYPE + ": " + CONTENT_TYPE_PLAIN + "\r\n" + "\r\n" + ALT_PLAIN_BODY; - private static final String MULTIPART_ALTERNATIVE = "From: Samual Smith <sam...@example.org>\r\n" + static final String MULTIPART_ALTERNATIVE = "From: Samual Smith <sam...@example.org>\r\n" + "To: John Smith <j...@example.org>\r\n" + "Date: Sun, 10 Feb 2008 08:00:00 -0800 (PST)\r\n" + "Subject: Rhubarb!\r\n" @@ -73,27 +73,27 @@ public class PartContentBuilderMultipartAlternativeTest { PartContentBuilder builder; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() { builder = new PartContentBuilder(); } @Test - public void testShouldLocatePartsOfMultipartAlterative() throws Exception { + void testShouldLocatePartsOfMultipartAlterative() throws Exception { assertThat(bodyContent(MULTIPART_ALTERNATIVE, 1)).isEqualTo(ALT_PLAIN_BODY); assertThat(bodyContent(MULTIPART_ALTERNATIVE, 2)).isEqualTo(ALT_HTML_BODY); assertThat(bodyContent(MULTIPART_ALTERNATIVE, 3)).isEqualTo(ALT_XHTML_BODY); } @Test - public void testShouldLocateHeadersOfMultipartAlterative() throws Exception { + void testShouldLocateHeadersOfMultipartAlterative() throws Exception { checkContentType(CONTENT_TYPE_PLAIN, MULTIPART_ALTERNATIVE, 1); checkContentType(CONTENT_TYPE_HTML, MULTIPART_ALTERNATIVE, 2); checkContentType(CONTENT_TYPE_XHTML, MULTIPART_ALTERNATIVE, 3); } @Test - public void testShouldLocateFullContentOfMultipartAlterative() + void testShouldLocateFullContentOfMultipartAlterative() throws Exception { assertThat(fullContent(MULTIPART_ALTERNATIVE, 1)).isEqualTo(ALT_PART_PLAIN); assertThat(fullContent(MULTIPART_ALTERNATIVE, 2)).isEqualTo(ALT_PART_HTML); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org