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 fdbf10189cbdf82456a3f1f764b0088503826845 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Mar 15 11:06:36 2019 +0700 JAMES-2687 Remove unneeded methods from IntegrationResources interface --- .../mailbox/manager/IntegrationResources.java | 12 --------- .../mailbox/manager/ManagerTestResources.java | 1 - .../mailbox/manager/QuotaMessageManagerTest.java | 6 ----- .../manager/InMemoryIntegrationResources.java | 30 +--------------------- .../mailets/delivery/MailboxAppenderTest.java | 12 +-------- 5 files changed, 2 insertions(+), 59 deletions(-) diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/IntegrationResources.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/IntegrationResources.java index f68f1c9..b3f78f7 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/IntegrationResources.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/IntegrationResources.java @@ -20,7 +20,6 @@ package org.apache.james.mailbox.manager; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.quota.MaxQuotaManager; @@ -42,15 +41,4 @@ public interface IntegrationResources<T extends MailboxManager> { GroupMembershipResolver createGroupMembershipResolver() throws Exception; - MessageIdManager createMessageIdManager(T mailboxManager); - - /** - * Init you will want to perform before tests - * - * @throws Exception - */ - void init() throws Exception; - - void clean() throws Exception; - } \ No newline at end of file diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java index 516b01d..f2fba0c 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java @@ -75,7 +75,6 @@ public class ManagerTestResources<T extends MailboxManager> { quotaRootResolver = integrationResources.retrieveQuotaRootResolver(mailboxManager); quotaManager = integrationResources.retrieveQuotaManager(mailboxManager); - integrationResources.init(); session = mailboxManager.login(USER, USER_PASS); inbox = MailboxPath.inbox(session); subFolder = new MailboxPath(inbox, "INBOX.SUB"); diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java index 7ac4a76..cd2f697 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java @@ -41,7 +41,6 @@ import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; import org.apache.james.mime4j.dom.Message; import org.assertj.core.api.SoftAssertions; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -79,11 +78,6 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> { quotaRootResolver = resources.getQuotaRootResolver(); } - @After - public void cleanUp() throws Exception { - resources.getIntegrationResources().clean(); - } - @Test(expected = OverQuotaException.class) public void testAppendOverQuotaMessages() throws Exception { QuotaCount maxMessageCount = QuotaCount.count(8); diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java index 7129d8b..b89ad47 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java @@ -246,8 +246,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM } } - private SimpleGroupMembershipResolver groupMembershipResolver; - @Override public InMemoryMailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver) { return new Factory() @@ -257,23 +255,6 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM } @Override - public MessageIdManager createMessageIdManager(StoreMailboxManager mailboxManager) { - return createMessageIdManager(mailboxManager, new InMemoryMessageId.Factory()); - } - - private MessageIdManager createMessageIdManager(StoreMailboxManager mailboxManager, MessageId.Factory factory) { - QuotaComponents quotaComponents = mailboxManager.getQuotaComponents(); - return new StoreMessageIdManager( - mailboxManager, - mailboxManager.getMapperFactory(), - mailboxManager.getEventBus(), - factory, - quotaComponents.getQuotaManager(), - quotaComponents.getQuotaRootResolver(), - mailboxManager.getPreDeletionHooks()); - } - - @Override public QuotaManager retrieveQuotaManager(StoreMailboxManager mailboxManager) { return mailboxManager.getQuotaComponents().getQuotaManager(); } @@ -290,16 +271,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM @Override public GroupMembershipResolver createGroupMembershipResolver() { - groupMembershipResolver = new SimpleGroupMembershipResolver(); - return groupMembershipResolver; - } - - @Override - public void init() { - } - - @Override - public void clean() { + return new SimpleGroupMembershipResolver(); } } diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java index 2d016b1..b9a15eb 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java @@ -31,14 +31,12 @@ import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; -import org.apache.james.mailbox.manager.ManagerTestResources; import org.apache.james.mailbox.model.FetchGroupImpl; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.model.MessageResult; import org.apache.james.mailbox.model.MessageResultIterator; import org.apache.james.util.concurrency.ConcurrentTestRunner; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; @@ -52,7 +50,6 @@ public class MailboxAppenderTest { private MailboxAppender testee; private MailboxManager mailboxManager; private MimeMessage mimeMessage; - private InMemoryIntegrationResources integrationResources; private MailboxSession session; @BeforeEach @@ -63,19 +60,12 @@ public class MailboxAppenderTest { .data("toto")) .build(); - integrationResources = new InMemoryIntegrationResources(); - integrationResources.init(); - mailboxManager = new ManagerTestResources<>(integrationResources).getMailboxManager(); + mailboxManager = new InMemoryIntegrationResources.Factory().create().getMailboxManager(); testee = new MailboxAppender(mailboxManager); session = mailboxManager.createSystemSession("TEST"); } - @AfterEach - void cleanUp() { - integrationResources.clean(); - } - @Test void appendShouldAddMessageToDesiredMailbox() throws Exception { testee.append(mimeMessage, USER, FOLDER); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
