JAMES-2169 move fixture to be able to use it widely
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d75d5653 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d75d5653 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d75d5653 Branch: refs/heads/master Commit: d75d5653b0a91d24cf356626b699640e29509d3c Parents: 2fdd0bf Author: Matthieu Baechler <[email protected]> Authored: Fri Sep 29 17:18:02 2017 +0200 Committer: benwa <[email protected]> Committed: Wed Oct 4 16:19:58 2017 +0700 ---------------------------------------------------------------------- .../james/mailbox/fixture/MailboxFixture.java | 34 ++++++++++++++++++++ .../mailbox/manager/MailboxManagerFixture.java | 34 -------------------- .../MessageIdManagerTestSystemProvider.java | 6 ++-- .../store/AbstractCombinationManagerTest.java | 16 ++++----- .../AbstractMessageIdManagerQuotaTest.java | 8 ++--- .../AbstractMessageIdManagerSideEffectTest.java | 8 ++--- .../AbstractMessageIdManagerStorageTest.java | 14 ++++---- .../store/TestMailboxSessionMapperFactory.java | 22 ++++++------- .../utils/SystemMailboxesProviderImplTest.java | 6 ++-- 9 files changed, 74 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/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 new file mode 100644 index 0000000..645a04a --- /dev/null +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/fixture/MailboxFixture.java @@ -0,0 +1,34 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.mailbox.fixture; + +import org.apache.james.mailbox.model.MailboxPath; + +public class MailboxFixture { + public static final String PRIVATE_NAMESPACE = "#private"; + + public static final String USER = "user"; + public static final String OTHER_USER = "otheruser"; + + public static final MailboxPath MAILBOX_PATH1 = new MailboxPath(PRIVATE_NAMESPACE, USER, "INBOX"); + public static final MailboxPath MAILBOX_PATH2 = new MailboxPath(PRIVATE_NAMESPACE, USER, "OUTBOX"); + public static final MailboxPath MAILBOX_PATH3 = new MailboxPath(PRIVATE_NAMESPACE, USER, "SENT"); + public static final MailboxPath MAILBOX_PATH4 = new MailboxPath(PRIVATE_NAMESPACE, OTHER_USER, "INBOX"); +} http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/mailbox/api/src/test/java/org/apache/james/mailbox/manager/MailboxManagerFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/MailboxManagerFixture.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/MailboxManagerFixture.java deleted file mode 100644 index 516e578..0000000 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/MailboxManagerFixture.java +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.mailbox.manager; - -import org.apache.james.mailbox.model.MailboxPath; - -public class MailboxManagerFixture { - public static final String PRIVATE_NAMESPACE = "#private"; - - public static final String USER = "user"; - public static final String OTHER_USER = "otheruser"; - - public static final MailboxPath MAILBOX_PATH1 = new MailboxPath(PRIVATE_NAMESPACE, USER, "INBOX"); - public static final MailboxPath MAILBOX_PATH2 = new MailboxPath(PRIVATE_NAMESPACE, USER, "OUTBOX"); - public static final MailboxPath MAILBOX_PATH3 = new MailboxPath(PRIVATE_NAMESPACE, USER, "SENT"); - public static final MailboxPath MAILBOX_PATH4 = new MailboxPath(PRIVATE_NAMESPACE, OTHER_USER, "INBOX"); -} http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/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 8b27c6a..e2ffe1f 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 @@ -23,7 +23,7 @@ import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.acl.UnionMailboxACLResolver; import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.manager.MailboxManagerFixture; +import org.apache.james.mailbox.fixture.MailboxFixture; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.store.FakeAuthenticator; import org.apache.james.mailbox.store.FakeAuthorizator; @@ -58,8 +58,8 @@ public class MessageIdManagerTestSystemProvider { MessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); FakeAuthenticator authenticator = new FakeAuthenticator(); FakeAuthorizator authorizator = FakeAuthorizator.defaultReject(); - authenticator.addUser(MailboxManagerFixture.USER, PASSWORD); - authenticator.addUser(MailboxManagerFixture.OTHER_USER, PASSWORD); + authenticator.addUser(MailboxFixture.USER, PASSWORD); + authenticator.addUser(MailboxFixture.OTHER_USER, PASSWORD); InMemoryMailboxManager mailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, authenticator, authorizator, aclResolver, groupMembershipResolver, messageParser, messageIdFactory, LIMIT_ANNOTATIONS, LIMIT_ANNOTATION_SIZE); http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/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 21dd3fb..6702724 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 @@ -36,7 +36,7 @@ import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageManager.FlagsUpdateMode; import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; import org.apache.james.mailbox.MessageUid; -import org.apache.james.mailbox.manager.MailboxManagerFixture; +import org.apache.james.mailbox.fixture.MailboxFixture; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.FetchGroupImpl; @@ -74,11 +74,11 @@ public abstract class AbstractCombinationManagerTest { public abstract CombinationManagerTestSystem createTestingData() throws Exception ; public void setUp() throws Exception { - session = new MockMailboxSession(MailboxManagerFixture.USER); + session = new MockMailboxSession(MailboxFixture.USER); testingData = createTestingData(); - mailbox1 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH1, session); - mailbox2 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH2, session); + mailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH1, session); + mailbox2 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH2, session); mailboxManager = testingData.getMailboxManager(); messageIdManager = testingData.getMessageIdManager(); @@ -114,7 +114,7 @@ public abstract class AbstractCombinationManagerTest { query.andCriteria(SearchQuery.all()); MailboxQuery mailboxQuery = MailboxQuery.builder() - .base(MailboxManagerFixture.MAILBOX_PATH1) + .base(MailboxFixture.MAILBOX_PATH1) .build(); MessageId messageId = messageManager1.appendMessage(new ByteArrayInputStream(MAIL_CONTENT), new Date(), session, false, FLAGS).getMessageId(); @@ -131,7 +131,7 @@ public abstract class AbstractCombinationManagerTest { query.andCriteria(SearchQuery.all()); MailboxQuery mailboxQuery = MailboxQuery.builder() - .username(MailboxManagerFixture.USER) + .username(MailboxFixture.USER) .expression(String.valueOf(MailboxQuery.FREEWILDCARD)) .build(); MessageId messageId = messageManager1.appendMessage(new ByteArrayInputStream(MAIL_CONTENT), new Date(), session, false, FLAGS).getMessageId(); @@ -214,7 +214,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(), MailboxManagerFixture.MAILBOX_PATH1, MailboxManagerFixture.MAILBOX_PATH2, session); + mailboxManager.copyMessages(MessageRange.all(), MailboxFixture.MAILBOX_PATH1, MailboxFixture.MAILBOX_PATH2, session); List<MessageResult> listMessages = messageIdManager.getMessages(ImmutableList.of(messageId), FetchGroupImpl.MINIMAL, session); @@ -227,7 +227,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(), MailboxManagerFixture.MAILBOX_PATH1, MailboxManagerFixture.MAILBOX_PATH2, session); + mailboxManager.moveMessages(MessageRange.all(), MailboxFixture.MAILBOX_PATH1, MailboxFixture.MAILBOX_PATH2, session); List<MessageResult> listMessages = messageIdManager.getMessages(ImmutableList.of(messageId), FetchGroupImpl.MINIMAL, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/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 98f2fb1..95e1bbf 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 @@ -25,7 +25,7 @@ import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.OverQuotaException; -import org.apache.james.mailbox.manager.MailboxManagerFixture; +import org.apache.james.mailbox.fixture.MailboxFixture; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.quota.CurrentQuotaManager; @@ -71,9 +71,9 @@ public abstract class AbstractMessageIdManagerQuotaTest { testingData = createTestSystem(quotaManager, currentQuotaManager); messageIdManager = testingData.getMessageIdManager(); - mailbox1 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH1, session); - mailbox2 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH2, session); - mailbox3 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH3, session); + mailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH1, session); + mailbox2 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH2, session); + mailbox3 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH3, session); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/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 d7a1201..f16ee1e 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 @@ -40,7 +40,7 @@ import org.apache.james.mailbox.MessageManager.FlagsUpdateMode; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.OverQuotaException; -import org.apache.james.mailbox.manager.MailboxManagerFixture; +import org.apache.james.mailbox.fixture.MailboxFixture; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.FetchGroupImpl; import org.apache.james.mailbox.model.MailboxId; @@ -88,9 +88,9 @@ public abstract class AbstractMessageIdManagerSideEffectTest { testingData = createTestSystem(quotaManager, dispatcher); messageIdManager = testingData.getMessageIdManager(); - mailbox1 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH1, session); - mailbox2 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH2, session); - mailbox3 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH3, session); + mailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH1, session); + mailbox2 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH2, session); + mailbox3 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH3, session); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/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 757b276..8901276 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 @@ -31,7 +31,7 @@ import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxNotFoundException; -import org.apache.james.mailbox.manager.MailboxManagerFixture; +import org.apache.james.mailbox.fixture.MailboxFixture; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.FetchGroupImpl; import org.apache.james.mailbox.model.MailboxId; @@ -67,16 +67,16 @@ public abstract class AbstractMessageIdManagerStorageTest { protected abstract MessageIdManagerTestSystem createTestingData() throws Exception; public void setUp() throws Exception { - session = new MockMailboxSession(MailboxManagerFixture.USER); - otherSession = new MockMailboxSession(MailboxManagerFixture.OTHER_USER); + session = new MockMailboxSession(MailboxFixture.USER); + otherSession = new MockMailboxSession(MailboxFixture.OTHER_USER); systemSession = new MockMailboxSession("systemuser", SessionType.System); testingData = createTestingData(); messageIdManager = testingData.getMessageIdManager(); - mailbox1 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH1, session); - mailbox2 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH2, session); - mailbox3 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH3, session); - mailbox4 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH4, otherSession); + mailbox1 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH1, session); + mailbox2 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH2, session); + mailbox3 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH3, session); + mailbox4 = testingData.createMailbox(MailboxFixture.MAILBOX_PATH4, otherSession); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/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 e7cdb71..4a001be 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 @@ -40,7 +40,7 @@ import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.exception.SubscriptionException; -import org.apache.james.mailbox.manager.MailboxManagerFixture; +import org.apache.james.mailbox.fixture.MailboxFixture; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; @@ -80,10 +80,10 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory public TestMailboxSessionMapperFactory() { - mailbox1 = new SimpleMailbox(MailboxManagerFixture.MAILBOX_PATH1, UID_VALIDITY, TestId.of(36)); - mailbox2 = new SimpleMailbox(MailboxManagerFixture.MAILBOX_PATH2, UID_VALIDITY, TestId.of(46)); - mailbox3 = new SimpleMailbox(MailboxManagerFixture.MAILBOX_PATH3, UID_VALIDITY, TestId.of(56)); - mailbox4 = new SimpleMailbox(MailboxManagerFixture.MAILBOX_PATH4, UID_VALIDITY, TestId.of(66)); + 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)); mailboxMapper = new MailboxMapper() { @Override @@ -99,19 +99,19 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory @Override public Mailbox findMailboxByPath(MailboxPath mailboxName) throws MailboxException { - if (mailboxName.equals(MailboxManagerFixture.MAILBOX_PATH1)) { + if (mailboxName.equals(MailboxFixture.MAILBOX_PATH1)) { return mailbox1; } - if (mailboxName.equals(MailboxManagerFixture.MAILBOX_PATH2)) { + if (mailboxName.equals(MailboxFixture.MAILBOX_PATH2)) { return mailbox2; } - if (mailboxName.equals(MailboxManagerFixture.MAILBOX_PATH3)) { + if (mailboxName.equals(MailboxFixture.MAILBOX_PATH3)) { return mailbox3; } throw new IllegalArgumentException("Unknown mailbox : " + mailboxName + " must be one of " - + MailboxManagerFixture.MAILBOX_PATH1 + " " - + MailboxManagerFixture.MAILBOX_PATH2 + " " - + MailboxManagerFixture.MAILBOX_PATH3); + + MailboxFixture.MAILBOX_PATH1 + " " + + MailboxFixture.MAILBOX_PATH2 + " " + + MailboxFixture.MAILBOX_PATH3); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/d75d5653/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 8b5b61c..9756c58 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 @@ -29,7 +29,7 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.exception.MailboxNotFoundException; -import org.apache.james.mailbox.manager.MailboxManagerFixture; +import org.apache.james.mailbox.fixture.MailboxFixture; import org.apache.james.mailbox.mock.MockMailboxSession; import org.junit.Before; import org.junit.Rule; @@ -59,14 +59,14 @@ public class SystemMailboxesProviderImplTest { @Test @SuppressWarnings("unchecked") public void getMailboxByRoleShouldReturnEmptyWhenNoMailbox() throws Exception { - when(mailboxManager.getMailbox(eq(MailboxManagerFixture.MAILBOX_PATH1), eq(mailboxSession))).thenThrow(MailboxNotFoundException.class); + when(mailboxManager.getMailbox(eq(MailboxFixture.MAILBOX_PATH1), eq(mailboxSession))).thenThrow(MailboxNotFoundException.class); assertThat(systemMailboxProvider.getMailboxByRole(Role.INBOX, mailboxSession)).isEmpty(); } @Test public void getMailboxByRoleShouldReturnMailboxByRole() throws Exception { - when(mailboxManager.getMailbox(eq(MailboxManagerFixture.MAILBOX_PATH1), eq(mailboxSession))).thenReturn(inboxMessageManager); + when(mailboxManager.getMailbox(eq(MailboxFixture.MAILBOX_PATH1), eq(mailboxSession))).thenReturn(inboxMessageManager); assertThat(systemMailboxProvider.getMailboxByRole(Role.INBOX, mailboxSession)) .hasSize(1) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
