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 rc...@apache.org on 2020/02/03 07:28:07 UTC
[james-project] 04/14: [Refactoring] Migrate
SpamAssassinListenerTest to JUnit 5
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 c3e93f360ecfa498c523a60e1f5a1ea8affab98e
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Wed Jan 22 10:55:41 2020 +0700
[Refactoring] Migrate SpamAssassinListenerTest to JUnit 5
---
.../spamassassin/SpamAssassinListenerTest.java | 70 +++++++++++-----------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
index 245a8ec..71ecbb3 100644
--- a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
+++ b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
@@ -54,29 +54,29 @@ import org.apache.james.mailbox.store.event.EventFactory;
import org.apache.james.mailbox.store.mail.MailboxMapper;
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;
-
-public class SpamAssassinListenerTest {
- public static final Username USER = Username.of("user");
- private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER);
- private static final int UID_VALIDITY = 43;
- private static final TestMessageId MESSAGE_ID = TestMessageId.of(45);
-
- private SpamAssassin spamAssassin;
- private SpamAssassinListener listener;
- private Mailbox inbox;
- private Mailbox mailbox1;
- private MailboxId mailboxId1;
- private MailboxId mailboxId2;
- private MailboxId spamMailboxId;
- private MailboxId spamCapitalMailboxId;
- private MailboxId trashMailboxId;
- private MailboxSessionMapperFactory mapperFactory;
- private Mailbox mailbox2;
-
- @Before
- public void setup() throws Exception {
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class SpamAssassinListenerTest {
+ static final Username USER = Username.of("user");
+ static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER);
+ static final int UID_VALIDITY = 43;
+ static final TestMessageId MESSAGE_ID = TestMessageId.of(45);
+
+ SpamAssassin spamAssassin;
+ SpamAssassinListener listener;
+ Mailbox inbox;
+ Mailbox mailbox1;
+ MailboxId mailboxId1;
+ MailboxId mailboxId2;
+ MailboxId spamMailboxId;
+ MailboxId spamCapitalMailboxId;
+ MailboxId trashMailboxId;
+ MailboxSessionMapperFactory mapperFactory;
+ Mailbox mailbox2;
+
+ @BeforeEach
+ void setup() throws Exception {
StoreMailboxManager mailboxManager = spy(InMemoryIntegrationResources.defaultResources().getMailboxManager());
SystemMailboxesProviderImpl systemMailboxesProvider = new SystemMailboxesProviderImpl(mailboxManager);
when(mailboxManager.createSystemSession(USER))
@@ -99,13 +99,13 @@ public class SpamAssassinListenerTest {
}
@Test
- public void deserializeSpamAssassinListenerGroup() throws Exception {
+ void deserializeSpamAssassinListenerGroup() throws Exception {
assertThat(Group.deserialize("org.apache.james.mailbox.spamassassin.SpamAssassinListener$SpamAssassinListenerGroup"))
.isEqualTo(new SpamAssassinListener.SpamAssassinListenerGroup());
}
@Test
- public void isEventOnSpamMailboxShouldReturnFalseWhenMessageIsMovedToANonSpamMailbox() {
+ void isEventOnSpamMailboxShouldReturnFalseWhenMessageIsMovedToANonSpamMailbox() {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -119,7 +119,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void isEventOnSpamMailboxShouldReturnTrueWhenMailboxIsSpam() {
+ void isEventOnSpamMailboxShouldReturnTrueWhenMailboxIsSpam() {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -133,7 +133,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void isEventOnSpamMailboxShouldReturnFalseWhenMailboxIsSpamOtherCase() {
+ void isEventOnSpamMailboxShouldReturnFalseWhenMailboxIsSpamOtherCase() {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -147,7 +147,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void eventShouldCallSpamAssassinSpamLearningWhenTheEventMatches() throws Exception {
+ void eventShouldCallSpamAssassinSpamLearningWhenTheEventMatches() throws Exception {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -163,7 +163,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void isMessageMovedOutOfSpamMailboxShouldReturnFalseWhenMessageMovedBetweenNonSpamMailboxes() {
+ void isMessageMovedOutOfSpamMailboxShouldReturnFalseWhenMessageMovedBetweenNonSpamMailboxes() {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -177,7 +177,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void isMessageMovedOutOfSpamMailboxShouldReturnFalseWhenMessageMovedOutOfCapitalSpamMailbox() {
+ void isMessageMovedOutOfSpamMailboxShouldReturnFalseWhenMessageMovedOutOfCapitalSpamMailbox() {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -191,7 +191,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void isMessageMovedOutOfSpamMailboxShouldReturnTrueWhenMessageMovedOutOfSpamMailbox() {
+ void isMessageMovedOutOfSpamMailboxShouldReturnTrueWhenMessageMovedOutOfSpamMailbox() {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -205,7 +205,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void isMessageMovedOutOfSpamMailboxShouldReturnFalseWhenMessageMovedToTrash() {
+ void isMessageMovedOutOfSpamMailboxShouldReturnFalseWhenMessageMovedToTrash() {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -219,7 +219,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void eventShouldCallSpamAssassinHamLearningWhenTheEventMatches() throws Exception {
+ void eventShouldCallSpamAssassinHamLearningWhenTheEventMatches() throws Exception {
MessageMoveEvent messageMoveEvent = MessageMoveEvent.builder()
.session(MAILBOX_SESSION)
.messageMoves(MessageMoves.builder()
@@ -235,7 +235,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void eventShouldCallSpamAssassinHamLearningWhenTheMessageIsAddedInInbox() throws Exception {
+ void eventShouldCallSpamAssassinHamLearningWhenTheMessageIsAddedInInbox() throws Exception {
SimpleMailboxMessage message = createMessage(inbox);
MailboxListener.Added addedEvent = EventFactory.added()
@@ -251,7 +251,7 @@ public class SpamAssassinListenerTest {
}
@Test
- public void eventShouldNotCallSpamAssassinHamLearningWhenTheMessageIsAddedInAMailboxOtherThanInbox() throws Exception {
+ void eventShouldNotCallSpamAssassinHamLearningWhenTheMessageIsAddedInAMailboxOtherThanInbox() throws Exception {
SimpleMailboxMessage message = createMessage(mailbox1);
MailboxListener.Added addedEvent = EventFactory.added()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org