You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/03/20 11:54:22 UTC
[james-project] 14/33: JAMES-2687 ManagerTestResources should only
do provisioning and rely on IntegrationTestResources
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 b7b94d25a3e4e0a4438d38b5be454acfdb53992c
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 15 11:39:06 2019 +0700
JAMES-2687 ManagerTestResources should only do provisioning and rely on IntegrationTestResources
It should only provision data into IntegrationTestResources but not expose internal components
---
...Resources.java => ManagerTestProvisionner.java} | 48 ++++---------------
.../mailbox/manager/QuotaMessageManagerTest.java | 56 ++++++++++++----------
.../ElasticSearchIntegrationTest.java | 6 +--
.../search/LuceneMessageSearchIndexTest.java | 6 +--
.../manager/InMemoryIntegrationResources.java | 6 +--
.../InMemoryMessageIdManagerSideEffectTest.java | 6 +--
.../InMemoryQuotaMailboxMessageManagerTest.java | 6 +--
.../james/jmap/model/MailboxFactoryTest.java | 10 ++--
8 files changed, 58 insertions(+), 86 deletions(-)
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/ManagerTestProvisionner.java
similarity index 74%
rename from mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
rename to mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestProvisionner.java
index ef48e66..c4c0a5b 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/ManagerTestProvisionner.java
@@ -37,65 +37,40 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.mock.MockMail;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.quota.MaxQuotaManager;
-import org.apache.james.mailbox.quota.QuotaManager;
-import org.apache.james.mailbox.quota.QuotaRootResolver;
/**
* Provide an initialized Mailbox environment where we can run managers tests
*/
-public class ManagerTestResources<T extends MailboxManager> {
-
+public class ManagerTestProvisionner<T extends MailboxManager> {
public static final String USER = "user@domain.org";
public static final String USER_PASS = "pass";
public static final String OTHER_USER = "otherUser@domain.org";
public static final String OTHER_USER_PASS = "otherPass";
- private T mailboxManager;
+ private IntegrationResources<T> integrationResources;
private MailboxPath inbox;
private MessageManager messageManager;
private MailboxPath subFolder;
-
private MailboxSession session;
- private MaxQuotaManager maxQuotaManager;
- private QuotaManager quotaManager;
- private QuotaRootResolver quotaRootResolver;
-
- private IntegrationResources<T> integrationResources;
- public ManagerTestResources(IntegrationResources<T> integrationResources) throws Exception {
+ public ManagerTestProvisionner(IntegrationResources<T> integrationResources) throws Exception {
this.integrationResources = integrationResources;
- mailboxManager = integrationResources.getMailboxManager();
-
- maxQuotaManager = integrationResources.getMaxQuotaManager();
- quotaRootResolver = integrationResources.getQuotaRootResolver();
- quotaManager = integrationResources.getQuotaManager();
- session = mailboxManager.login(USER, USER_PASS);
+ session = integrationResources.getMailboxManager().login(USER, USER_PASS);
inbox = MailboxPath.inbox(session);
subFolder = new MailboxPath(inbox, "INBOX.SUB");
+ MaxQuotaManager maxQuotaManager = integrationResources.getMaxQuotaManager();
maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(1000));
maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(1000000));
}
public void createMailboxes() throws MailboxException {
- mailboxManager.createMailbox(inbox, session);
- mailboxManager.createMailbox(subFolder, session);
- messageManager = mailboxManager.getMailbox(inbox, session);
- }
-
- public QuotaManager getQuotaManager() {
- return quotaManager;
- }
-
- public MaxQuotaManager getMaxQuotaManager() {
- return maxQuotaManager;
- }
-
- public QuotaRootResolver getQuotaRootResolver() {
- return quotaRootResolver;
+ integrationResources.getMailboxManager().createMailbox(inbox, session);
+ integrationResources.getMailboxManager().createMailbox(subFolder, session);
+ messageManager = integrationResources.getMailboxManager().getMailbox(inbox, session);
}
public MessageManager getMessageManager() {
@@ -110,18 +85,11 @@ public class ManagerTestResources<T extends MailboxManager> {
return inbox;
}
- public MailboxManager getMailboxManager() {
- return mailboxManager;
- }
public MailboxSession getSession() {
return session;
}
- public IntegrationResources<T> getIntegrationResources() {
- return integrationResources;
- }
-
public void fillMailbox() throws MailboxException, UnsupportedEncodingException {
for (int i = 0; i < 4; i++) {
provideSomeMessages();
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 cd2f697..de9a45e 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
@@ -38,6 +38,7 @@ import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.Quota;
import org.apache.james.mailbox.model.QuotaRoot;
import org.apache.james.mailbox.quota.MaxQuotaManager;
+import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mime4j.dom.Message;
import org.assertj.core.api.SoftAssertions;
@@ -52,50 +53,53 @@ import org.junit.Test;
*/
public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
- private ManagerTestResources<T> resources;
+ private ManagerTestProvisionner<T> provisionner;
private MessageManager messageManager;
private MailboxManager mailboxManager;
private MaxQuotaManager maxQuotaManager;
+ private QuotaManager quotaManager;
private QuotaRootResolver quotaRootResolver;
private MailboxSession session;
private MailboxPath inbox;
private MailboxPath subFolder;
- protected abstract ManagerTestResources<T> createResources() throws Exception;
+ protected abstract IntegrationResources<T> createResources() throws Exception;
@Before
public void setUp() throws Exception {
- resources = createResources();
- resources.createMailboxes();
- messageManager = resources.getMessageManager();
+ IntegrationResources<T> resources = createResources();
+ this.provisionner = new ManagerTestProvisionner<>(resources);
+ this.provisionner.createMailboxes();
+ messageManager = this.provisionner.getMessageManager();
mailboxManager = resources.getMailboxManager();
- session = resources.getSession();
- inbox = resources.getInbox();
- subFolder = resources.getSubFolder();
+ session = this.provisionner.getSession();
+ inbox = this.provisionner.getInbox();
+ subFolder = this.provisionner.getSubFolder();
maxQuotaManager = resources.getMaxQuotaManager();
quotaRootResolver = resources.getQuotaRootResolver();
+ quotaManager = resources.getQuotaManager();
}
@Test(expected = OverQuotaException.class)
public void testAppendOverQuotaMessages() throws Exception {
QuotaCount maxMessageCount = QuotaCount.count(8);
maxQuotaManager.setMaxMessage(quotaRootResolver.getQuotaRoot(inbox), maxMessageCount);
- resources.fillMailbox();
+ provisionner.fillMailbox();
}
@Test(expected = OverQuotaException.class)
public void testAppendOverQuotaSize() throws Exception {
QuotaSize maxQuotaSize = QuotaSize.size(3 * MockMail.MAIL_TEXT_PLAIN.length() + 1);
maxQuotaManager.setMaxStorage(quotaRootResolver.getQuotaRoot(inbox), maxQuotaSize);
- resources.fillMailbox();
+ provisionner.fillMailbox();
}
@Test(expected = OverQuotaException.class)
public void testCopyOverQuotaMessages() throws Exception {
try {
- resources.fillMailbox();
+ provisionner.fillMailbox();
} catch (OverQuotaException overQuotaException) {
// Silent these exception as we don't want it to disturb the test
}
@@ -109,7 +113,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
QuotaSize maxQuotaSize = QuotaSize.size(15L * MockMail.MAIL_TEXT_PLAIN.length());
maxQuotaManager.setMaxStorage(quotaRootResolver.getQuotaRoot(inbox), maxQuotaSize);
try {
- resources.fillMailbox();
+ provisionner.fillMailbox();
} catch (OverQuotaException overQuotaException) {
// Silent these exception as we don't want it to disturb the test
}
@@ -121,13 +125,13 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
QuotaCount maxMessageCount = QuotaCount.count(15L);
maxQuotaManager.setMaxMessage(quotaRootResolver.getQuotaRoot(inbox), maxMessageCount);
try {
- resources.fillMailbox();
+ provisionner.fillMailbox();
} catch (OverQuotaException overQuotaException) {
// We are here over quota
}
messageManager.expunge(MessageRange.all(), session);
// We have suppressed at list one message. Ensure we can add an other message. If is impossible, an exception will be thrown.
- resources.appendMessage(messageManager, session, new FlagsBuilder().add(Flags.Flag.SEEN).build());
+ provisionner.appendMessage(messageManager, session, new FlagsBuilder().add(Flags.Flag.SEEN).build());
}
@Test
@@ -135,13 +139,13 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
QuotaSize maxQuotaSize = QuotaSize.size(15 * MockMail.MAIL_TEXT_PLAIN.getBytes(StandardCharsets.UTF_8).length + 1);
maxQuotaManager.setMaxStorage(quotaRootResolver.getQuotaRoot(inbox), maxQuotaSize);
try {
- resources.fillMailbox();
+ provisionner.fillMailbox();
} catch (OverQuotaException overQuotaException) {
// We are here over quota
}
messageManager.expunge(MessageRange.all(), session);
// We have suppressed at list one message. Ensure we can add an other message. If is impossible, an exception will be thrown.
- resources.appendMessage(messageManager, session, new FlagsBuilder().add(Flags.Flag.SEEN).build());
+ provisionner.appendMessage(messageManager, session, new FlagsBuilder().add(Flags.Flag.SEEN).build());
}
@Test
@@ -149,7 +153,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
QuotaCount maxMessageCount = QuotaCount.count(15L);
maxQuotaManager.setMaxMessage(quotaRootResolver.getQuotaRoot(inbox), maxMessageCount);
try {
- resources.fillMailbox();
+ provisionner.fillMailbox();
} catch (OverQuotaException overQuotaException) {
// We are here over quota
}
@@ -157,7 +161,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
List<MessageUid> uids = messageManager.getMetaData(true, session, MessageManager.MetaData.FetchGroup.UNSEEN_COUNT).getRecent();
messageManager.delete(uids, session);
// We have suppressed at list one message. Ensure we can add an other message. If is impossible, an exception will be thrown.
- resources.appendMessage(messageManager, session, new FlagsBuilder().add(Flags.Flag.SEEN).build());
+ provisionner.appendMessage(messageManager, session, new FlagsBuilder().add(Flags.Flag.SEEN).build());
}
@Test
@@ -165,7 +169,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
QuotaSize maxQuotaSize = QuotaSize.size(15 * MockMail.MAIL_TEXT_PLAIN.getBytes(StandardCharsets.UTF_8).length + 1);
maxQuotaManager.setMaxStorage(quotaRootResolver.getQuotaRoot(inbox), maxQuotaSize);
try {
- resources.fillMailbox();
+ provisionner.fillMailbox();
} catch (OverQuotaException overQuotaException) {
// We are here over quota
}
@@ -173,18 +177,18 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
List<MessageUid> uids = messageManager.getMetaData(true, session, MessageManager.MetaData.FetchGroup.UNSEEN_COUNT).getRecent();
messageManager.delete(uids, session);
// We have suppressed at list one message. Ensure we can add an other message. If is impossible, an exception will be thrown.
- resources.appendMessage(messageManager, session, new FlagsBuilder().add(Flags.Flag.SEEN).build());
+ provisionner.appendMessage(messageManager, session, new FlagsBuilder().add(Flags.Flag.SEEN).build());
}
@Test
public void deletingAMailboxShouldDecreaseCurrentQuota() throws Exception {
- resources.fillMailbox();
+ provisionner.fillMailbox();
mailboxManager.deleteMailbox(inbox, session);
QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(inbox);
- Quota<QuotaCount> messageQuota = resources.getQuotaManager().getMessageQuota(quotaRoot);
- Quota<QuotaSize> storageQuota = resources.getQuotaManager().getStorageQuota(quotaRoot);
+ Quota<QuotaCount> messageQuota = quotaManager.getMessageQuota(quotaRoot);
+ Quota<QuotaSize> storageQuota = quotaManager.getStorageQuota(quotaRoot);
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(messageQuota.getUsed()).isEqualTo(QuotaCount.count(0));
softly.assertThat(storageQuota.getUsed()).isEqualTo(QuotaSize.size(0));
@@ -193,7 +197,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
@Test
public void deletingAMailboxShouldPreserveQuotaOfOtherMailboxes() throws Exception {
- resources.fillMailbox();
+ provisionner.fillMailbox();
mailboxManager.getMailbox(subFolder, session)
.appendMessage(MessageManager.AppendCommand.from(
@@ -205,8 +209,8 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
mailboxManager.deleteMailbox(subFolder, session);
QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(inbox);
- Quota<QuotaCount> messageQuota = resources.getQuotaManager().getMessageQuota(quotaRoot);
- Quota<QuotaSize> storageQuota = resources.getQuotaManager().getStorageQuota(quotaRoot);
+ Quota<QuotaCount> messageQuota = quotaManager.getMessageQuota(quotaRoot);
+ Quota<QuotaSize> storageQuota = quotaManager.getStorageQuota(quotaRoot);
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(messageQuota.getUsed()).isEqualTo(QuotaCount.count(16));
softly.assertThat(storageQuota.getUsed()).isEqualTo(QuotaSize.size(16 * 247));
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
index ac1b448..cf4325f 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
@@ -46,7 +46,7 @@ import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
-import org.apache.james.mailbox.manager.ManagerTestResources;
+import org.apache.james.mailbox.manager.ManagerTestProvisionner;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.SearchQuery;
@@ -115,8 +115,8 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
ElasticSearchConfiguration.DEFAULT_CONFIGURATION);
FakeAuthenticator fakeAuthenticator = new FakeAuthenticator();
- fakeAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
- fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestProvisionner.USER, ManagerTestProvisionner.USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestProvisionner.OTHER_USER, ManagerTestProvisionner.OTHER_USER_PASS);
InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
InVMEventBus eventBus = new InVMEventBus(new InVmEventDelivery(new NoopMetricFactory()));
StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(),
diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
index e21b91a..ee41577 100644
--- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
+++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
-import org.apache.james.mailbox.manager.ManagerTestResources;
+import org.apache.james.mailbox.manager.ManagerTestProvisionner;
import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.FakeAuthorizator;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
@@ -53,8 +53,8 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest
@Override
protected void initializeMailboxManager() throws Exception {
FakeAuthenticator fakeAuthenticator = new FakeAuthenticator();
- fakeAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
- fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestProvisionner.USER, ManagerTestProvisionner.USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestProvisionner.OTHER_USER, ManagerTestProvisionner.OTHER_USER_PASS);
InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
InVMEventBus eventBus = new InVMEventBus(new InVmEventDelivery(new NoopMetricFactory()));
StoreRightManager storeRightManager = new StoreRightManager(mailboxSessionMapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), eventBus);
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 603402e..0dc9586 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
@@ -37,7 +37,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMessageId;
import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager;
import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
import org.apache.james.mailbox.manager.IntegrationResources;
-import org.apache.james.mailbox.manager.ManagerTestResources;
+import org.apache.james.mailbox.manager.ManagerTestProvisionner;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.quota.QuotaManager;
@@ -166,8 +166,8 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
FakeAuthenticator defaultAuthenticator() {
FakeAuthenticator fakeAuthenticator = new FakeAuthenticator();
- fakeAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
- fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestProvisionner.USER, ManagerTestProvisionner.USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestProvisionner.OTHER_USER, ManagerTestProvisionner.OTHER_USER_PASS);
return fakeAuthenticator;
}
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java
index 2b32d9d..d4876cf 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryMessageIdManagerSideEffectTest.java
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.extension.PreDeletionHook;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
-import org.apache.james.mailbox.manager.ManagerTestResources;
+import org.apache.james.mailbox.manager.ManagerTestProvisionner;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.store.AbstractMessageIdManagerSideEffectTest;
import org.apache.james.mailbox.store.FakeAuthenticator;
@@ -63,8 +63,8 @@ public class InMemoryMessageIdManagerSideEffectTest extends AbstractMessageIdMan
InMemoryMailboxSessionMapperFactory mapperFactory = new InMemoryMailboxSessionMapperFactory();
FakeAuthenticator fakeAuthenticator = new FakeAuthenticator();
- fakeAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
- fakeAuthenticator.addUser(ManagerTestResources.OTHER_USER, ManagerTestResources.OTHER_USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestProvisionner.USER, ManagerTestProvisionner.USER_PASS);
+ fakeAuthenticator.addUser(ManagerTestProvisionner.OTHER_USER, ManagerTestProvisionner.OTHER_USER_PASS);
FakeAuthorizator fakeAuthorizator = FakeAuthorizator.defaultReject();
StoreRightManager rightManager = new StoreRightManager(mapperFactory, new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), eventBus);
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java
index a3499bd..d24943d 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.mailbox.inmemory.manager;
-import org.apache.james.mailbox.manager.ManagerTestResources;
+import org.apache.james.mailbox.manager.IntegrationResources;
import org.apache.james.mailbox.manager.QuotaMessageManagerTest;
import org.apache.james.mailbox.store.StoreMailboxManager;
@@ -31,8 +31,8 @@ import org.apache.james.mailbox.store.StoreMailboxManager;
public class InMemoryQuotaMailboxMessageManagerTest extends QuotaMessageManagerTest<StoreMailboxManager> {
@Override
- protected ManagerTestResources<StoreMailboxManager> createResources() throws Exception {
- return new ManagerTestResources<>(new InMemoryIntegrationResources.Factory().create());
+ protected IntegrationResources<StoreMailboxManager> createResources() {
+ return new InMemoryIntegrationResources.Factory().create();
}
}
\ No newline at end of file
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
index 3584179..68bd014 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
@@ -27,7 +27,7 @@ import org.apache.james.jmap.model.mailbox.MailboxNamespace;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
-import org.apache.james.mailbox.manager.ManagerTestResources;
+import org.apache.james.mailbox.manager.ManagerTestProvisionner;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxMetaData;
@@ -61,10 +61,10 @@ public class MailboxFactoryTest {
QuotaRootResolver quotaRootResolver = mailboxManager.getQuotaComponents().getQuotaRootResolver();
QuotaManager quotaManager = mailboxManager.getQuotaComponents().getQuotaManager();
- user = ManagerTestResources.USER;
- otherUser = ManagerTestResources.OTHER_USER;
- mailboxSession = mailboxManager.login(user, ManagerTestResources.USER_PASS);
- otherMailboxSession = mailboxManager.login(otherUser, ManagerTestResources.OTHER_USER_PASS);
+ user = ManagerTestProvisionner.USER;
+ otherUser = ManagerTestProvisionner.OTHER_USER;
+ mailboxSession = mailboxManager.login(user, ManagerTestProvisionner.USER_PASS);
+ otherMailboxSession = mailboxManager.login(otherUser, ManagerTestProvisionner.OTHER_USER_PASS);
sut = new MailboxFactory(mailboxManager, quotaManager, quotaRootResolver);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org