You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/11/19 02:43:16 UTC
[james-project] 14/43: [Refactoring] Avoid anonymous MailboxMessage
in ListMessageAssertTest
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 0862f25869f57e41d63e1fae609b4a428d386e63
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat Nov 16 12:38:23 2019 +0700
[Refactoring] Avoid anonymous MailboxMessage in ListMessageAssertTest
---
.../store/mail/model/ListMessageAssertTest.java | 154 ++-------------------
1 file changed, 8 insertions(+), 146 deletions(-)
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
index 516f39e..0d51755 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
@@ -22,7 +22,7 @@ package org.apache.james.mailbox.store.mail.model;
import static org.apache.james.mailbox.store.mail.model.ListMessageAssert.assertMessages;
import java.io.IOException;
-import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
@@ -31,12 +31,9 @@ import javax.mail.util.SharedByteArrayInputStream;
import org.apache.james.core.Username;
import org.apache.james.mailbox.MessageUid;
-import org.apache.james.mailbox.model.ComposedMessageId;
-import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData;
import org.apache.james.mailbox.model.Mailbox;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageAttachment;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.TestId;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
@@ -82,148 +79,13 @@ public class ListMessageAssertTest {
assertMessages(actual).containOnly(createMailboxMessage(MAILBOX_ID, MESSAGE_ID, MESSAGE_UID, INTERNAL_DATE, BODY_CONTENT2, BODY_START, new PropertyBuilder()));
}
- private MailboxMessage createMailboxMessage(final MailboxId mailboxId, final MessageId messageId, final MessageUid uid,
- final Date internalDate, final String content, final int bodyStart, final PropertyBuilder propertyBuilder) {
- return new MailboxMessage() {
- @Override
- public ComposedMessageIdWithMetaData getComposedMessageIdWithMetaData() {
- return ComposedMessageIdWithMetaData.builder()
- .modSeq(getModSeq())
- .flags(createFlags())
- .composedMessageId(new ComposedMessageId(mailboxId, getMessageId(), uid))
- .build();
- }
-
- @Override
- public MailboxId getMailboxId() {
- return mailboxId;
- }
-
- @Override
- public MessageUid getUid() {
- return uid;
- }
-
- @Override
- public void setUid(MessageUid uid) {
-
- }
-
- @Override
- public void setModSeq(long modSeq) {
-
- }
-
- @Override
- public long getModSeq() {
- return 0;
- }
-
- @Override
- public boolean isAnswered() {
- return false;
- }
-
- @Override
- public boolean isDeleted() {
- return false;
- }
-
- @Override
- public boolean isDraft() {
- return false;
- }
-
- @Override
- public boolean isFlagged() {
- return false;
- }
-
- @Override
- public boolean isRecent() {
- return false;
- }
-
- @Override
- public boolean isSeen() {
- return false;
- }
-
- @Override
- public void setFlags(Flags flags) {
-
- }
-
- @Override
- public Flags createFlags() {
- return null;
- }
-
- @Override
- public long getHeaderOctets() {
- return bodyStart;
- }
-
- @Override
- public MessageId getMessageId() {
- return messageId;
- }
-
- @Override
- public Date getInternalDate() {
- return internalDate;
- }
-
- @Override
- public InputStream getBodyContent() throws IOException {
- return null;
- }
-
- @Override
- public String getMediaType() {
- return null;
- }
-
- @Override
- public String getSubType() {
- return null;
- }
-
- @Override
- public long getBodyOctets() {
- return content.length() - bodyStart;
- }
-
- @Override
- public long getFullContentOctets() {
- return content.length();
- }
-
- @Override
- public Long getTextualLineCount() {
- return null;
- }
-
- @Override
- public InputStream getHeaderContent() throws IOException {
- return null;
- }
-
- @Override
- public InputStream getFullContent() throws IOException {
- return new SharedByteArrayInputStream(content.getBytes());
- }
-
- @Override
- public List<Property> getProperties() {
- return null;
- }
-
- @Override
- public List<MessageAttachment> getAttachments() {
- return null;
- }
- };
+ private MailboxMessage createMailboxMessage(MailboxId mailboxId, MessageId messageId, MessageUid uid,
+ Date internalDate, String content, int bodyStart, PropertyBuilder propertyBuilder) {
+ SimpleMailboxMessage simpleMailboxMessage = new SimpleMailboxMessage(messageId, internalDate, content.length(),
+ bodyStart, new SharedByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)), new Flags(), propertyBuilder, mailboxId);
+ simpleMailboxMessage.setUid(uid);
+ simpleMailboxMessage.setModSeq(0);
+ return simpleMailboxMessage;
}
private Mailbox createMailbox(MailboxPath mailboxPath) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org