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 2018/12/18 08:00:53 UTC
[10/13] james-project git commit: MAILBOX-365 Rely on
MailboxSessionUtil for creating a MailboxSession in tests
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
index f368d2e..d7afcfd 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetAnnotationProcessorTest.java
@@ -43,6 +43,7 @@ import org.apache.james.imap.encode.FakeImapSession;
import org.apache.james.imap.message.request.SetAnnotationRequest;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.exception.AnnotationException;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
@@ -90,7 +91,7 @@ public class SetAnnotationProcessorTest {
mockResponder = mock(ImapProcessor.Responder.class);
mockImapSession = mock(ImapSession.class);
- mockMailboxSession = MailboxSession.create("username");
+ mockMailboxSession = MailboxSessionUtil.create("username");
inbox = MailboxPath.inbox(mockMailboxSession);
mailboxAnnotations = ImmutableList.of(MailboxAnnotation.newInstance(new MailboxAnnotationKey("/private/key"), "anyValue"));
request = new SetAnnotationRequest(TAG, ImapCommand.anyStateCommand("Name"), ImapConstants.INBOX_NAME, mailboxAnnotations);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
index d4cde5c..b03bbfd 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
@@ -35,6 +35,7 @@ import org.apache.james.imap.message.request.SetQuotaRequest;
import org.apache.james.imap.message.response.UnpooledStatusResponseFactory;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +50,7 @@ public class SetQuotaProcessorTest {
@Before
public void setUp() {
- mailboxSession = MailboxSession.create("plop");
+ mailboxSession = MailboxSessionUtil.create("plop");
UnpooledStatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory();
mockedImapSession = mock(ImapSession.class);
mockedResponder = mock(ImapProcessor.Responder.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
index 59cc629..55e4d0c 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
@@ -35,6 +35,7 @@ import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.exception.MailboxException;
@@ -89,8 +90,8 @@ public class MailboxEventAnalyserTest {
private static final MessageUid MESSAGE_UID = MessageUid.of(1);
- private static final MailboxSession MAILBOX_SESSION = MailboxSession.create("user");
- private static final MailboxSession OTHER_MAILBOX_SESSION = MailboxSession.create("user");
+ private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create("user");
+ private static final MailboxSession OTHER_MAILBOX_SESSION = MailboxSessionUtil.create("user");
private static final char PATH_DELIMITER = '.';
private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", "user", "name");
private static final TestId MAILBOX_ID = TestId.of(36);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java
index 88f61a6..44509e8 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java
@@ -24,6 +24,7 @@ import java.time.Duration;
import org.apache.james.mailbox.DefaultMailboxes;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
@@ -47,7 +48,7 @@ public class DefaultMailboxesProvisioningFilterTest {
@Before
public void before() throws Exception {
- session = MailboxSession.create(USERNAME);
+ session = MailboxSessionUtil.create(USERNAME);
InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
mailboxManager = inMemoryIntegrationResources.createMailboxManager(new SimpleGroupMembershipResolver());
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java
index 2ad136a..f90adab 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java
@@ -30,6 +30,7 @@ import java.util.Optional;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.SubscriptionManager;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.TestId;
@@ -49,7 +50,7 @@ public class DefaultMailboxesProvisioningFilterThreadTest {
@Before
public void before() {
- session = MailboxSession.create(USERNAME);
+ session = MailboxSessionUtil.create(USERNAME);
mailboxManager = mock(MailboxManager.class);
subscriptionManager = mock(SubscriptionManager.class);
sut = new DefaultMailboxesProvisioningFilter(mailboxManager, subscriptionManager, new NoopMetricFactory());
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/DownloadServletTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DownloadServletTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DownloadServletTest.java
index 0e69a65..99804a6 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DownloadServletTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DownloadServletTest.java
@@ -31,6 +31,7 @@ import org.apache.james.jmap.api.SimpleTokenFactory;
import org.apache.james.jmap.utils.DownloadPath;
import org.apache.james.mailbox.BlobManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.junit.Test;
@@ -39,7 +40,7 @@ public class DownloadServletTest {
@Test
public void downloadMayFailWhenUnknownErrorOnAttachmentManager() throws Exception {
- MailboxSession mailboxSession = MailboxSession.create("User");
+ MailboxSession mailboxSession = MailboxSessionUtil.create("User");
BlobManager mockedBlobManager = mock(BlobManager.class);
when(mockedBlobManager.retrieve(any(), eq(mailboxSession)))
.thenThrow(new MailboxException());
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterTest.java
index 945fefa..bc66447 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterTest.java
@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
@@ -71,7 +72,7 @@ public class UserProvisioningFilterTest {
@Test
public void filterShouldAddUsernameWhenNoVirtualHostingAndMailboxSessionContainsUsername() throws Exception {
usersRepository.setEnableVirtualHosting(false);
- MailboxSession mailboxSession = MailboxSession.create(USERNAME);
+ MailboxSession mailboxSession = MailboxSessionUtil.create(USERNAME);
when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
.thenReturn(mailboxSession);
@@ -84,7 +85,7 @@ public class UserProvisioningFilterTest {
@Test
public void filterShouldAddUsernameWhenNoVirtualHostingAndMailboxSessionContainsMail() throws Exception {
usersRepository.setEnableVirtualHosting(false);
- MailboxSession mailboxSession = MailboxSession.create(MAIL);
+ MailboxSession mailboxSession = MailboxSessionUtil.create(MAIL);
when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
.thenReturn(mailboxSession);
@@ -100,7 +101,7 @@ public class UserProvisioningFilterTest {
when(usersRepository.isReadOnly()).thenReturn(true);
sut = new UserProvisioningFilter(usersRepository, new NoopMetricFactory());
- MailboxSession mailboxSession = MailboxSession.create(MAIL);
+ MailboxSession mailboxSession = MailboxSessionUtil.create(MAIL);
when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
.thenReturn(mailboxSession);
@@ -116,7 +117,7 @@ public class UserProvisioningFilterTest {
when(usersRepository.isReadOnly()).thenReturn(true);
sut = new UserProvisioningFilter(usersRepository, new NoopMetricFactory());
- MailboxSession mailboxSession = MailboxSession.create(MAIL);
+ MailboxSession mailboxSession = MailboxSessionUtil.create(MAIL);
when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
.thenReturn(mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java
index b0738d5..0caeecd 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/UserProvisioningFilterThreadTest.java
@@ -22,6 +22,7 @@ import java.time.Duration;
import java.util.concurrent.ExecutionException;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
@@ -37,7 +38,7 @@ public class UserProvisioningFilterThreadTest {
@Before
public void before() {
usersRepository = MemoryUsersRepository.withoutVirtualHosting();
- session = MailboxSession.create("username");
+ session = MailboxSessionUtil.create("username");
sut = new UserProvisioningFilter(usersRepository, new NoopMetricFactory());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java
index ea92f14..e3ddb29 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
@@ -59,7 +60,7 @@ public class PropagateLookupRightListenerTest {
private StoreMailboxManager storeMailboxManager;
private PropagateLookupRightListener testee;
- private MailboxSession mailboxSession = MailboxSession.create(OWNER_USER);
+ private MailboxSession mailboxSession = MailboxSessionUtil.create(OWNER_USER);
private MailboxId parentMailboxId;
private MailboxId parentMailboxId1;
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/AttachmentCheckerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/AttachmentCheckerTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/AttachmentCheckerTest.java
index f5b236e..d0c181c 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/AttachmentCheckerTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/AttachmentCheckerTest.java
@@ -30,6 +30,7 @@ import org.apache.james.jmap.model.CreationMessage;
import org.apache.james.jmap.model.CreationMessageId;
import org.apache.james.mailbox.AttachmentManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.AttachmentId;
import org.junit.Before;
@@ -54,7 +55,7 @@ public class AttachmentCheckerTest {
@Before
public void setUp() {
- session = MailboxSession.create("Jonhy");
+ session = MailboxSessionUtil.create("Jonhy");
attachmentManager = mock(AttachmentManager.class);
sut = new AttachmentChecker(attachmentManager);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
index d8015a2..3fa7278 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
@@ -39,6 +39,7 @@ import org.apache.james.jmap.model.mailbox.Mailbox;
import org.apache.james.jmap.model.mailbox.SortOrder;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.Role;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
@@ -111,7 +112,7 @@ public class GetMailboxesMethodTest {
GetMailboxesRequest getMailboxesRequest = GetMailboxesRequest.builder()
.build();
- MailboxSession session = MailboxSession.create(USERNAME);
+ MailboxSession session = MailboxSessionUtil.create(USERNAME);
List<JmapResponse> getMailboxesResponse = testee.process(getMailboxesRequest, clientId, session).collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
index 464b045..0bd939a 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
@@ -48,6 +48,7 @@ import org.apache.james.jmap.utils.JsoupHtmlTextExtractor;
import org.apache.james.mailbox.BlobManager;
import org.apache.james.mailbox.FlagsBuilder;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.AppendCommand;
@@ -108,7 +109,7 @@ public class GetMessagesMethodTest {
GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver();
mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver);
- session = MailboxSession.create(ROBERT.asString());
+ session = MailboxSessionUtil.create(ROBERT.asString());
inboxPath = MailboxPath.inbox(session);
customMailboxPath = new MailboxPath(inboxPath, "custom");
mailboxManager.createMailbox(inboxPath, session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java
index 6c0d042..381ebd1 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java
@@ -51,6 +51,7 @@ import org.apache.james.mailbox.AttachmentManager;
import org.apache.james.mailbox.BlobManager;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageUid;
@@ -140,7 +141,7 @@ public class SetMessagesCreationProcessorTest {
MessageIdManager mockMessageIdManager = mock(MessageIdManager.class);
fakeSystemMailboxesProvider = new TestSystemMailboxesProvider(() -> optionalOutbox, () -> optionalDrafts);
- session = MailboxSession.create(USER);
+ session = MailboxSessionUtil.create(USER);
MIMEMessageConverter mimeMessageConverter = new MIMEMessageConverter();
messageAppender = new MessageAppender(mockedMailboxManager, mockMessageIdManager, mockedAttachmentManager, mimeMessageConverter);
messageSender = new MessageSender(mockedMailSpool, mockedMailFactory);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java
index e07225c..7736737 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java
@@ -26,6 +26,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.james.jmap.exceptions.InvalidOriginMessageForMDNException;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.model.TestMessageId;
import org.apache.james.mdn.action.mode.DispositionActionMode;
import org.apache.james.mdn.sending.mode.DispositionSendingMode;
@@ -55,7 +56,7 @@ public class JmapMDNTest {
.subject(SUBJECT)
.textBody(TEXT_BODY)
.build();
- public static final MailboxSession MAILBOX_SESSION = MailboxSession.create("user@localhost.com");
+ public static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create("user@localhost.com");
@Test
public void shouldMatchBeanContract() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
index 4db4288..a833156 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
@@ -30,7 +30,7 @@ import org.apache.james.backends.es.EmbeddedElasticSearch;
import org.apache.james.backends.es.utils.TestingClientProvider;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.quota.search.QuotaSearchTestSystem;
@@ -82,7 +82,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef
new QuotaRatioToElasticSearchJson());
resources.getMailboxManager()
- .addGlobalListener(listener, MailboxSession.create("ANY"));
+ .addGlobalListener(listener, MailboxSessionUtil.create("ANY"));
QuotaSearchTestSystem quotaSearchTestSystem = new QuotaSearchTestSystem(
resources.getMaxQuotaManager(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1fdf8bc/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index e9164df..4081afd 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -35,7 +35,7 @@ import java.util.List;
import java.util.Map;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxExistsException;
@@ -733,7 +733,7 @@ class UserMailboxesRoutesTest {
@BeforeEach
void setUp() throws Exception {
mailboxManager = mock(MailboxManager.class);
- when(mailboxManager.createSystemSession(any())).thenReturn(MailboxSession.create(USERNAME));
+ when(mailboxManager.createSystemSession(any())).thenReturn(MailboxSessionUtil.create(USERNAME));
createServer(mailboxManager);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org