JAMES-2186 Use more explicit naming for mailboxFixture Featuring ALICE BOB and CEDRIC
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b3d89ac4 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b3d89ac4 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b3d89ac4 Branch: refs/heads/master Commit: b3d89ac4cb1d76dc40240f13f1a2b30bb0dcd84d Parents: 62bdbd7 Author: benwa <btell...@linagora.com> Authored: Thu Oct 19 09:26:55 2017 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Fri Oct 20 12:34:52 2017 +0200 ---------------------------------------------------------------------- .../james/mailbox/fixture/MailboxFixture.java | 14 +++---- .../store/AbstractCombinationManagerTest.java | 12 +++--- .../AbstractMessageIdManagerQuotaTest.java | 10 +++-- .../AbstractMessageIdManagerSideEffectTest.java | 10 +++-- .../AbstractMessageIdManagerStorageTest.java | 42 +++++++++---------- .../store/AbstractMessageManagerTest.java | 44 ++++++++++---------- .../mailbox/store/StoreMessageManagerTest.java | 28 ++++++------- .../store/TestMailboxSessionMapperFactory.java | 22 +++++----- .../utils/SystemMailboxesProviderImplTest.java | 6 +-- 9 files changed, 95 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java b/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java index ea02227..ea04390 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java @@ -22,12 +22,12 @@ package org.apache.james.mailbox.fixture; import org.apache.james.mailbox.model.MailboxPath; public class MailboxFixture { - public static final String USER = "user"; - public static final String OTHER_USER = "otheruser"; - public static final String THIRD_USER = "thirdUser"; + public static final String ALICE = "alice"; + public static final String BOB = "bob"; + public static final String CEDRIC = "cedric"; - public static final MailboxPath MAILBOX_PATH1 = MailboxPath.forUser(USER, "INBOX"); - public static final MailboxPath MAILBOX_PATH2 = MailboxPath.forUser(USER, "OUTBOX"); - public static final MailboxPath MAILBOX_PATH3 = MailboxPath.forUser(USER, "SENT"); - public static final MailboxPath MAILBOX_PATH4 = MailboxPath.forUser(OTHER_USER, "INBOX"); + public static final MailboxPath INBOX_ALICE = MailboxPath.forUser(ALICE, "INBOX"); + public static final MailboxPath OUTBOX_ALICE = MailboxPath.forUser(ALICE, "OUTBOX"); + public static final MailboxPath SENT_ALICE = MailboxPath.forUser(ALICE, "SENT"); + public static final MailboxPath INBOX_BOB = MailboxPath.forUser(BOB, "INBOX"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java index 8f74c76..f4f4c99 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java @@ -77,11 +77,11 @@ public abstract class AbstractCombinationManagerTest { public abstract CombinationManagerTestSystem createTestingData() throws Exception ; public void setUp() throws Exception { - session = new MockMailboxSession(MailboxFixture.USER); + session = new MockMailboxSession(MailboxFixture.ALICE); testingData = createTestingData(); - mailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH1, session); - mailbox2 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH2, session); + mailbox1 = testingData.createMailbox(MailboxFixture.INBOX_ALICE, session); + mailbox2 = testingData.createMailbox(MailboxFixture.OUTBOX_ALICE, session); mailboxManager = testingData.getMailboxManager(); messageIdManager = testingData.getMessageIdManager(); @@ -117,7 +117,7 @@ public abstract class AbstractCombinationManagerTest { query.andCriteria(SearchQuery.all()); MailboxQuery mailboxQuery = MailboxQuery.privateMailboxesBuilder(session) - .expression(new PrefixedWildcard(MailboxFixture.MAILBOX_PATH1.getName())) + .expression(new PrefixedWildcard(MailboxFixture.INBOX_ALICE.getName())) .build(); MessageId messageId = messageManager1.appendMessage(new ByteArrayInputStream(MAIL_CONTENT), new Date(), session, false, FLAGS).getMessageId(); @@ -216,7 +216,7 @@ public abstract class AbstractCombinationManagerTest { public void getMessageFromMessageIdManagerShouldReturnMessageWhenCopyMessageWithMailboxPathFromMailboxManager() throws Exception { MessageId messageId = messageManager1.appendMessage(new ByteArrayInputStream(MAIL_CONTENT), new Date(), session, false, FLAGS).getMessageId(); - mailboxManager.copyMessages(MessageRange.all(), MailboxFixture.MAILBOX_PATH1, MailboxFixture.MAILBOX_PATH2, session); + mailboxManager.copyMessages(MessageRange.all(), MailboxFixture.INBOX_ALICE, MailboxFixture.OUTBOX_ALICE, session); List<MessageResult> listMessages = messageIdManager.getMessages(ImmutableList.of(messageId), FetchGroupImpl.MINIMAL, session); @@ -229,7 +229,7 @@ public abstract class AbstractCombinationManagerTest { public void getMessageFromMessageIdManagerShouldReturnMessageWhenMoveMessageWithMailboxIdFromMailboxManager() throws Exception { MessageId messageId = messageManager1.appendMessage(new ByteArrayInputStream(MAIL_CONTENT), new Date(), session, false, FLAGS).getMessageId(); - mailboxManager.moveMessages(MessageRange.all(), MailboxFixture.MAILBOX_PATH1, MailboxFixture.MAILBOX_PATH2, session); + mailboxManager.moveMessages(MessageRange.all(), MailboxFixture.INBOX_ALICE, MailboxFixture.OUTBOX_ALICE, session); List<MessageResult> listMessages = messageIdManager.getMessages(ImmutableList.of(messageId), FetchGroupImpl.MINIMAL, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java index 95e1bbf..14eb69d 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java @@ -19,6 +19,8 @@ package org.apache.james.mailbox.store; +import static org.apache.james.mailbox.fixture.MailboxFixture.ALICE; + import javax.mail.Flags; import org.apache.james.mailbox.MailboxSession; @@ -67,13 +69,13 @@ public abstract class AbstractMessageIdManagerQuotaTest { CurrentQuotaManager currentQuotaManager = createCurrentQuotaManager(); QuotaManager quotaManager = createQuotaManager(maxQuotaManager, currentQuotaManager); - session = new MockMailboxSession("user"); + session = new MockMailboxSession(ALICE); testingData = createTestSystem(quotaManager, currentQuotaManager); messageIdManager = testingData.getMessageIdManager(); - mailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH1, session); - mailbox2 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH2, session); - mailbox3 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH3, session); + mailbox1 = testingData.createMailbox(MailboxFixture.INBOX_ALICE, session); + mailbox2 = testingData.createMailbox(MailboxFixture.OUTBOX_ALICE, session); + mailbox3 = testingData.createMailbox(MailboxFixture.SENT_ALICE, session); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java index f16ee1e..9c38138 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java @@ -29,6 +29,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import static org.apache.james.mailbox.fixture.MailboxFixture.ALICE; + import java.util.List; import javax.mail.Flags; @@ -84,13 +86,13 @@ public abstract class AbstractMessageIdManagerSideEffectTest { dispatcher = mock(MailboxEventDispatcher.class); quotaManager = mock(QuotaManager.class); - session = new MockMailboxSession("user"); + session = new MockMailboxSession(ALICE); testingData = createTestSystem(quotaManager, dispatcher); messageIdManager = testingData.getMessageIdManager(); - mailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH1, session); - mailbox2 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH2, session); - mailbox3 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH3, session); + mailbox1 = testingData.createMailbox(MailboxFixture.INBOX_ALICE, session); + mailbox2 = testingData.createMailbox(MailboxFixture.OUTBOX_ALICE, session); + mailbox3 = testingData.createMailbox(MailboxFixture.SENT_ALICE, session); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java index d0e0cdb..772df77 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java @@ -72,16 +72,16 @@ public abstract class AbstractMessageIdManagerStorageTest { protected abstract MessageIdManagerTestSystem createTestingData() throws Exception; public void setUp() throws Exception { - aliceSession = new MockMailboxSession(MailboxFixture.USER); - bobSession = new MockMailboxSession(MailboxFixture.OTHER_USER); + aliceSession = new MockMailboxSession(MailboxFixture.ALICE); + bobSession = new MockMailboxSession(MailboxFixture.BOB); systemSession = new MockMailboxSession("systemuser", SessionType.System); testingData = createTestingData(); messageIdManager = testingData.getMessageIdManager(); - aliceMailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH1, aliceSession); - aliceMailbox2 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH2, aliceSession); - aliceMailbox3 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH3, aliceSession); - bobMailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH4, bobSession); + aliceMailbox1 = testingData.createMailbox(MailboxFixture.INBOX_ALICE, aliceSession); + aliceMailbox2 = testingData.createMailbox(MailboxFixture.OUTBOX_ALICE, aliceSession); + aliceMailbox3 = testingData.createMailbox(MailboxFixture.SENT_ALICE, aliceSession); + bobMailbox1 = testingData.createMailbox(MailboxFixture.INBOX_BOB, bobSession); } @Test @@ -542,7 +542,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read)) .asAddition()), aliceSession); @@ -561,7 +561,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(MailboxACL.Rfc4314Rights.allExcept(MailboxACL.Right.Read)) .asAddition()), aliceSession); @@ -578,7 +578,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(new MailboxACL.Rfc4314Rights(MailboxACL.Right.Write)) .asAddition()), aliceSession); @@ -599,7 +599,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(MailboxACL.Rfc4314Rights.allExcept(MailboxACL.Right.Write)) .asAddition()), aliceSession); @@ -622,7 +622,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read)) .asAddition()), aliceSession); @@ -647,7 +647,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(MailboxACL.Rfc4314Rights.allExcept(MailboxACL.Right.Read)) .asAddition()), aliceSession); @@ -675,7 +675,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(new MailboxACL.Rfc4314Rights(MailboxACL.Right.Insert, MailboxACL.Right.Read)) .asAddition()), aliceSession); @@ -703,7 +703,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(MailboxACL.Rfc4314Rights.allExcept(MailboxACL.Right.Insert)) .asAddition()), aliceSession); @@ -735,7 +735,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(new MailboxACL.Rfc4314Rights(MailboxACL.Right.Lookup, MailboxACL.Right.Read, MailboxACL.Right.DeleteMessages)) .asAddition()), aliceSession); @@ -763,7 +763,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(MailboxACL.Rfc4314Rights.allExcept(MailboxACL.Right.DeleteMessages)) .asAddition()), aliceSession); @@ -795,7 +795,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox2.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(MailboxACL.FULL_RIGHTS) .asAddition()), aliceSession); @@ -836,7 +836,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read, MailboxACL.Right.Lookup, MailboxACL.Right.DeleteMessages)) .asAddition()), aliceSession); @@ -854,7 +854,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(MailboxACL.Rfc4314Rights.allExcept(MailboxACL.Right.DeleteMessages)) .asAddition()), aliceSession); @@ -875,7 +875,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read, MailboxACL.Right.Lookup)) .asAddition()), aliceSession); @@ -892,7 +892,7 @@ public abstract class AbstractMessageIdManagerStorageTest { testingData.setACL(aliceMailbox1.getMailboxId(), MailboxACL.EMPTY.apply( MailboxACL.command() - .forUser(MailboxFixture.OTHER_USER) + .forUser(MailboxFixture.BOB) .rights(MailboxACL.Rfc4314Rights.allExcept(MailboxACL.Right.Read)) .asAddition()), aliceSession); http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java index 43ac287..ee69a00 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java @@ -19,10 +19,10 @@ package org.apache.james.mailbox.store; -import static org.apache.james.mailbox.fixture.MailboxFixture.MAILBOX_PATH1; -import static org.apache.james.mailbox.fixture.MailboxFixture.OTHER_USER; -import static org.apache.james.mailbox.fixture.MailboxFixture.THIRD_USER; -import static org.apache.james.mailbox.fixture.MailboxFixture.USER; +import static org.apache.james.mailbox.fixture.MailboxFixture.ALICE; +import static org.apache.james.mailbox.fixture.MailboxFixture.BOB; +import static org.apache.james.mailbox.fixture.MailboxFixture.CEDRIC; +import static org.apache.james.mailbox.fixture.MailboxFixture.INBOX_ALICE; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.mailbox.MailboxManager; @@ -39,41 +39,41 @@ public abstract class AbstractMessageManagerTest { private MessageManagerTestSystem testSystem; private MailboxManager mailboxManager; - private MailboxSession session; - private MailboxSession otherSession; + private MailboxSession aliceSession; + private MailboxSession bobSession; protected abstract MessageManagerTestSystem createTestSystem() throws Exception; public void setUp() throws Exception { - session = new MockMailboxSession(USER); - otherSession = new MockMailboxSession(OTHER_USER); + aliceSession = new MockMailboxSession(ALICE); + bobSession = new MockMailboxSession(BOB); testSystem = createTestSystem(); mailboxManager = testSystem.getMailboxManager(); - testSystem.createMailbox(MAILBOX_PATH1, session); - testSystem.createMailbox(MailboxFixture.MAILBOX_PATH2, session); - testSystem.createMailbox(MailboxFixture.MAILBOX_PATH3, session); - testSystem.createMailbox(MailboxFixture.MAILBOX_PATH4, otherSession); + testSystem.createMailbox(INBOX_ALICE, aliceSession); + testSystem.createMailbox(MailboxFixture.OUTBOX_ALICE, aliceSession); + testSystem.createMailbox(MailboxFixture.SENT_ALICE, aliceSession); + testSystem.createMailbox(MailboxFixture.INBOX_BOB, bobSession); } @Test public void getMetadataShouldListUsersAclWhenShared() throws Exception { - mailboxManager.applyRightsCommand(MAILBOX_PATH1, MailboxACL.command().forUser(OTHER_USER).rights(MailboxACL.Right.Read).asAddition(), session); - mailboxManager.applyRightsCommand(MAILBOX_PATH1, MailboxACL.command().forUser(THIRD_USER).rights(MailboxACL.Right.Read).asAddition(), session); - MessageManager messageManager = mailboxManager.getMailbox(MAILBOX_PATH1, session); + mailboxManager.applyRightsCommand(INBOX_ALICE, MailboxACL.command().forUser(BOB).rights(MailboxACL.Right.Read).asAddition(), aliceSession); + mailboxManager.applyRightsCommand(INBOX_ALICE, MailboxACL.command().forUser(CEDRIC).rights(MailboxACL.Right.Read).asAddition(), aliceSession); + MessageManager messageManager = mailboxManager.getMailbox(INBOX_ALICE, aliceSession); - MessageManager.MetaData actual = messageManager.getMetaData(NO_RESET_RECENT, session, MessageManager.MetaData.FetchGroup.NO_COUNT); - assertThat(actual.getACL().getEntries()).containsKeys(MailboxACL.EntryKey.createUserEntryKey(OTHER_USER), MailboxACL.EntryKey.createUserEntryKey(THIRD_USER)); + MessageManager.MetaData actual = messageManager.getMetaData(NO_RESET_RECENT, aliceSession, MessageManager.MetaData.FetchGroup.NO_COUNT); + assertThat(actual.getACL().getEntries()).containsKeys(MailboxACL.EntryKey.createUserEntryKey(BOB), MailboxACL.EntryKey.createUserEntryKey(CEDRIC)); } @Test public void getMetadataShouldNotExposeOtherUsersWhenSessionIsNotOwner() throws Exception { - mailboxManager.applyRightsCommand(MAILBOX_PATH1, MailboxACL.command().forUser(OTHER_USER).rights(MailboxACL.Right.Read).asAddition(), session); - mailboxManager.applyRightsCommand(MAILBOX_PATH1, MailboxACL.command().forUser(THIRD_USER).rights(MailboxACL.Right.Read).asAddition(), session); - MessageManager messageManager = mailboxManager.getMailbox(MAILBOX_PATH1, session); + mailboxManager.applyRightsCommand(INBOX_ALICE, MailboxACL.command().forUser(BOB).rights(MailboxACL.Right.Read).asAddition(), aliceSession); + mailboxManager.applyRightsCommand(INBOX_ALICE, MailboxACL.command().forUser(CEDRIC).rights(MailboxACL.Right.Read).asAddition(), aliceSession); + MessageManager messageManager = mailboxManager.getMailbox(INBOX_ALICE, aliceSession); - MessageManager.MetaData actual = messageManager.getMetaData(NO_RESET_RECENT, otherSession, MessageManager.MetaData.FetchGroup.NO_COUNT); - assertThat(actual.getACL().getEntries()).containsOnlyKeys(MailboxACL.EntryKey.createUserEntryKey(OTHER_USER)); + MessageManager.MetaData actual = messageManager.getMetaData(NO_RESET_RECENT, bobSession, MessageManager.MetaData.FetchGroup.NO_COUNT); + assertThat(actual.getACL().getEntries()).containsOnlyKeys(MailboxACL.EntryKey.createUserEntryKey(BOB)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageManagerTest.java index a32c27c..54daae9 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageManagerTest.java @@ -19,10 +19,10 @@ package org.apache.james.mailbox.store; -import static org.apache.james.mailbox.fixture.MailboxFixture.MAILBOX_PATH1; -import static org.apache.james.mailbox.fixture.MailboxFixture.OTHER_USER; -import static org.apache.james.mailbox.fixture.MailboxFixture.THIRD_USER; -import static org.apache.james.mailbox.fixture.MailboxFixture.USER; +import static org.apache.james.mailbox.fixture.MailboxFixture.ALICE; +import static org.apache.james.mailbox.fixture.MailboxFixture.BOB; +import static org.apache.james.mailbox.fixture.MailboxFixture.CEDRIC; +import static org.apache.james.mailbox.fixture.MailboxFixture.INBOX_ALICE; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.mailbox.exception.UnsupportedRightException; @@ -39,30 +39,30 @@ public class StoreMessageManagerTest { @Test public void filteredForSessionShouldBeIdentityWhenOwner() throws UnsupportedRightException { MailboxACL acl = new MailboxACL() - .apply(MailboxACL.command().rights(Right.Read, Right.Write).forUser(OTHER_USER).asAddition()) - .apply(MailboxACL.command().rights(Right.Read, Right.Write, Right.Administer).forUser(THIRD_USER).asAddition()); + .apply(MailboxACL.command().rights(Right.Read, Right.Write).forUser(BOB).asAddition()) + .apply(MailboxACL.command().rights(Right.Read, Right.Write, Right.Administer).forUser(CEDRIC).asAddition()); MailboxACL actual = StoreMessageManager.filteredForSession( - new SimpleMailbox(MAILBOX_PATH1, UID_VALIDITY), acl, new MockMailboxSession(USER)); + new SimpleMailbox(INBOX_ALICE, UID_VALIDITY), acl, new MockMailboxSession(ALICE)); assertThat(actual).isEqualTo(acl); } @Test public void filteredForSessionShouldBeIdentityWhenAdmin() throws UnsupportedRightException { MailboxACL acl = new MailboxACL() - .apply(MailboxACL.command().rights(Right.Read, Right.Write).forUser(OTHER_USER).asAddition()) - .apply(MailboxACL.command().rights(Right.Read, Right.Write, Right.Administer).forUser(THIRD_USER).asAddition()); + .apply(MailboxACL.command().rights(Right.Read, Right.Write).forUser(BOB).asAddition()) + .apply(MailboxACL.command().rights(Right.Read, Right.Write, Right.Administer).forUser(CEDRIC).asAddition()); MailboxACL actual = StoreMessageManager.filteredForSession( - new SimpleMailbox(MAILBOX_PATH1, UID_VALIDITY), acl, new MockMailboxSession(THIRD_USER)); + new SimpleMailbox(INBOX_ALICE, UID_VALIDITY), acl, new MockMailboxSession(CEDRIC)); assertThat(actual).isEqualTo(acl); } @Test public void filteredForSessionShouldContainOnlyLoggedUserWhenReadWriteAccess() throws UnsupportedRightException { MailboxACL acl = new MailboxACL() - .apply(MailboxACL.command().rights(Right.Read, Right.Write).forUser(OTHER_USER).asAddition()) - .apply(MailboxACL.command().rights(Right.Read, Right.Write, Right.Administer).forUser(THIRD_USER).asAddition()); + .apply(MailboxACL.command().rights(Right.Read, Right.Write).forUser(BOB).asAddition()) + .apply(MailboxACL.command().rights(Right.Read, Right.Write, Right.Administer).forUser(CEDRIC).asAddition()); MailboxACL actual = StoreMessageManager.filteredForSession( - new SimpleMailbox(MAILBOX_PATH1, UID_VALIDITY), acl, new MockMailboxSession(OTHER_USER)); - assertThat(actual.getEntries()).containsKey(MailboxACL.EntryKey.createUserEntryKey(OTHER_USER)); + new SimpleMailbox(INBOX_ALICE, UID_VALIDITY), acl, new MockMailboxSession(BOB)); + assertThat(actual.getEntries()).containsKey(MailboxACL.EntryKey.createUserEntryKey(BOB)); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/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 511cf27..8a29b5b 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 @@ -79,12 +79,10 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory private final MessageIdMapper messageIdMapper; public TestMailboxSessionMapperFactory() { - - - mailbox1 = new SimpleMailbox(MailboxFixture.MAILBOX_PATH1, UID_VALIDITY, TestId.of(36)); - mailbox2 = new SimpleMailbox(MailboxFixture.MAILBOX_PATH2, UID_VALIDITY, TestId.of(46)); - mailbox3 = new SimpleMailbox(MailboxFixture.MAILBOX_PATH3, UID_VALIDITY, TestId.of(56)); - mailbox4 = new SimpleMailbox(MailboxFixture.MAILBOX_PATH4, UID_VALIDITY, TestId.of(66)); + mailbox1 = new SimpleMailbox(MailboxFixture.INBOX_ALICE, UID_VALIDITY, TestId.of(36)); + mailbox2 = new SimpleMailbox(MailboxFixture.OUTBOX_ALICE, UID_VALIDITY, TestId.of(46)); + mailbox3 = new SimpleMailbox(MailboxFixture.SENT_ALICE, UID_VALIDITY, TestId.of(56)); + mailbox4 = new SimpleMailbox(MailboxFixture.INBOX_BOB, UID_VALIDITY, TestId.of(66)); mailboxMapper = new MailboxMapper() { @Override @@ -100,19 +98,19 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory @Override public Mailbox findMailboxByPath(MailboxPath mailboxName) throws MailboxException { - if (mailboxName.equals(MailboxFixture.MAILBOX_PATH1)) { + if (mailboxName.equals(MailboxFixture.INBOX_ALICE)) { return mailbox1; } - if (mailboxName.equals(MailboxFixture.MAILBOX_PATH2)) { + if (mailboxName.equals(MailboxFixture.OUTBOX_ALICE)) { return mailbox2; } - if (mailboxName.equals(MailboxFixture.MAILBOX_PATH3)) { + if (mailboxName.equals(MailboxFixture.SENT_ALICE)) { return mailbox3; } throw new IllegalArgumentException("Unknown mailbox : " + mailboxName + " must be one of " - + MailboxFixture.MAILBOX_PATH1 + " " - + MailboxFixture.MAILBOX_PATH2 + " " - + MailboxFixture.MAILBOX_PATH3); + + MailboxFixture.INBOX_ALICE + " " + + MailboxFixture.OUTBOX_ALICE + " " + + MailboxFixture.SENT_ALICE); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d89ac4/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java index 9756c58..e2ebc95 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java @@ -38,7 +38,7 @@ import org.junit.rules.ExpectedException; public class SystemMailboxesProviderImplTest { - private MailboxSession mailboxSession = new MockMailboxSession("user"); + private MailboxSession mailboxSession = new MockMailboxSession(MailboxFixture.ALICE); private SystemMailboxesProviderImpl systemMailboxProvider; private MailboxManager mailboxManager; @@ -59,14 +59,14 @@ public class SystemMailboxesProviderImplTest { @Test @SuppressWarnings("unchecked") public void getMailboxByRoleShouldReturnEmptyWhenNoMailbox() throws Exception { - when(mailboxManager.getMailbox(eq(MailboxFixture.MAILBOX_PATH1), eq(mailboxSession))).thenThrow(MailboxNotFoundException.class); + when(mailboxManager.getMailbox(eq(MailboxFixture.INBOX_ALICE), eq(mailboxSession))).thenThrow(MailboxNotFoundException.class); assertThat(systemMailboxProvider.getMailboxByRole(Role.INBOX, mailboxSession)).isEmpty(); } @Test public void getMailboxByRoleShouldReturnMailboxByRole() throws Exception { - when(mailboxManager.getMailbox(eq(MailboxFixture.MAILBOX_PATH1), eq(mailboxSession))).thenReturn(inboxMessageManager); + when(mailboxManager.getMailbox(eq(MailboxFixture.INBOX_ALICE), eq(mailboxSession))).thenReturn(inboxMessageManager); assertThat(systemMailboxProvider.getMailboxByRole(Role.INBOX, mailboxSession)) .hasSize(1) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
