JAMES-1888: Add more mailbox4 for testing which belong to another session
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/82f4b30d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/82f4b30d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/82f4b30d Branch: refs/heads/master Commit: 82f4b30d26e54c9cb69e0dc515a74c00311b1528 Parents: 27f1e48 Author: Quynh Nguyen <qngu...@linagora.com> Authored: Mon Dec 19 16:33:05 2016 +0700 Committer: Quynh Nguyen <qngu...@linagora.com> Committed: Wed Dec 21 09:08:18 2016 +0700 ---------------------------------------------------------------------- .../inmemory/InMemoryMessageIdManagerTestSystem.java | 4 ++-- .../inmemory/MessageIdManagerTestSystemProvider.java | 14 ++++++-------- .../mailbox/store/MessageIdManagerTestSystem.java | 12 +++++++----- .../store/StoreMessageIdManagerSideEffectTest.java | 8 ++++++-- .../store/StoreMessageIdManagerTestSystem.java | 4 ++-- .../store/TestMailboxSessionMapperFactory.java | 6 ++++++ 6 files changed, 29 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/82f4b30d/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java index 6c6b271..466d698 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java @@ -50,8 +50,8 @@ public class InMemoryMessageIdManagerTestSystem extends MessageIdManagerTestSyst private Optional<MessageId> lastMessageIdUsed; public InMemoryMessageIdManagerTestSystem(MailboxManager mailboxManager, MailboxSession mailboxSession, - Mailbox mailbox1, Mailbox mailbox2, Mailbox mailbox3) { - super(new InMemoryMessageIdManager(mailboxManager), mailboxSession, mailbox1, mailbox2, mailbox3); + Mailbox mailbox1, Mailbox mailbox2, Mailbox mailbox3, Mailbox mailbox4) { + super(new InMemoryMessageIdManager(mailboxManager), mailboxSession, mailbox1, mailbox2, mailbox3, mailbox4); this.mailboxManager = mailboxManager; this.mailboxSession = mailboxSession; this.lastMessageIdUsed = Optional.absent(); http://git-wip-us.apache.org/repos/asf/james-project/blob/82f4b30d/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java index 7049360..206c0d3 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MessageIdManagerTestSystemProvider.java @@ -44,6 +44,7 @@ public class MessageIdManagerTestSystemProvider { private static final int UID_VALIDITY = 1024; private static final Logger LOGGER = LoggerFactory.getLogger(InMemoryMessageIdManagerStorageTest.class); private static final String USER = "user"; + private static final String OTHER_USER = "otheruser"; private static final String PASSWORD = "password"; public static MessageIdManagerTestSystem createTestingData() { @@ -56,17 +57,13 @@ public class MessageIdManagerTestSystemProvider { SimpleMailbox mailbox2 = createMailbox(mailboxManager, mailboxPath2, mailboxSession); MailboxPath mailboxPath3 = new MailboxPath("#private", USER, "mailbox3"); SimpleMailbox mailbox3 = createMailbox(mailboxManager, mailboxPath3, mailboxSession); - return new InMemoryMessageIdManagerTestSystem(mailboxManager, mailboxSession, mailbox1, mailbox2, mailbox3); + MailboxPath mailboxPath4 = new MailboxPath("#public", OTHER_USER, "mailbox4"); + SimpleMailbox mailbox4 = createMailbox(mailboxManager, mailboxPath4, mailboxSession); + return new InMemoryMessageIdManagerTestSystem(mailboxManager, mailboxSession, mailbox1, mailbox2, mailbox3, mailbox4); } private static MailboxSession createMailboxSession(InMemoryMailboxManager mailboxManager) { - try { - return mailboxManager.login(USER, PASSWORD, LOGGER); - } catch (BadCredentialsException e) { - throw Throwables.propagate(e); - } catch (MailboxException e) { - throw Throwables.propagate(e); - } + return mailboxManager.createSystemSession(USER, LOGGER); } private static SimpleMailbox createMailbox(InMemoryMailboxManager mailboxManager, MailboxPath mailboxPath, MailboxSession mailboxSession) { @@ -88,6 +85,7 @@ public class MessageIdManagerTestSystemProvider { MessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); FakeAuthenticator authenticator = new FakeAuthenticator(); authenticator.addUser(USER, PASSWORD); + authenticator.addUser(OTHER_USER, PASSWORD); InMemoryMailboxManager mailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, authenticator, aclResolver, groupMembershipResolver, messageParser, messageIdFactory, LIMIT_ANNOTATIONS, LIMIT_ANNOTATION_SIZE); http://git-wip-us.apache.org/repos/asf/james-project/blob/82f4b30d/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java index b57aff1..06f1a1e 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java @@ -35,24 +35,22 @@ public abstract class MessageIdManagerTestSystem { private final Mailbox mailbox1; private final Mailbox mailbox2; private final Mailbox mailbox3; + private final Mailbox mailbox4; public MessageIdManagerTestSystem(MessageIdManager messageIdManager, MailboxSession session, - Mailbox mailbox1, Mailbox mailbox2, Mailbox mailbox3) { + Mailbox mailbox1, Mailbox mailbox2, Mailbox mailbox3, Mailbox mailbox4) { this.messageIdManager = messageIdManager; this.session = session; this.mailbox1 = mailbox1; this.mailbox2 = mailbox2; this.mailbox3 = mailbox3; + this.mailbox4 = mailbox4; } public MessageIdManager getMessageIdManager() { return messageIdManager; } - public MailboxSession getSession() { - return session; - } - public Mailbox getMailbox1() { return mailbox1; } @@ -65,6 +63,10 @@ public abstract class MessageIdManagerTestSystem { return mailbox3; } + public Mailbox getMailbox4() { + return mailbox4; + } + /** * Should take care of find returning the MailboxMessage * Should take care of findMailboxes returning the mailbox the message is in http://git-wip-us.apache.org/repos/asf/james-project/blob/82f4b30d/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java index d397526..bfc0f93 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java @@ -37,8 +37,12 @@ public class StoreMessageIdManagerSideEffectTest extends AbstractMessageIdManage MessageIdManager messageIdManager = new StoreMessageIdManager(testMailboxSessionMapperFactory, dispatcher, messageIdFactory, quotaManager, new DefaultQuotaRootResolver(testMailboxSessionMapperFactory)); - return new StoreMessageIdManagerTestSystem(messageIdManager, testMailboxSessionMapperFactory.getMailbox1(), - testMailboxSessionMapperFactory.getMailbox2(), testMailboxSessionMapperFactory.getMailbox3(), messageIdFactory, + return new StoreMessageIdManagerTestSystem(messageIdManager, + testMailboxSessionMapperFactory.getMailbox1(), + testMailboxSessionMapperFactory.getMailbox2(), + testMailboxSessionMapperFactory.getMailbox3(), + testMailboxSessionMapperFactory.getMailbox4(), + messageIdFactory, testMailboxSessionMapperFactory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/82f4b30d/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java index ea946a1..a5cd64e 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java @@ -47,9 +47,9 @@ public class StoreMessageIdManagerTestSystem extends MessageIdManagerTestSystem private final MessageId.Factory messageIdFactory; private final TestMailboxSessionMapperFactory mapperFactory; - public StoreMessageIdManagerTestSystem(MessageIdManager messageIdManager, Mailbox mailbox1, Mailbox mailbox2, Mailbox mailbox3, + public StoreMessageIdManagerTestSystem(MessageIdManager messageIdManager, Mailbox mailbox1, Mailbox mailbox2, Mailbox mailbox3, Mailbox mailbox4, MessageId.Factory messageIdFactory, TestMailboxSessionMapperFactory mapperFactory) { - super(messageIdManager, EMPTY_MAILBOX_SESSION, mailbox1, mailbox2, mailbox3); + super(messageIdManager, EMPTY_MAILBOX_SESSION, mailbox1, mailbox2, mailbox3, mailbox4); this.messageIdFactory = messageIdFactory; this.mapperFactory = mapperFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/82f4b30d/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java index 531bd8e..9e8e236 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java @@ -69,6 +69,7 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory private final SimpleMailbox mailbox1; private final SimpleMailbox mailbox2; private final SimpleMailbox mailbox3; + private final SimpleMailbox mailbox4; private final List<MailboxMessage> messages = new ArrayList<MailboxMessage>(); private final MailboxMapper mailboxMapper; private final MessageIdMapper messageIdMapper; @@ -77,6 +78,7 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory mailbox1 = new SimpleMailbox(new MailboxPath("#private", "user", "INBOX"), UID_VALIDITY, TestId.of(36)); mailbox2 = new SimpleMailbox(new MailboxPath("#private", "user", "OUTBOX"), UID_VALIDITY, TestId.of(46)); mailbox3 = new SimpleMailbox(new MailboxPath("#private", "user", "SENT"), UID_VALIDITY, TestId.of(56)); + mailbox4 = new SimpleMailbox(new MailboxPath("#public", "otheruser", "INBOX"), UID_VALIDITY, TestId.of(66)); mailboxMapper = new MailboxMapper() { @Override @@ -207,6 +209,10 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory return mailbox3; } + public SimpleMailbox getMailbox4() { + return mailbox4; + } + @Override public UidProvider getUidProvider() { UidProvider uidProvider = mock(UidProvider.class); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
