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 b3a7434ac3ca2345fadfc20601e8357f073a62ab
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Thu Dec 5 16:29:20 2019 +0700
[Refactoring] Move ListMessageAssertTest to JUnit 5
---
.../store/mail/model/ListMessageAssert.java | 4 +-
.../store/mail/model/ListMessageAssertTest.java | 57 +++++++++++++---------
2 files changed, 35 insertions(+), 26 deletions(-)
diff --git
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java
index b5b8049..1fbc05a 100644
---
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java
+++
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java
@@ -38,7 +38,7 @@ import com.google.common.collect.Lists;
public class ListMessageAssert {
private final List<MailboxMessage> actual;
- private final List<InnerMessage>
messageToInnerMessage(List<MailboxMessage> messages) {
+ private List<InnerMessage> messageToInnerMessage(List<MailboxMessage>
messages) {
return messages.stream()
.map(message -> getInnerMessage(message))
.collect(Guavate.toImmutableList());
@@ -61,7 +61,7 @@ public class ListMessageAssert {
return new ListMessageAssert(actual);
}
- public void containOnly(MailboxMessage... expecteds) throws IOException {
+ public void containOnly(MailboxMessage... expecteds) {
assertThat(messageToInnerMessage(actual)).containsOnlyElementsOf(messageToInnerMessage(Lists.newArrayList(expecteds)));
}
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 23eb451..51e9487 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
@@ -20,6 +20,7 @@
package org.apache.james.mailbox.store.mail.model;
import static
org.apache.james.mailbox.store.mail.model.ListMessageAssert.assertMessages;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -39,28 +40,28 @@ import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.TestId;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
-public class ListMessageAssertTest {
- private static final String BODY_CONTENT2 = "Subject: Test2
\n\nBody2\n.\n";
- private static final String BODY_CONTENT1 = "Subject: Test1
\n\nBody1\n.\n";
- private static final int BODY_START = 16;
- private static final int UID_VALIDITY = 42;
- private static final MailboxId MAILBOX_ID = TestId.of(1);
- private static final MessageUid MESSAGE_UID = MessageUid.of(2);
- private static final MessageId MESSAGE_ID = new DefaultMessageId();
- private static final Date INTERNAL_DATE = new Date();
+class ListMessageAssertTest {
+ static final String BODY_CONTENT2 = "Subject: Test2 \n\nBody2\n.\n";
+ static final String BODY_CONTENT1 = "Subject: Test1 \n\nBody1\n.\n";
+ static final int BODY_START = 16;
+ static final int UID_VALIDITY = 42;
+ static final MailboxId MAILBOX_ID = TestId.of(1);
+ static final MessageUid MESSAGE_UID = MessageUid.of(2);
+ static final MessageId MESSAGE_ID = new DefaultMessageId();
+ static final Date INTERNAL_DATE = new Date();
- private Mailbox benwaInboxMailbox;
+ Mailbox benwaInboxMailbox;
- private MailboxMessage message1;
- private MailboxMessage message2;
+ MailboxMessage message1;
+ MailboxMessage message2;
- @Before
- public void setUp() {
+ @BeforeEach
+ void setUp() {
benwaInboxMailbox =
createMailbox(MailboxPath.inbox(Username.of("user")));
message1 = createMessage(benwaInboxMailbox, MESSAGE_ID, BODY_CONTENT1,
BODY_START, new PropertyBuilder());
@@ -68,22 +69,28 @@ public class ListMessageAssertTest {
}
@Test
- public void containsOnlyShouldWork() throws IOException {
+ void containsOnlyShouldWork() throws IOException {
List<MailboxMessage> actual = ImmutableList.of(message1, message2);
- assertMessages(actual).containOnly(createMailboxMessage(MAILBOX_ID,
MESSAGE_ID, MESSAGE_UID, INTERNAL_DATE, BODY_CONTENT1, BODY_START, new
PropertyBuilder()),
+
+ assertMessages(actual).containOnly(
+ createMailboxMessage(MAILBOX_ID, MESSAGE_ID, MESSAGE_UID,
INTERNAL_DATE, BODY_CONTENT1, BODY_START, new PropertyBuilder()),
createMailboxMessage(MAILBOX_ID, MESSAGE_ID, MESSAGE_UID,
INTERNAL_DATE, BODY_CONTENT2, BODY_START, new PropertyBuilder()));
}
- @Test(expected = AssertionError.class)
- public void
containsOnlyShouldThrowExceptionWhenHavingElementDoesNotBelongToList() throws
IOException {
+ @Test
+ void
containsOnlyShouldThrowExceptionWhenHavingElementDoesNotBelongToList() {
List<MailboxMessage> actual = ImmutableList.of(message1);
- assertMessages(actual).containOnly(createMailboxMessage(MAILBOX_ID,
MESSAGE_ID, MESSAGE_UID, INTERNAL_DATE, BODY_CONTENT2, BODY_START, new
PropertyBuilder()));
+
+ assertThatThrownBy(() -> assertMessages(actual).containOnly(
+ createMailboxMessage(MAILBOX_ID, MESSAGE_ID, MESSAGE_UID,
INTERNAL_DATE, BODY_CONTENT2, BODY_START, new PropertyBuilder())))
+ .isInstanceOf(AssertionError.class);
}
- private MailboxMessage createMailboxMessage(MailboxId mailboxId, MessageId
messageId, MessageUid uid,
- Date internalDate, String content, int bodyStart, PropertyBuilder
propertyBuilder) {
+ 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(ModSeq.first());
return simpleMailboxMessage;
@@ -97,7 +104,9 @@ public class ListMessageAssertTest {
}
private MailboxMessage createMessage(Mailbox mailbox, MessageId messageId,
String content, int bodyStart, PropertyBuilder propertyBuilder) {
- SimpleMailboxMessage simpleMailboxMessage = new
SimpleMailboxMessage(messageId, INTERNAL_DATE, content.length(), bodyStart, new
SharedByteArrayInputStream(content.getBytes()), new Flags(), propertyBuilder,
mailbox.getMailboxId());
+ SimpleMailboxMessage simpleMailboxMessage = new
SimpleMailboxMessage(messageId, INTERNAL_DATE, content.length(),
+ bodyStart, new SharedByteArrayInputStream(content.getBytes()), new
Flags(), propertyBuilder, mailbox.getMailboxId());
+
simpleMailboxMessage.setUid(MESSAGE_UID);
return simpleMailboxMessage;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
