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 5aa886c98ab4e56fbc6ab8ca44c4b651b06ae6a8 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Nov 15 15:27:39 2019 +0700 [Refactroing] IMAP mocked test fixes --- .../apache/james/imap/processor/CopyProcessorTest.java | 14 +++++++++----- .../apache/james/imap/processor/MoveProcessorTest.java | 15 +++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java index c4ff836..daaa386 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java @@ -49,9 +49,9 @@ import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.Mailbox; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageRange; -import org.apache.james.mailbox.store.MailboxMetaData; import org.apache.james.metrics.api.NoopMetricFactory; import org.junit.Before; import org.junit.Test; @@ -97,7 +97,9 @@ public class CopyProcessorTest { when(mockMailboxManager.mailboxExists(inbox, mailboxSession)).thenReturn(true); MessageManager targetMessageManager = mock(MessageManager.class); when(mockMailboxManager.getMailbox(inbox, mailboxSession)).thenReturn(targetMessageManager); - when(targetMessageManager.getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_UNSEEN)).thenReturn(new MailboxMetaData(null, null, 58L, MessageUid.of(18), 8L, 8L, 8L, MessageUid.of(8), true, true, null)); + Mailbox mailbox = mock(Mailbox.class); + when(mailbox.getUidValidity()).thenReturn(58L); + when(targetMessageManager.getMailboxEntity()).thenReturn(mailbox); StatusResponse okResponse = mock(StatusResponse.class); when(mockStatusResponseFactory.taggedOk(any(Tag.class), any(ImapCommand.class), any(HumanReadableText.class), any(StatusResponse.ResponseCode.class))).thenReturn(okResponse); when(mockMailboxManager.moveMessages(MessageRange.range(MessageUid.of(4), MessageUid.of(6)), selected, inbox, mailboxSession)).thenReturn(Lists.<MessageRange>newArrayList(MessageRange.range(MessageUid.of(4), MessageUid.of(6)))); @@ -109,7 +111,7 @@ public class CopyProcessorTest { verify(mockMailboxManager).mailboxExists(inbox, mailboxSession); verify(mockMailboxManager).getMailbox(inbox, mailboxSession); verify(mockMailboxManager).copyMessages(MessageRange.range(MessageUid.of(4), MessageUid.of(6)), selected, inbox, mailboxSession); - verify(targetMessageManager).getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_UNSEEN); + verify(targetMessageManager).getMailboxEntity(); verify(mockResponder).respond(okResponse); verifyNoMoreInteractions(mockMailboxManager, targetMessageManager, mockResponder, mockNextProcessor); } @@ -131,7 +133,9 @@ public class CopyProcessorTest { when(mockMailboxManager.mailboxExists(inbox, mailboxSession)).thenReturn(true); MessageManager targetMessageManager = mock(MessageManager.class); when(mockMailboxManager.getMailbox(inbox, mailboxSession)).thenReturn(targetMessageManager); - when(targetMessageManager.getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_UNSEEN)).thenReturn(new MailboxMetaData(null, null, 58L, MessageUid.of(18), 8L, 8L, 8L, MessageUid.of(8), true, true, null)); + Mailbox mailbox = mock(Mailbox.class); + when(mailbox.getUidValidity()).thenReturn(58L); + when(targetMessageManager.getMailboxEntity()).thenReturn(mailbox); StatusResponse okResponse = mock(StatusResponse.class); when(mockStatusResponseFactory.taggedOk(any(Tag.class), any(ImapCommand.class), any(HumanReadableText.class), any(StatusResponse.ResponseCode.class))).thenReturn(okResponse); @@ -143,7 +147,7 @@ public class CopyProcessorTest { verify(mockMailboxManager).getMailbox(inbox, mailboxSession); verify(mockMailboxManager).copyMessages(MessageRange.range(MessageUid.of(5), MessageUid.of(6)), selected, inbox, mailboxSession); verify(mockMailboxManager).copyMessages(MessageRange.range(MessageUid.of(1), MessageUid.of(3)), selected, inbox, mailboxSession); - verify(targetMessageManager).getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_UNSEEN); + verify(targetMessageManager).getMailboxEntity(); verify(mockResponder).respond(okResponse); verifyNoMoreInteractions(mockMailboxManager, targetMessageManager, mockResponder, mockNextProcessor); } diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java index 22296e8..d24ac86 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java @@ -52,6 +52,7 @@ import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.Mailbox; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.store.MailboxMetaData; @@ -114,8 +115,9 @@ public class MoveProcessorTest { when(mockMailboxManager.mailboxExists(inbox, mailboxSession)).thenReturn(true); MessageManager targetMessageManager = mock(MessageManager.class); when(mockMailboxManager.getMailbox(inbox, mailboxSession)).thenReturn(targetMessageManager); - when(targetMessageManager.getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_UNSEEN)) - .thenReturn(new MailboxMetaData(null, null, 58L, MessageUid.of(18), 8L, 8L, 8L, MessageUid.of(8), true, true, null)); + Mailbox mailbox = mock(Mailbox.class); + when(mailbox.getUidValidity()).thenReturn(58L); + when(targetMessageManager.getMailboxEntity()).thenReturn(mailbox); StatusResponse okResponse = mock(StatusResponse.class); when(mockStatusResponseFactory.taggedOk(any(Tag.class), any(ImapCommand.class), any(HumanReadableText.class), any(StatusResponse.ResponseCode.class))).thenReturn(okResponse); when(mockMailboxManager.moveMessages(MessageRange.range(MessageUid.of(4), MessageUid.of(6)), selected, inbox, mailboxSession)) @@ -128,7 +130,7 @@ public class MoveProcessorTest { verify(mockMailboxManager).mailboxExists(inbox, mailboxSession); verify(mockMailboxManager).getMailbox(inbox, mailboxSession); verify(mockMailboxManager).moveMessages(MessageRange.range(MessageUid.of(4), MessageUid.of(6)), selected, inbox, mailboxSession); - verify(targetMessageManager).getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_UNSEEN); + verify(targetMessageManager).getMailboxEntity(); verify(mockResponder).respond(okResponse); verifyNoMoreInteractions(mockMailboxManager, targetMessageManager, mockResponder, mockNextProcessor); } @@ -150,8 +152,9 @@ public class MoveProcessorTest { when(mockMailboxManager.mailboxExists(inbox, mailboxSession)).thenReturn(true); MessageManager targetMessageManager = mock(MessageManager.class); when(mockMailboxManager.getMailbox(inbox, mailboxSession)).thenReturn(targetMessageManager); - when(targetMessageManager.getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_UNSEEN)) - .thenReturn(new MailboxMetaData(null, null, 58L, MessageUid.of(18), 8L, 8L, 8L, MessageUid.of(8), true, true, null)); + Mailbox mailbox = mock(Mailbox.class); + when(mailbox.getUidValidity()).thenReturn(58L); + when(targetMessageManager.getMailboxEntity()).thenReturn(mailbox); StatusResponse okResponse = mock(StatusResponse.class); when(mockStatusResponseFactory.taggedOk(any(Tag.class), any(ImapCommand.class), any(HumanReadableText.class), any(StatusResponse.ResponseCode.class))).thenReturn(okResponse); @@ -163,7 +166,7 @@ public class MoveProcessorTest { verify(mockMailboxManager).getMailbox(inbox, mailboxSession); verify(mockMailboxManager).moveMessages(MessageRange.range(MessageUid.of(5), MessageUid.of(6)), selected, inbox, mailboxSession); verify(mockMailboxManager).moveMessages(MessageRange.range(MessageUid.of(1), MessageUid.of(3)), selected, inbox, mailboxSession); - verify(targetMessageManager).getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_UNSEEN); + verify(targetMessageManager).getMailboxEntity(); verify(mockResponder).respond(okResponse); verifyNoMoreInteractions(mockMailboxManager, targetMessageManager, mockResponder, mockNextProcessor); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
