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:49 UTC
[06/13] james-project git commit: MAILBOX-365 Get rid of
MockMailboxSession
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
index 5dc037c..897f329 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
@@ -32,6 +32,7 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import org.apache.james.core.MailAddress;
+import org.apache.james.core.User;
import org.apache.james.core.builder.MimeMessageBuilder;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
@@ -54,9 +55,9 @@ public class LocalDeliveryTest {
public static final String RECEIVER_DOMAIN_COM = "receiver@domain.com";
private UsersRepository usersRepository;
private MailboxManager mailboxManager;
- private MailboxSession.User user;
private FakeMailetConfig config;
private LocalDelivery testee;
+ private MailboxSession session;
@Before
public void setUp() throws Exception {
@@ -67,11 +68,10 @@ public class LocalDeliveryTest {
when(metricFactory.generate(anyString())).thenReturn(mock(Metric.class));
testee = new LocalDelivery(usersRepository, mailboxManager, metricFactory);
- user = mock(MailboxSession.User.class);
- MailboxSession session = mock(MailboxSession.class);
+ session = mock(MailboxSession.class);
when(session.getPathDelimiter()).thenReturn('.');
when(mailboxManager.createSystemSession(any(String.class))).thenReturn(session);
- when(session.getUser()).thenReturn(user);
+
config = FakeMailetConfig.builder()
.mailetName("Local delivery")
@@ -89,7 +89,7 @@ public class LocalDeliveryTest {
when(usersRepository.supportVirtualHosting()).thenReturn(true);
when(usersRepository.getUser(new MailAddress(username))).thenReturn(username);
when(mailboxManager.getMailbox(eq(inbox), any(MailboxSession.class))).thenReturn(messageManager);
- when(user.getUserName()).thenReturn(username);
+ when(session.getUser()).thenReturn(User.fromUsername(username));
// When
Mail mail = createMail();
@@ -110,7 +110,7 @@ public class LocalDeliveryTest {
when(usersRepository.getUser(new MailAddress("receiver@localhost"))).thenReturn(username);
when(usersRepository.getUser(new MailAddress(RECEIVER_DOMAIN_COM))).thenReturn(username);
when(mailboxManager.getMailbox(eq(inbox), any(MailboxSession.class))).thenReturn(messageManager);
- when(user.getUserName()).thenReturn(username);
+ when(session.getUser()).thenReturn(User.fromUsername(username));
// When
Mail mail = createMail();
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
index 50c38b6..bbb6cde 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
@@ -33,6 +33,7 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import org.apache.james.core.MailAddress;
+import org.apache.james.core.User;
import org.apache.james.core.builder.MimeMessageBuilder;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
@@ -65,8 +66,8 @@ public class ToRecipientFolderTest {
private UsersRepository usersRepository;
private MailboxManager mailboxManager;
private ToRecipientFolder testee;
- private MailboxSession.User user;
private FakeMailContext mailetContext;
+ private MailboxSession session;
@Before
public void setUp() throws Exception {
@@ -74,21 +75,20 @@ public class ToRecipientFolderTest {
messageManager = mock(MessageManager.class);
usersRepository = mock(UsersRepository.class);
mailboxManager = mock(MailboxManager.class);
- user = mock(MailboxSession.User.class);
MetricFactory metricFactory = mock(MetricFactory.class);
when(metricFactory.generate(anyString())).thenReturn(mock(Metric.class));
testee = new ToRecipientFolder(mailboxManager, usersRepository, metricFactory);
- MailboxSession session = mock(MailboxSession.class);
+ session = mock(MailboxSession.class);
when(session.getPathDelimiter()).thenReturn('.');
try {
when(mailboxManager.createSystemSession(any(String.class))).thenReturn(session);
} catch (MailboxException e) {
throw new RuntimeException(e);
}
- when(session.getUser()).thenReturn(user);
+ when(session.getUser()).thenReturn(User.fromUsername(USER));
}
@Test
@@ -134,7 +134,6 @@ public class ToRecipientFolderTest {
when(usersRepository.supportVirtualHosting()).thenReturn(true);
when(usersRepository.getUser(new MailAddress(USER))).thenReturn(USER);
when(mailboxManager.getMailbox(eq(JUNK_VIRTUAL_HOSTING), any(MailboxSession.class))).thenReturn(messageManager);
- when(user.getUserName()).thenReturn(USER);
testee.init(FakeMailetConfig.builder()
.mailetName(MAILET_NAME)
@@ -151,7 +150,6 @@ public class ToRecipientFolderTest {
when(usersRepository.supportVirtualHosting()).thenReturn(true);
when(usersRepository.getUser(new MailAddress(USER))).thenReturn(USER);
when(mailboxManager.getMailbox(eq(INBOX), any(MailboxSession.class))).thenReturn(messageManager);
- when(user.getUserName()).thenReturn(USER);
testee.init(FakeMailetConfig.builder()
.mailetName(MAILET_NAME)
@@ -168,7 +166,7 @@ public class ToRecipientFolderTest {
when(usersRepository.getUser(new MailAddress(USER_LOCAL_PART + "@localhost"))).thenReturn(USER_LOCAL_PART);
when(usersRepository.getUser(new MailAddress(USER))).thenReturn(USER_LOCAL_PART);
when(mailboxManager.getMailbox(eq(JUNK), any(MailboxSession.class))).thenReturn(messageManager);
- when(user.getUserName()).thenReturn(USER_LOCAL_PART);
+ when(session.getUser()).thenReturn(User.fromUsername(USER_LOCAL_PART));
testee.init(FakeMailetConfig.builder()
.mailetName(MAILET_NAME)
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 ab88f63..88f61a6 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
@@ -27,7 +27,6 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.metrics.api.NoopMetricFactory;
@@ -48,7 +47,7 @@ public class DefaultMailboxesProvisioningFilterTest {
@Before
public void before() throws Exception {
- session = new MockMailboxSession(USERNAME);
+ session = MailboxSession.create(USERNAME);
InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
mailboxManager = inMemoryIntegrationResources.createMailboxManager(new SimpleGroupMembershipResolver());
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 46f2ef1..2ad136a 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
@@ -31,7 +31,6 @@ import java.util.Optional;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.SubscriptionManager;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.TestId;
import org.apache.james.metrics.api.NoopMetricFactory;
@@ -50,7 +49,7 @@ public class DefaultMailboxesProvisioningFilterThreadTest {
@Before
public void before() {
- session = new MockMailboxSession(USERNAME);
+ session = MailboxSession.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/71c5a800/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 79f1c34..945fefa 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,7 +34,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
@@ -72,7 +71,7 @@ public class UserProvisioningFilterTest {
@Test
public void filterShouldAddUsernameWhenNoVirtualHostingAndMailboxSessionContainsUsername() throws Exception {
usersRepository.setEnableVirtualHosting(false);
- MailboxSession mailboxSession = new MockMailboxSession(USERNAME);
+ MailboxSession mailboxSession = MailboxSession.create(USERNAME);
when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
.thenReturn(mailboxSession);
@@ -85,7 +84,7 @@ public class UserProvisioningFilterTest {
@Test
public void filterShouldAddUsernameWhenNoVirtualHostingAndMailboxSessionContainsMail() throws Exception {
usersRepository.setEnableVirtualHosting(false);
- MailboxSession mailboxSession = new MockMailboxSession(MAIL);
+ MailboxSession mailboxSession = MailboxSession.create(MAIL);
when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
.thenReturn(mailboxSession);
@@ -101,7 +100,7 @@ public class UserProvisioningFilterTest {
when(usersRepository.isReadOnly()).thenReturn(true);
sut = new UserProvisioningFilter(usersRepository, new NoopMetricFactory());
- MailboxSession mailboxSession = new MockMailboxSession(MAIL);
+ MailboxSession mailboxSession = MailboxSession.create(MAIL);
when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
.thenReturn(mailboxSession);
@@ -117,7 +116,7 @@ public class UserProvisioningFilterTest {
when(usersRepository.isReadOnly()).thenReturn(true);
sut = new UserProvisioningFilter(usersRepository, new NoopMetricFactory());
- MailboxSession mailboxSession = new MockMailboxSession(MAIL);
+ MailboxSession mailboxSession = MailboxSession.create(MAIL);
when(request.getAttribute(AuthenticationFilter.MAILBOX_SESSION))
.thenReturn(mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 19389e8..b0738d5 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,7 +22,6 @@ import java.time.Duration;
import java.util.concurrent.ExecutionException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
@@ -38,7 +37,7 @@ public class UserProvisioningFilterThreadTest {
@Before
public void before() {
usersRepository = MemoryUsersRepository.withoutVirtualHosting();
- session = new MockMailboxSession("username");
+ session = MailboxSession.create("username");
sut = new UserProvisioningFilter(usersRepository, new NoopMetricFactory());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 2bfdcde..ea92f14 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
@@ -27,7 +27,6 @@ import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.MailboxACL.Entry;
import org.apache.james.mailbox.model.MailboxACL.EntryKey;
@@ -60,7 +59,7 @@ public class PropagateLookupRightListenerTest {
private StoreMailboxManager storeMailboxManager;
private PropagateLookupRightListener testee;
- private MailboxSession mailboxSession = new MockMailboxSession(OWNER_USER);
+ private MailboxSession mailboxSession = MailboxSession.create(OWNER_USER);
private MailboxId parentMailboxId;
private MailboxId parentMailboxId1;
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 f34eff0..f5b236e 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
@@ -31,7 +31,6 @@ import org.apache.james.jmap.model.CreationMessageId;
import org.apache.james.mailbox.AttachmentManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.AttachmentId;
import org.junit.Before;
import org.junit.Test;
@@ -55,7 +54,7 @@ public class AttachmentCheckerTest {
@Before
public void setUp() {
- session = new MockMailboxSession("Jonhy");
+ session = MailboxSession.create("Jonhy");
attachmentManager = mock(AttachmentManager.class);
sut = new AttachmentChecker(attachmentManager);
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 7abe7fb..d8015a2 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
@@ -45,7 +45,6 @@ import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.quota.QuotaManager;
@@ -112,7 +111,7 @@ public class GetMailboxesMethodTest {
GetMailboxesRequest getMailboxesRequest = GetMailboxesRequest.builder()
.build();
- MailboxSession session = new MockMailboxSession(USERNAME);
+ MailboxSession session = MailboxSession.create(USERNAME);
List<JmapResponse> getMailboxesResponse = testee.process(getMailboxesRequest, clientId, session).collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 ac0e6df..464b045 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
@@ -53,7 +53,6 @@ import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.AppendCommand;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.BlobId;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.MailboxId;
@@ -109,7 +108,7 @@ public class GetMessagesMethodTest {
GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver();
mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver);
- session = new MockMailboxSession(ROBERT.asString());
+ session = MailboxSession.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/71c5a800/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 f64a6ea..6c0d042 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
@@ -59,7 +59,6 @@ import org.apache.james.mailbox.SystemMailboxesProvider;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
import org.apache.james.mailbox.inmemory.InMemoryId;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxId.Factory;
@@ -107,7 +106,7 @@ public class SetMessagesCreationProcessorTest {
private MessageFactory messageFactory;
private MailSpool mockedMailSpool;
private SystemMailboxesProvider fakeSystemMailboxesProvider;
- private MockMailboxSession session;
+ private MailboxSession session;
private AttachmentManager mockedAttachmentManager;
private MailboxManager mockedMailboxManager;
private Factory mockedMailboxIdFactory;
@@ -141,7 +140,7 @@ public class SetMessagesCreationProcessorTest {
MessageIdManager mockMessageIdManager = mock(MessageIdManager.class);
fakeSystemMailboxesProvider = new TestSystemMailboxesProvider(() -> optionalOutbox, () -> optionalDrafts);
- session = new MockMailboxSession(USER);
+ session = MailboxSession.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/71c5a800/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 064a0be..e07225c 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
@@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.nio.charset.StandardCharsets;
import org.apache.james.jmap.exceptions.InvalidOriginMessageForMDNException;
-import org.apache.james.mailbox.mock.MockMailboxSession;
+import org.apache.james.mailbox.MailboxSession;
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 +55,7 @@ public class JmapMDNTest {
.subject(SUBJECT)
.textBody(TEXT_BODY)
.build();
- public static final MockMailboxSession MAILBOX_SESSION = new MockMailboxSession("user@localhost.com");
+ public static final MailboxSession MAILBOX_SESSION = MailboxSession.create("user@localhost.com");
@Test
public void shouldMatchBeanContract() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 2e9c409..4db4288 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,9 +30,9 @@ 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.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.quota.search.QuotaSearchTestSystem;
import org.apache.james.quota.search.elasticsearch.ElasticSearchQuotaSearcher;
import org.apache.james.quota.search.elasticsearch.QuotaRatioElasticSearchConstants;
@@ -82,7 +82,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef
new QuotaRatioToElasticSearchJson());
resources.getMailboxManager()
- .addGlobalListener(listener, new MockMailboxSession("ANY"));
+ .addGlobalListener(listener, MailboxSession.create("ANY"));
QuotaSearchTestSystem quotaSearchTestSystem = new QuotaSearchTestSystem(
resources.getMaxQuotaManager(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c5a800/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 3e3aaaf..e9164df 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,13 +35,13 @@ 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.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxExistsException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
-import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.search.MailboxQuery;
@@ -733,7 +733,7 @@ class UserMailboxesRoutesTest {
@BeforeEach
void setUp() throws Exception {
mailboxManager = mock(MailboxManager.class);
- when(mailboxManager.createSystemSession(any())).thenReturn(new MockMailboxSession(USERNAME));
+ when(mailboxManager.createSystemSession(any())).thenReturn(MailboxSession.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