This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 18530dbe80dfda0ad0104dd7cf475e6855496f8d
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Mon Jan 20 19:11:24 2020 +0700
JAMES-2997 Renable MessageParserTest
---
.../store/mail/model/impl/MessageParserTest.java | 99 ++++++++++------------
1 file changed, 43 insertions(+), 56 deletions(-)
diff --git
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
index 80b4f6a..32eb1eb 100644
---
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
+++
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
@@ -25,9 +25,8 @@ import java.io.ByteArrayInputStream;
import java.util.List;
import java.util.Optional;
-import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.Cid;
-import org.apache.james.mailbox.model.MessageAttachment;
+import org.apache.james.mailbox.model.ParsedAttachment;
import org.apache.james.mdn.MDN;
import org.apache.james.mdn.MDNReport;
import org.apache.james.mdn.action.mode.DispositionActionMode;
@@ -41,8 +40,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class MessageParserTest {
-
- /*
MessageParser testee;
@BeforeEach
@@ -52,21 +49,21 @@ class MessageParserTest {
@Test
void getAttachmentsShouldBeEmptyWhenNoAttachment() throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/noAttachment.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/noAttachment.eml"));
assertThat(attachments).isEmpty();
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenOneAttachment() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
assertThat(attachments).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveAttachmentNameWhenOne() throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
assertThat(attachments).hasSize(1);
Optional<String> expectedName = Optional.of("exploits_of_a_mom.png");
@@ -75,14 +72,14 @@ class MessageParserTest {
@Test
void
getAttachmentsShouldRetrieveAttachmentNameWhenOneContainingNonASCIICharacters()
throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/messageWithNonASCIIFilenameAttachment.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/messageWithNonASCIIFilenameAttachment.eml"));
assertThat(attachments).hasSize(1);
assertThat(attachments.get(0).getName()).contains("ديناصور.odt");
}
@Test
void getAttachmentsShouldRetrieveEmptyNameWhenNone() throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithoutName.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithoutName.eml"));
assertThat(attachments).hasSize(1);
assertThat(attachments.get(0).getName()).isEqualTo(Optional.empty());
@@ -90,79 +87,71 @@ class MessageParserTest {
@Test
void getAttachmentsShouldNotFailWhenContentTypeIsNotHere() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithoutContentType.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithoutContentType.eml"));
assertThat(attachments).hasSize(1);
-
assertThat(attachments.get(0).getAttachment().getType()).isEqualTo("application/octet-stream");
+
assertThat(attachments.get(0).getContentType()).isEqualTo("application/octet-stream");
}
@Test
void getAttachmentsShouldNotFailWhenContentTypeIsEmpty() throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithEmptyContentType.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithEmptyContentType.eml"));
assertThat(attachments).hasSize(1);
-
assertThat(attachments.get(0).getAttachment().getType()).isEqualTo("application/octet-stream");
+
assertThat(attachments.get(0).getContentType()).isEqualTo("application/octet-stream");
}
@Test
void
getAttachmentsShouldRetrieveTheAttachmentContentTypeWhenOneAttachment() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
assertThat(attachments).hasSize(1);
-
assertThat(attachments.get(0).getAttachment().getType()).isEqualTo("application/octet-stream");
+
assertThat(attachments.get(0).getContentType()).isEqualTo("application/octet-stream");
}
@Test
void retrieveAttachmentsShouldNotFailOnMessagesWithManyHeaders() throws
Exception {
- List<MessageAttachment> messageAttachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/mailWithManyHeaders.eml"));
+ List<ParsedAttachment> messageAttachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/mailWithManyHeaders.eml"));
assertThat(messageAttachments).hasSize(1);
}
@Test
void retrieveAttachmentsShouldNotFailOnMessagesWithLongHeaders() throws
Exception {
- List<MessageAttachment> messageAttachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/mailWithLongHeaders.eml"));
+ List<ParsedAttachment> messageAttachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/mailWithLongHeaders.eml"));
assertThat(messageAttachments).hasSize(1);
}
@Test
void
getAttachmentsShouldRetrieveTheAttachmentContentTypeWhenOneAttachmentWithSimpleContentType()
throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithSimpleContentType.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithSimpleContentType.eml"));
assertThat(attachments).hasSize(1);
-
assertThat(attachments.get(0).getAttachment().getType()).isEqualTo("application/octet-stream");
- }
-
- @Test
- void getAttachmentsShouldRetrieveTheAttachmentSizeWhenOneAttachment()
throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
-
- assertThat(attachments).hasSize(1);
-
assertThat(attachments.get(0).getAttachment().getSize()).isEqualTo(3071);
+
assertThat(attachments.get(0).getContentType()).isEqualTo("application/octet-stream");
}
@Test
void getAttachmentsShouldReturnTheExpectedAttachment() throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
- Attachment attachment = attachments.get(0).getAttachment();
-
assertThat(attachment.getStream()).hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/gimp.png"));
+ ParsedAttachment attachment = attachments.get(0);
+
assertThat(attachment.getContent()).hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/gimp.png"));
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenTwo() throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"));
assertThat(attachments).hasSize(2);
}
@Test
void retrieveAttachmentShouldUseFilenameAsNameWhenNoName() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/filenameOnly.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/filenameOnly.eml"));
assertThat(attachments).hasSize(1)
- .extracting(MessageAttachment::getName)
+ .extracting(ParsedAttachment::getName)
.allMatch(Optional::isPresent)
.extracting(Optional::get)
.containsExactly("inventory.csv");
@@ -170,10 +159,10 @@ class MessageParserTest {
@Test
void retrieveAttachmentShouldUseNameWhenBothNameAndFilename() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/filenameAndName.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/filenameAndName.eml"));
assertThat(attachments).hasSize(1)
- .extracting(MessageAttachment::getName)
+ .extracting(ParsedAttachment::getName)
.allMatch(Optional::isPresent)
.extracting(Optional::get)
.containsExactly("good.csv");
@@ -181,21 +170,21 @@ class MessageParserTest {
@Test
void getAttachmentsShouldRetrieveEmbeddedAttachmentsWhenSome() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/embeddedAttachmentWithInline.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/embeddedAttachmentWithInline.eml"));
assertThat(attachments).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveInlineAttachmentsWhenSome() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/embeddedAttachmentWithAttachment.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/embeddedAttachmentWithAttachment.eml"));
assertThat(attachments).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveTheAttachmentCIDWhenOne() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"));
assertThat(attachments).hasSize(1);
assertThat(attachments.get(0).getCid()).isEqualTo(Optional.of(Cid.from("part1.37a15c92.a7c34...@linagora.com")));
@@ -203,7 +192,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldSetInlineWhenOneInlinedAttachment() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"));
assertThat(attachments).hasSize(1);
assertThat(attachments.get(0).isInline()).isTrue();
@@ -211,63 +200,63 @@ class MessageParserTest {
@Test
void getAttachementsShouldRetrieveHtmlAttachementsWhenSome() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneHtmlAttachmentAndSomeTextInlined.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneHtmlAttachmentAndSomeTextInlined.eml"));
assertThat(attachments).hasSize(1);
}
@Test
void
getAttachementsShouldRetrieveAttachmentsWhenSomeAreInTheMultipartAlternative()
throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/invitationEmailFromOP.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/invitationEmailFromOP.eml"));
assertThat(attachments).hasSize(7);
}
@Test
void
getAttachmentsShouldNotConsiderUnknownContentDispositionAsAttachments() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/unknownDisposition.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/unknownDisposition.eml"));
assertThat(attachments).hasSize(0);
}
@Test
void
getAttachmentsShouldConsiderNoContentDispositionAsAttachmentsWhenCID() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/noContentDispositionWithCID.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/noContentDispositionWithCID.eml"));
assertThat(attachments).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenNoCidForInlined() throws
Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithNoCid.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithNoCid.eml"));
assertThat(attachments).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenEmptyCidForInlined()
throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithEmptyCid.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithEmptyCid.eml"));
assertThat(attachments).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenBlankCidForInlined()
throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithBlankCid.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithBlankCid.eml"));
assertThat(attachments).hasSize(1);
}
@Test
void
getAttachmentsShouldRetrieveAttachmentsWhenOneFailOnWrongContentDisposition()
throws Exception {
- List<MessageAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/multiAttachmentsWithOneWrongContentDisposition.eml"));
+ List<ParsedAttachment> attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/multiAttachmentsWithOneWrongContentDisposition.eml"));
assertThat(attachments).hasSize(2);
}
@Test
void
getAttachmentsShouldRetrieveOneAttachmentWhenMessageWithAttachmentContentDisposition()
throws Exception {
- List<MessageAttachment> attachments = testee.retrieveAttachments(
+ List<ParsedAttachment> attachments = testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/emailWithOnlyAttachment.eml"));
assertThat(attachments).hasSize(1);
@@ -275,21 +264,21 @@ class MessageParserTest {
@Test
void getAttachmentsShouldConsiderICSAsAttachments() throws Exception {
- List<MessageAttachment> attachments = testee.retrieveAttachments(
+ List<ParsedAttachment> attachments = testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/calendar.eml"));
assertThat(attachments)
.hasSize(1)
- .allMatch(messageAttachment ->
messageAttachment.getAttachment().getType().equals("text/calendar"));
+ .allMatch(messageAttachment ->
messageAttachment.getContentType().equals("text/calendar"));
}
@Test
void gpgSignatureShouldBeConsideredAsAnAttachment() throws Exception {
- List<MessageAttachment> attachments = testee.retrieveAttachments(
+ List<ParsedAttachment> attachments = testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/signedMessage.eml"));
assertThat(attachments).hasSize(2)
- .extracting(MessageAttachment::getName)
+ .extracting(ParsedAttachment::getName)
.allMatch(Optional::isPresent)
.extracting(Optional::get)
.containsOnly("message suivi", "signature.asc");
@@ -314,10 +303,8 @@ class MessageParserTest {
.asMime4JMessageBuilder()
.build();
- List<MessageAttachment> result = testee.retrieveAttachments(new
ByteArrayInputStream(DefaultMessageWriter.asBytes(message)));
+ List<ParsedAttachment> result = testee.retrieveAttachments(new
ByteArrayInputStream(DefaultMessageWriter.asBytes(message)));
assertThat(result).hasSize(1)
- .allMatch(attachment ->
attachment.getAttachment().getType().equals(MDN.DISPOSITION_CONTENT_TYPE));
+ .allMatch(attachment ->
attachment.getContentType().equals(MDN.DISPOSITION_CONTENT_TYPE));
}
-
- */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
