MAILBOX-357 SpamAssassinListenerTest should use the Event factory This avoids a direct reference to the specific "store" objects
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2fa3183e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2fa3183e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2fa3183e Branch: refs/heads/master Commit: 2fa3183eec80e949bea31ea1491c57d490c721c5 Parents: 6d75890 Author: Benoit Tellier <[email protected]> Authored: Mon Dec 10 14:37:02 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Dec 12 17:50:58 2018 +0700 ---------------------------------------------------------------------- .../spamassassin/SpamAssassinListenerTest.java | 23 ++++++++------------ 1 file changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/2fa3183e/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java ---------------------------------------------------------------------- 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 bc8aaeb..dc1d1d0 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 @@ -48,7 +48,6 @@ import org.apache.james.mailbox.store.SimpleMessageMetaData; import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.SystemMailboxesProviderImpl; import org.apache.james.mailbox.store.event.EventFactory; -import org.apache.james.mailbox.store.event.EventFactory.AddedImpl; import org.apache.james.mailbox.store.event.MessageMoveEvent; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; @@ -249,13 +248,11 @@ public class SpamAssassinListenerTest { @Test public void eventShouldCallSpamAssassinHamLearningWhenTheMessageIsAddedInInbox() { SimpleMailboxMessage message = createMessage(inboxId); - EventFactory eventFactory = new EventFactory(); - AddedImpl addedEvent = eventFactory.new AddedImpl( - MAILBOX_SESSION.getSessionId(), - MAILBOX_SESSION.getUser().getCoreUser(), - inbox, + + MailboxListener.Added addedEvent = new EventFactory().added( + MAILBOX_SESSION, ImmutableSortedMap.of(MessageUid.of(45), new SimpleMessageMetaData(message)), - ImmutableMap.of(MessageUid.of(45), message)); + inbox); listener.event(addedEvent); @@ -265,13 +262,11 @@ public class SpamAssassinListenerTest { @Test public void eventShouldNotCallSpamAssassinHamLearningWhenTheMessageIsAddedInAMailboxOtherThanInbox() { SimpleMailboxMessage message = createMessage(mailboxId1); - EventFactory eventFactory = new EventFactory(); - AddedImpl addedEvent = eventFactory.new AddedImpl( - MAILBOX_SESSION.getSessionId(), - MAILBOX_SESSION.getUser().getCoreUser(), - mailbox1, - ImmutableSortedMap.of(MessageUid.of(45), new SimpleMessageMetaData(message)), - ImmutableMap.of(MessageUid.of(45), message)); + + MailboxListener.Added addedEvent = new EventFactory().added( + MAILBOX_SESSION, + ImmutableSortedMap.of(MessageUid.of(45), new SimpleMessageMetaData(message)), + inbox); listener.event(addedEvent); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
