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 ro...@apache.org on 2016/09/05 12:51:30 UTC
[1/2] james-project git commit: JAMES-1818 Remove store imports in
test classes
Repository: james-project
Updated Branches:
refs/heads/master 47cfda6cc -> 40644067f
JAMES-1818 Remove store imports in test classes
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/40644067
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/40644067
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/40644067
Branch: refs/heads/master
Commit: 40644067fcff28a223a5dccf29fae0871d36c907
Parents: c9b67ae
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Fri Sep 2 11:26:34 2016 +0200
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Mon Sep 5 14:49:07 2016 +0200
----------------------------------------------------------------------
server/protocols/jmap/pom.xml | 6 --
.../FirstUserConnectionFilterThreadTest.java | 4 +-
.../jmap/methods/GetMailboxesMethodTest.java | 24 +++-----
.../jmap/methods/GetMessagesMethodTest.java | 42 +++++--------
.../SetMessagesCreationProcessorTest.java | 15 +----
.../james/jmap/model/MailboxFactoryTest.java | 16 +----
.../apache/james/jmap/send/MailFactoryTest.java | 10 ++--
.../jmap/send/PostDequeueDecoratorTest.java | 62 +++++++-------------
.../james/jmap/utils/MailboxUtilsTest.java | 12 +---
.../utils/SortToComparatorConvertorTest.java | 34 +++++------
10 files changed, 76 insertions(+), 149 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 5f0436e..60c4c42 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -169,12 +169,6 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/server/protocols/jmap/src/test/java/org/apache/james/jmap/FirstUserConnectionFilterThreadTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/FirstUserConnectionFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/FirstUserConnectionFilterThreadTest.java
index bde96d6..f7ea5e9 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/FirstUserConnectionFilterThreadTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/FirstUserConnectionFilterThreadTest.java
@@ -30,6 +30,7 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.BadCredentialsException;
import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.MailboxACL.MailboxACLCommand;
import org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey;
import org.apache.james.mailbox.model.MailboxACL.MailboxACLRight;
@@ -42,7 +43,6 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MailboxQuery;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MultimailboxesSearchQuery;
-import org.apache.james.mailbox.store.SimpleMailboxSession;
import org.apache.james.user.lib.mock.InMemoryUsersRepository;
import org.junit.Test;
import org.slf4j.Logger;
@@ -63,7 +63,7 @@ public class FirstUserConnectionFilterThreadTest {
@ThreadedBefore
public void before() {
usersRepository = new InMemoryUsersRepository();
- session = new SimpleMailboxSession(0, "username", null, null, null, ':', null);
+ session = new MockMailboxSession("username");
mailboxManager = new FakeMailboxManager(session) ;
sut = new FirstUserConnectionFilter(usersRepository, mailboxManager);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/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 be20137..b62fea3 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
@@ -42,17 +42,11 @@ import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
-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.inmemory.InMemoryId;
-import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
+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.MockAuthenticator;
-import org.apache.james.mailbox.store.SimpleMailboxSession;
-import org.apache.james.mailbox.store.StoreMailboxManager;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.assertj.core.groups.Tuple;
import org.junit.Before;
import org.junit.Test;
@@ -67,21 +61,17 @@ public class GetMailboxesMethodTest {
private static final String USERNAME = "username@domain.tld";
private static final String USERNAME2 = "username2@domain.tld";
- private StoreMailboxManager mailboxManager;
+ private MailboxManager mailboxManager;
private GetMailboxesMethod getMailboxesMethod;
private ClientId clientId;
- private InMemoryMailboxSessionMapperFactory mailboxMapperFactory;
private MailboxFactory mailboxFactory;
@Before
public void setup() throws Exception {
clientId = ClientId.of("#0");
- mailboxMapperFactory = new InMemoryMailboxSessionMapperFactory();
- MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
- GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
- MessageParser messageParser = new MessageParser();
- mailboxManager = new StoreMailboxManager(mailboxMapperFactory, new MockAuthenticator(), aclResolver, groupMembershipResolver, messageParser);
- mailboxManager.init();
+ InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
+ GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver();
+ mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver);
mailboxFactory = new MailboxFactory(mailboxManager);
getMailboxesMethod = new GetMailboxesMethod(mailboxManager, mailboxFactory);
@@ -116,7 +106,7 @@ public class GetMailboxesMethodTest {
GetMailboxesRequest getMailboxesRequest = GetMailboxesRequest.builder()
.build();
- MailboxSession session = new SimpleMailboxSession(0, USERNAME, "", null, null, '.', null);
+ MailboxSession session = new MockMailboxSession(USERNAME);
List<JmapResponse> getMailboxesResponse = testee.process(getMailboxesRequest, clientId, session).collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/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 09f06e0..e9b0bbf 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
@@ -20,7 +20,9 @@ package org.apache.james.jmap.methods;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
import java.util.Date;
@@ -42,26 +44,19 @@ import org.apache.james.jmap.model.MessageFactory;
import org.apache.james.jmap.model.MessageId;
import org.apache.james.jmap.model.MessagePreviewGenerator;
import org.apache.james.jmap.model.MessageProperties.MessageProperty;
-import org.apache.james.jmap.utils.HtmlTextExtractor;
-import org.apache.james.jmap.utils.MailboxBasedHtmlTextExtractor;
+import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
-import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
+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.MockAuthenticator;
-import org.apache.james.mailbox.store.StoreMailboxManager;
-import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.assertj.core.api.Condition;
import org.assertj.core.data.MapEntry;
import org.assertj.core.groups.Tuple;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
@@ -73,8 +68,6 @@ import com.jayway.jsonpath.JsonPath;
public class GetMessagesMethodTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(GetMessagesMethodTest.class);
-
private static class User implements org.apache.james.mailbox.MailboxSession.User {
final String username;
final String password;
@@ -107,7 +100,7 @@ public class GetMessagesMethodTest {
private static final User ROBERT = new User("robert", "secret");
- private StoreMailboxManager mailboxManager;
+ private MailboxManager mailboxManager;
private GetMessagesMethod testee;
private MailboxSession session;
@@ -115,23 +108,18 @@ public class GetMessagesMethodTest {
private ClientId clientId;
@Before
- public void setup() throws MailboxException {
+ public void setup() throws Exception {
clientId = ClientId.of("#0");
- InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
- HtmlTextExtractor htmlTextExtractor = new MailboxBasedHtmlTextExtractor(new DefaultTextExtractor());
- MessagePreviewGenerator messagePreview = new MessagePreviewGenerator(htmlTextExtractor);
+ MessagePreviewGenerator messagePreview = mock(MessagePreviewGenerator.class);
+ when(messagePreview.forHTMLBody(any())).thenReturn("html preview");
+ when(messagePreview.forTextBody(any())).thenReturn("text preview");
MessageContentExtractor messageContentExtractor = new MessageContentExtractor();
MessageFactory messageFactory = new MessageFactory(messagePreview, messageContentExtractor);
- MockAuthenticator authenticator = new MockAuthenticator();
- authenticator.addUser(ROBERT.username, ROBERT.password);
- UnionMailboxACLResolver aclResolver = new UnionMailboxACLResolver();
- SimpleGroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
- MessageParser messageParser = new MessageParser();
- mailboxManager = new StoreMailboxManager(mailboxSessionMapperFactory, authenticator, aclResolver, groupMembershipResolver, messageParser);
- mailboxManager.init();
-
+ InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
+ GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver();
+ mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver);
- session = mailboxManager.login(ROBERT.username, ROBERT.password, LOGGER);
+ session = new MockMailboxSession(ROBERT.username);
inboxPath = MailboxPath.inbox(session);
mailboxManager.createMailbox(inboxPath, session);
testee = new GetMessagesMethod(mailboxManager, messageFactory);
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/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 e65a3c6..5a97018 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
@@ -53,8 +53,6 @@ import org.apache.james.jmap.model.mailbox.Role;
import org.apache.james.jmap.send.MailFactory;
import org.apache.james.jmap.send.MailMetadata;
import org.apache.james.jmap.send.MailSpool;
-import org.apache.james.jmap.utils.HtmlTextExtractor;
-import org.apache.james.jmap.utils.MailboxBasedHtmlTextExtractor;
import org.apache.james.jmap.utils.SystemMailboxesProvider;
import org.apache.james.mailbox.AttachmentManager;
import org.apache.james.mailbox.MailboxSession;
@@ -65,9 +63,6 @@ import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.AttachmentId;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
-import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
-import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.mailet.Mail;
import org.junit.Before;
import org.junit.Ignore;
@@ -117,9 +112,9 @@ public class SetMessagesCreationProcessorTest {
@Before
public void setUp() throws MailboxException {
- HtmlTextExtractor htmlTextExtractor = new MailboxBasedHtmlTextExtractor(new DefaultTextExtractor());
- MessagePreviewGenerator messagePreview = new MessagePreviewGenerator(htmlTextExtractor);
+ MessagePreviewGenerator messagePreview = mock(MessagePreviewGenerator.class);
MessageContentExtractor messageContentExtractor = new MessageContentExtractor();
+ when(messagePreview.forTextBody(any())).thenReturn("text preview");
messageFactory = new MessageFactory(messagePreview, messageContentExtractor);
mockedMailSpool = mock(MailSpool.class);
mockedMailFactory = mock(MailFactory.class);
@@ -153,12 +148,8 @@ public class SetMessagesCreationProcessorTest {
@Test
public void processShouldReturnNonEmptyCreatedWhenRequestHasNonEmptyCreate() throws MailboxException {
// Given
- MessageMapper stubMapper = mock(MessageMapper.class);
- MailboxSessionMapperFactory mockSessionMapperFactory = mock(MailboxSessionMapperFactory.class);
- when(mockSessionMapperFactory.createMessageMapper(any(MailboxSession.class)))
- .thenReturn(stubMapper);
-
sut = new SetMessagesCreationProcessor(mimeMessageConverter, mockedMailSpool, mockedMailFactory, messageFactory, fakeSystemMailboxesProvider, mockedAttachmentManager);
+
// When
SetMessagesResponse result = sut.process(createMessageInOutbox, session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
----------------------------------------------------------------------
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 e404b70..9964921 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,11 +27,9 @@ import org.apache.james.jmap.utils.MailboxUtilsTest;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.inmemory.InMemoryId;
-import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.mail.MailboxMapperFactory;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -41,7 +39,6 @@ public class MailboxFactoryTest {
private static final Logger LOGGER = LoggerFactory.getLogger(MailboxUtilsTest.class);
private MailboxManager mailboxManager;
- private MailboxMapperFactory mailboxMapperFactory;
private MailboxSession mailboxSession;
private String user;
private MailboxFactory sut;
@@ -50,7 +47,6 @@ public class MailboxFactoryTest {
public void setup() throws Exception {
InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
mailboxManager = inMemoryIntegrationResources.createMailboxManager(inMemoryIntegrationResources.createGroupMembershipResolver());
- mailboxMapperFactory = new InMemoryMailboxSessionMapperFactory();
user = "user@domain.org";
mailboxSession = mailboxManager.login(user, "pass", LOGGER);
sut = new MailboxFactory(mailboxManager);
@@ -67,9 +63,7 @@ public class MailboxFactoryTest {
public void mailboxFromMailboxIdShouldReturnPresentWhenExists() throws Exception {
MailboxPath mailboxPath = new MailboxPath("#private", user, "myBox");
mailboxManager.createMailbox(mailboxPath, mailboxSession);
- MailboxId mailboxId = mailboxMapperFactory.getMailboxMapper(mailboxSession)
- .findMailboxByPath(mailboxPath)
- .getMailboxId();
+ MailboxId mailboxId = mailboxManager.getMailbox(mailboxPath, mailboxSession).getId();
Optional<Mailbox> mailbox = sut.fromMailboxId(mailboxId, mailboxSession);
assertThat(mailbox).isPresent();
@@ -134,9 +128,7 @@ public class MailboxFactoryTest {
public void getParentIdFromMailboxPathShouldReturnParentIdWhenChildMailbox() throws Exception {
MailboxPath parentMailboxPath = new MailboxPath("#private", user, "inbox");
mailboxManager.createMailbox(parentMailboxPath, mailboxSession);
- MailboxId parentId = mailboxMapperFactory.getMailboxMapper(mailboxSession)
- .findMailboxByPath(parentMailboxPath)
- .getMailboxId();
+ MailboxId parentId = mailboxManager.getMailbox(parentMailboxPath, mailboxSession).getId();
MailboxPath mailboxPath = new MailboxPath("#private", user, "inbox.mailbox");
mailboxManager.createMailbox(mailboxPath, mailboxSession);
@@ -152,9 +144,7 @@ public class MailboxFactoryTest {
MailboxPath parentMailboxPath = new MailboxPath("#private", user, "inbox.children");
mailboxManager.createMailbox(parentMailboxPath, mailboxSession);
- MailboxId parentId = mailboxMapperFactory.getMailboxMapper(mailboxSession)
- .findMailboxByPath(parentMailboxPath)
- .getMailboxId();
+ MailboxId parentId = mailboxManager.getMailbox(parentMailboxPath, mailboxSession).getId();
mailboxManager.createMailbox(mailboxPath, mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
index e0a3099..4ee494d 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
@@ -19,6 +19,9 @@
package org.apache.james.jmap.send;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.Collection;
import java.util.Date;
@@ -32,12 +35,9 @@ import org.apache.james.jmap.model.MessageFactory;
import org.apache.james.jmap.model.MessageFactory.MetaDataWithContent;
import org.apache.james.jmap.model.MessageId;
import org.apache.james.jmap.model.MessagePreviewGenerator;
-import org.apache.james.jmap.utils.HtmlTextExtractor;
-import org.apache.james.jmap.utils.MailboxBasedHtmlTextExtractor;
import org.apache.james.mailbox.FlagsBuilder;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
-import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.junit.Before;
@@ -73,8 +73,8 @@ public class MailFactoryTest {
.mailboxId(InMemoryId.of(3))
.messageId(MessageId.of("test|test|2"))
.build();
- HtmlTextExtractor htmlTextExtractor = new MailboxBasedHtmlTextExtractor(new DefaultTextExtractor());
- MessagePreviewGenerator messagePreview = new MessagePreviewGenerator(htmlTextExtractor);
+ MessagePreviewGenerator messagePreview = mock(MessagePreviewGenerator.class);
+ when(messagePreview.forTextBody(any())).thenReturn("text preview");
MessageContentExtractor messageContentExtractor = new MessageContentExtractor();
MessageFactory messageFactory = new MessageFactory(messagePreview, messageContentExtractor);
jmapMessage = messageFactory.fromMetaDataWithContent(message);
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
index 858b685..4fa8197 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
@@ -25,29 +25,22 @@ import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
import java.util.Date;
-import java.util.Iterator;
import javax.mail.Flags;
import org.apache.james.jmap.exceptions.MailboxRoleNotFoundException;
import org.apache.james.jmap.model.MessageId;
import org.apache.james.jmap.send.exception.MailShouldBeInOutboxException;
+import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
-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.inmemory.InMemoryMailboxSessionMapperFactory;
+import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
+import org.apache.james.mailbox.model.FetchGroupImpl;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageRange;
-import org.apache.james.mailbox.store.MockAuthenticator;
-import org.apache.james.mailbox.store.StoreMailboxManager;
-import org.apache.james.mailbox.store.mail.MessageMapper;
-import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.model.MessageResultIterator;
import org.apache.james.queue.api.MailQueue.MailQueueItem;
import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
@@ -66,20 +59,16 @@ public class PostDequeueDecoratorTest {
private static final MailboxPath SENT_MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, SENT);
private static final String MESSAGE_ID = USERNAME + "|" + OUTBOX_MAILBOX_PATH.getName() + "|" + UID;
- private InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory;
- private StoreMailboxManager mailboxManager;
+ private MailboxManager mailboxManager;
private MailQueueItem mockedMailQueueItem;
private Mail mail;
private PostDequeueDecorator testee;
@Before
public void init() throws Exception {
- mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
- MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
- GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
- MessageParser messageParser = new MessageParser();
- mailboxManager = new StoreMailboxManager(mailboxSessionMapperFactory, new MockAuthenticator(), aclResolver, groupMembershipResolver, messageParser);
- mailboxManager.init();
+ InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
+ GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver();
+ mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver);
mockedMailQueueItem = mock(MailQueueItem.class);
mail = new FakeMail();
@@ -135,9 +124,8 @@ public class PostDequeueDecoratorTest {
testee.done(true);
- Mailbox sentMailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxByPath(SENT_MAILBOX_PATH);
- MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(mailboxSession);
- Iterator<MailboxMessage> resultIterator = messageMapper.findInMailbox(sentMailbox, MessageRange.one(UID), MessageMapper.FetchType.Full, 1);
+ MessageManager sentMailbox = mailboxManager.getMailbox(SENT_MAILBOX_PATH, mailboxSession);
+ MessageResultIterator resultIterator = sentMailbox.getMessages(MessageRange.one(UID), FetchGroupImpl.FULL_CONTENT, mailboxSession);
assertThat(resultIterator).hasSize(1);
}
@@ -153,9 +141,8 @@ public class PostDequeueDecoratorTest {
testee.done(true);
- Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxByPath(OUTBOX_MAILBOX_PATH);
- MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(mailboxSession);
- Iterator<MailboxMessage> resultIterator = messageMapper.findInMailbox(mailbox, MessageRange.one(UID), MessageMapper.FetchType.Full, 1);
+ MessageManager mailbox = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
+ MessageResultIterator resultIterator = mailbox.getMessages(MessageRange.one(UID), FetchGroupImpl.FULL_CONTENT, mailboxSession);
assertThat(resultIterator).hasSize(0);
}
@@ -171,9 +158,8 @@ public class PostDequeueDecoratorTest {
testee.done(false);
- Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxByPath(OUTBOX_MAILBOX_PATH);
- MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(mailboxSession);
- Iterator<MailboxMessage> resultIterator = messageMapper.findInMailbox(mailbox, MessageRange.one(UID), MessageMapper.FetchType.Full, 1);
+ MessageManager mailbox = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
+ MessageResultIterator resultIterator = mailbox.getMessages(MessageRange.one(UID), FetchGroupImpl.FULL_CONTENT, mailboxSession);
assertThat(resultIterator).hasSize(1);
}
@@ -187,9 +173,8 @@ public class PostDequeueDecoratorTest {
testee.done(true);
- Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxByPath(OUTBOX_MAILBOX_PATH);
- MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(mailboxSession);
- Iterator<MailboxMessage> resultIterator = messageMapper.findInMailbox(mailbox, MessageRange.one(UID), MessageMapper.FetchType.Full, 1);
+ MessageManager mailbox = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
+ MessageResultIterator resultIterator = mailbox.getMessages(MessageRange.one(UID), FetchGroupImpl.FULL_CONTENT, mailboxSession);
assertThat(resultIterator).hasSize(1);
}
@@ -204,9 +189,8 @@ public class PostDequeueDecoratorTest {
testee.done(true);
- Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxByPath(OUTBOX_MAILBOX_PATH);
- MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(mailboxSession);
- Iterator<MailboxMessage> resultIterator = messageMapper.findInMailbox(mailbox, MessageRange.one(UID), MessageMapper.FetchType.Full, 1);
+ MessageManager mailbox = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
+ MessageResultIterator resultIterator = mailbox.getMessages(MessageRange.one(UID), FetchGroupImpl.FULL_CONTENT, mailboxSession);
assertThat(resultIterator).hasSize(1);
}
@@ -221,9 +205,8 @@ public class PostDequeueDecoratorTest {
testee.done(true);
- Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxByPath(OUTBOX_MAILBOX_PATH);
- MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(mailboxSession);
- Iterator<MailboxMessage> resultIterator = messageMapper.findInMailbox(mailbox, MessageRange.one(UID), MessageMapper.FetchType.Full, 1);
+ MessageManager mailbox = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
+ MessageResultIterator resultIterator = mailbox.getMessages(MessageRange.one(UID), FetchGroupImpl.FULL_CONTENT, mailboxSession);
assertThat(resultIterator).hasSize(1);
}
@@ -239,9 +222,8 @@ public class PostDequeueDecoratorTest {
testee.done(true);
- Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxByPath(OUTBOX_MAILBOX_PATH);
- MessageMapper messageMapper = mailboxSessionMapperFactory.getMessageMapper(mailboxSession);
- Iterator<MailboxMessage> resultIterator = messageMapper.findInMailbox(mailbox, MessageRange.one(UID), MessageMapper.FetchType.Full, 1);
+ MessageManager mailbox = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
+ MessageResultIterator resultIterator = mailbox.getMessages(MessageRange.one(UID), FetchGroupImpl.FULL_CONTENT, mailboxSession);
assertThat(resultIterator).hasSize(1);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
index dc85e3e..5ea1428 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
@@ -23,11 +23,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.mail.MailboxMapperFactory;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -38,7 +36,6 @@ public class MailboxUtilsTest {
private static final Logger LOGGER = LoggerFactory.getLogger(MailboxUtilsTest.class);
private MailboxManager mailboxManager;
- private MailboxMapperFactory mailboxMapperFactory;
private MailboxSession mailboxSession;
private String user;
private MailboxUtils sut;
@@ -47,7 +44,6 @@ public class MailboxUtilsTest {
public void setup() throws Exception {
InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
mailboxManager = inMemoryIntegrationResources.createMailboxManager(inMemoryIntegrationResources.createGroupMembershipResolver());
- mailboxMapperFactory = new InMemoryMailboxSessionMapperFactory();
user = "user@domain.org";
mailboxSession = mailboxManager.login(user, "pass", LOGGER);
sut = new MailboxUtils(mailboxManager);
@@ -56,9 +52,7 @@ public class MailboxUtilsTest {
public void hasChildrenShouldReturnFalseWhenNoChild() throws Exception {
MailboxPath mailboxPath = new MailboxPath("#private", user, "myBox");
mailboxManager.createMailbox(mailboxPath, mailboxSession);
- MailboxId mailboxId = mailboxMapperFactory.getMailboxMapper(mailboxSession)
- .findMailboxByPath(mailboxPath)
- .getMailboxId();
+ MailboxId mailboxId = mailboxManager.getMailbox(mailboxPath, mailboxSession).getId();
assertThat(sut.hasChildren(mailboxId, mailboxSession)).isFalse();
}
@@ -67,9 +61,7 @@ public class MailboxUtilsTest {
public void hasChildrenShouldReturnTrueWhenHasAChild() throws Exception {
MailboxPath parentMailboxPath = new MailboxPath("#private", user, "inbox");
mailboxManager.createMailbox(parentMailboxPath, mailboxSession);
- MailboxId parentId = mailboxMapperFactory.getMailboxMapper(mailboxSession)
- .findMailboxByPath(parentMailboxPath)
- .getMailboxId();
+ MailboxId parentId = mailboxManager.getMailbox(parentMailboxPath, mailboxSession).getId();
MailboxPath mailboxPath = new MailboxPath("#private", user, "inbox.myBox");
mailboxManager.createMailbox(mailboxPath, mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/40644067/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java
index 22a6304..5290a10 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java
@@ -20,21 +20,18 @@
package org.apache.james.jmap.utils;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.IOException;
-import java.time.LocalDate;
+import java.time.ZonedDateTime;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
-import javax.mail.Flags;
-
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageResult;
-import org.apache.james.mailbox.store.MessageResultImpl;
-import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.junit.Before;
import org.junit.Test;
@@ -42,6 +39,8 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
public class SortToComparatorConvertorTest {
+ private static final Date DATE_2017 = Date.from(ZonedDateTime.parse("2017-10-09T08:07:06+07:00[Asia/Vientiane]").toInstant());
+ private static final Date DATE_2018 = Date.from(ZonedDateTime.parse("2018-10-09T08:07:06+07:00[Asia/Vientiane]").toInstant());
private MailboxPath mailboxPath;
private Entry firstMessage;
@@ -50,14 +49,14 @@ public class SortToComparatorConvertorTest {
@Before
public void setup() throws IOException {
- LocalDate date = LocalDate.now();
- SimpleMailboxMessage firstMailboxMessage = new SimpleMailboxMessage(new Date(date.toEpochDay()), 0, 0, null, new Flags(), new PropertyBuilder(), null);
- mailboxPath = new MailboxPath("#private", "user", "path");
- firstMailboxMessage.setUid(1);
- firstMessage = new Entry(mailboxPath, new MessageResultImpl(firstMailboxMessage));
- SimpleMailboxMessage secondMailboxMessage = new SimpleMailboxMessage(new Date(date.plusDays(1).toEpochDay()), 0, 0, null, new Flags(), new PropertyBuilder(), null);
- secondMailboxMessage.setUid(2);
- secondMessage = new Entry(mailboxPath, new MessageResultImpl(secondMailboxMessage));
+ MessageResult firstMessageResult = mock(MessageResult.class);
+ when(firstMessageResult.getInternalDate()).thenReturn(DATE_2017);
+ when(firstMessageResult.getUid()).thenReturn(1L);
+ firstMessage = new Entry(mailboxPath, firstMessageResult);
+ MessageResult secondMessageResult = mock(MessageResult.class);
+ when(secondMessageResult.getInternalDate()).thenReturn(DATE_2018);
+ when(secondMessageResult.getUid()).thenReturn(2L);
+ secondMessage = new Entry(mailboxPath, secondMessageResult);
messages = Lists.newArrayList(firstMessage, secondMessage);
}
@@ -91,9 +90,10 @@ public class SortToComparatorConvertorTest {
@Test
public void comparatorForShouldChainComparatorsWhenOnlyMultipleElementInList() throws IOException {
- SimpleMailboxMessage thirdMailboxMessage = new SimpleMailboxMessage(secondMessage.getValue().getInternalDate(), 0, 0, null, new Flags(), new PropertyBuilder(), null);
- thirdMailboxMessage.setUid(3);
- Entry thirdMessage = new Entry(mailboxPath, new MessageResultImpl(thirdMailboxMessage));
+ MessageResult thirdMessageResult = mock(MessageResult.class);
+ when(thirdMessageResult.getInternalDate()).thenReturn(DATE_2018);
+ when(thirdMessageResult.getUid()).thenReturn(3L);
+ Entry thirdMessage = new Entry(mailboxPath, thirdMessageResult);
messages.add(thirdMessage);
Comparator<Entry> comparator = SortToComparatorConvertor.comparatorFor(ImmutableList.of("date asc", "id desc"));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-1818 Move MockAuthenticator
into main
Posted by ro...@apache.org.
JAMES-1818 Move MockAuthenticator into main
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c9b67ae5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c9b67ae5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c9b67ae5
Branch: refs/heads/master
Commit: c9b67ae581d5ee687d6d6f20f894b857072b4998
Parents: 47cfda6
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Fri Sep 2 17:31:57 2016 +0200
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Mon Sep 5 14:49:07 2016 +0200
----------------------------------------------------------------------
.../ElasticSearchIntegrationTest.java | 4 +-
.../search/LuceneMessageSearchIndexTest.java | 4 +-
.../inmemory/InMemoryMailboxManagerTest.java | 4 +-
.../manager/InMemoryIntegrationResources.java | 4 +-
.../search/SimpleMessageSearchIndexTest.java | 4 +-
.../james/mailbox/store/FakeAuthenticator.java | 43 ++++++++++++++++++++
.../james/mailbox/store/MockAuthenticator.java | 43 --------------------
.../mailbox/store/StoreMailboxManagerTest.java | 2 +-
.../cassandra/host/CassandraHostSystem.java | 6 +--
.../host/ElasticSearchHostSystem.java | 6 +--
.../imapmailbox/hbase/host/HBaseHostSystem.java | 6 +--
.../InMemoryEventAsynchronousHostSystem.java | 6 +--
.../inmemory/host/InMemoryHostSystem.java | 6 +--
.../mpt/imapmailbox/jcr/host/JCRHostSystem.java | 6 +--
.../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 6 +--
.../maildir/host/MaildirHostSystem.java | 6 +--
.../adapter/mailbox/MailboxManagementTest.java | 4 +-
17 files changed, 80 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
----------------------------------------------------------------------
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 5d55b63..edfc939 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
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.search.AbstractMessageSearchIndexTest;
@@ -72,7 +72,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
new MessageToElasticSearchJson(new DefaultTextExtractor(), ZoneId.of("Europe/Paris")));
storeMailboxManager = new InMemoryMailboxManager(
mapperFactory,
- new MockAuthenticator(),
+ new FakeAuthenticator(),
new JVMMailboxPathLocker(),
new UnionMailboxACLResolver(),
new SimpleGroupMembershipResolver(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
----------------------------------------------------------------------
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 51f5ae7..dd3bd62 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
@@ -27,7 +27,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.search.AbstractMessageSearchIndexTest;
import org.apache.lucene.store.RAMDirectory;
@@ -45,7 +45,7 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest
messageSearchIndex = new LuceneMessageSearchIndex(mapperFactory, new InMemoryId.Factory(), new RAMDirectory());
storeMailboxManager = new InMemoryMailboxManager(
mapperFactory,
- new MockAuthenticator(),
+ new FakeAuthenticator(),
new JVMMailboxPathLocker(),
new UnionMailboxACLResolver(),
new SimpleGroupMembershipResolver(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
index e1b5007..40de979 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
@@ -25,7 +25,7 @@ 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.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.junit.runner.RunWith;
import org.xenei.junit.contract.Contract;
@@ -48,7 +48,7 @@ public class InMemoryMailboxManagerTest {
MessageParser messageParser = new MessageParser();
InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
- InMemoryMailboxManager mailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, new MockAuthenticator(), new JVMMailboxPathLocker(), aclResolver, groupMembershipResolver, messageParser);
+ InMemoryMailboxManager mailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, new FakeAuthenticator(), new JVMMailboxPathLocker(), aclResolver, groupMembershipResolver, messageParser);
try {
mailboxManager.init();
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
----------------------------------------------------------------------
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 bd399a5..7539934 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
@@ -33,7 +33,7 @@ import org.apache.james.mailbox.manager.ManagerTestResources;
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.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.NoMailboxPathLocker;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
@@ -49,7 +49,7 @@ public class InMemoryIntegrationResources implements IntegrationResources {
@Override
public MailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver) throws MailboxException {
- MockAuthenticator mockAuthenticator = new MockAuthenticator();
+ FakeAuthenticator mockAuthenticator = new FakeAuthenticator();
mockAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
final StoreMailboxManager manager = new InMemoryMailboxManager(
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java b/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java
index 202cf7d..34e351d 100644
--- a/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java
+++ b/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java
@@ -26,7 +26,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.junit.Ignore;
@@ -42,7 +42,7 @@ public class SimpleMessageSearchIndexTest extends AbstractMessageSearchIndexTest
messageSearchIndex = new SimpleMessageSearchIndex(mapperFactory, mapperFactory);
storeMailboxManager = new InMemoryMailboxManager(
mapperFactory,
- new MockAuthenticator(),
+ new FakeAuthenticator(),
new JVMMailboxPathLocker(),
new UnionMailboxACLResolver(),
new SimpleGroupMembershipResolver(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
new file mode 100644
index 0000000..5ce3126
--- /dev/null
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
@@ -0,0 +1,43 @@
+/****************************************************************
+ * 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.store;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class FakeAuthenticator implements Authenticator{
+
+ private final Map<String, String> users = new HashMap<String, String>();
+
+ public boolean isAuthentic(String userid, CharSequence passwd) {
+ String pass = users.get(userid);
+ if (pass != null) {
+ return passwd.toString().equals(pass);
+ }
+ return false;
+ }
+
+ public void addUser(String user, String password) {
+ users.put(user, password);
+ }
+
+ public void clear() {
+ users.clear();
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
deleted file mode 100644
index e231006..0000000
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
+++ /dev/null
@@ -1,43 +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.store;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class MockAuthenticator implements Authenticator{
-
- private final Map<String, String> users = new HashMap<String, String>();
-
- public boolean isAuthentic(String userid, CharSequence passwd) {
- String pass = users.get(userid);
- if (pass != null) {
- return passwd.toString().equals(pass);
- }
- return false;
- }
-
- public void addUser(String user, String password) {
- users .put(user, password);
- }
-
- public void clear() {
- users.clear();
- }
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
index 975e3e3..a81be1a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
@@ -55,7 +55,7 @@ public class StoreMailboxManagerTest {
mockedMailboxMapper = mock(MailboxMapper.class);
when(mockedMapperFactory.getMailboxMapper(mockedMailboxSession))
.thenReturn(mockedMailboxMapper);
- storeMailboxManager = new StoreMailboxManager(mockedMapperFactory, new MockAuthenticator(), new JVMMailboxPathLocker(), new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), new MessageParser());
+ storeMailboxManager = new StoreMailboxManager(mockedMapperFactory, new FakeAuthenticator(), new JVMMailboxPathLocker(), new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), new MessageParser());
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
index 501296f..33bfdcf 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
@@ -45,7 +45,7 @@ import org.apache.james.mailbox.cassandra.quota.CassandraPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
@@ -65,7 +65,7 @@ public class CassandraHostSystem extends JamesImapHostSystem {
Feature.ANNOTATION_SUPPORT);
private final CassandraMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private final CassandraCluster cassandraClusterSingleton;
public CassandraHostSystem() throws Exception {
@@ -81,7 +81,7 @@ public class CassandraHostSystem extends JamesImapHostSystem {
new CassandraAttachmentModule(),
new CassandraAnnotationModule());
cassandraClusterSingleton = CassandraCluster.create(mailboxModule);
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
com.datastax.driver.core.Session session = cassandraClusterSingleton.getConf();
CassandraModSeqProvider modSeqProvider = new CassandraModSeqProvider(session);
CassandraUidProvider uidProvider = new CassandraUidProvider(session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
index b354514..94c3106 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
+++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
@@ -47,7 +47,7 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
@@ -69,7 +69,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem {
private EmbeddedElasticSearch embeddedElasticSearch;
private Path tempDirectory;
private StoreMailboxManager mailboxManager;
- private MockAuthenticator userManager;
+ private FakeAuthenticator userManager;
public boolean addUser(String user, String password) throws Exception {
userManager.addUser(user, password);
@@ -100,7 +100,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem {
IndexCreationFactory.createIndex(new TestingClientProvider(embeddedElasticSearch.getNode()).get())
);
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory();
ElasticSearchListeningMessageSearchIndex searchIndex = new ElasticSearchListeningMessageSearchIndex(
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
index a205d32..4792a67 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
@@ -40,7 +40,7 @@ import org.apache.james.mailbox.hbase.HBaseMailboxSessionMapperFactory;
import org.apache.james.mailbox.hbase.mail.HBaseModSeqProvider;
import org.apache.james.mailbox.hbase.mail.HBaseUidProvider;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
@@ -64,7 +64,7 @@ public class HBaseHostSystem extends JamesImapHostSystem {
public static Boolean useMiniCluster = true;
private final HBaseMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private MiniHBaseCluster hbaseCluster;
private final Configuration conf;
@@ -89,7 +89,7 @@ public class HBaseHostSystem extends JamesImapHostSystem {
conf = HBaseConfiguration.create();
}
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
final HBaseModSeqProvider modSeqProvider = new HBaseModSeqProvider(conf);
final HBaseUidProvider uidProvider = new HBaseUidProvider(conf);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java
index fb491d1..7f71bd4 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java
@@ -33,7 +33,7 @@ import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager;
import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.quota.QuotaRootResolver;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.event.AsynchronousEventDelivery;
@@ -53,7 +53,7 @@ public class InMemoryEventAsynchronousHostSystem extends JamesImapHostSystem {
private static final ImapFeatures SUPPORTED_FEATURES = ImapFeatures.of(Feature.NAMESPACE_SUPPORT);
private StoreMailboxManager mailboxManager;
- private MockAuthenticator userManager;
+ private FakeAuthenticator userManager;
public static JamesImapHostSystem build() throws Exception {
return new InMemoryEventAsynchronousHostSystem();
@@ -74,7 +74,7 @@ public class InMemoryEventAsynchronousHostSystem extends JamesImapHostSystem {
}
private void initFields() throws MailboxException {
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory();
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
index 674a68c..4de9ee9 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator;
@@ -56,7 +56,7 @@ public class InMemoryHostSystem extends JamesImapHostSystem {
Feature.ANNOTATION_SUPPORT);
private InMemoryMailboxManager mailboxManager;
- private MockAuthenticator userManager;
+ private FakeAuthenticator userManager;
public static JamesImapHostSystem build() throws Exception {
return new InMemoryHostSystem();
@@ -77,7 +77,7 @@ public class InMemoryHostSystem extends JamesImapHostSystem {
}
private void initFields() throws MailboxException {
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
MessageParser messageParser = new MessageParser();
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
index 9f1724e..5536540 100644
--- a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
+++ b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
@@ -41,7 +41,7 @@ import org.apache.james.mailbox.jcr.mail.JCRModSeqProvider;
import org.apache.james.mailbox.jcr.mail.JCRUidProvider;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
import org.apache.james.mailbox.store.quota.NoQuotaManager;
@@ -59,7 +59,7 @@ public class JCRHostSystem extends JamesImapHostSystem{
}
private final JCRMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private static final String JACKRABBIT_HOME = "target/jackrabbit";
public static final String META_DATA_DIRECTORY = "target/user-meta-data";
@@ -83,7 +83,7 @@ public class JCRHostSystem extends JamesImapHostSystem{
// Register imap cnd file
JCRUtils.registerCnd(repository, workspace, user, pass);
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
JCRUidProvider uidProvider = new JCRUidProvider(locker, sessionRepos);
JCRModSeqProvider modSeqProvider = new JCRModSeqProvider(locker, sessionRepos);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
index 1889f2c..f03df7e 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
@@ -48,7 +48,7 @@ import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
import org.apache.james.mailbox.store.quota.NoQuotaManager;
@@ -69,7 +69,7 @@ public class JPAHostSystem extends JamesImapHostSystem {
}
private final OpenJPAMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private final EntityManagerFactory entityManagerFactory;
public JPAHostSystem() throws Exception {
@@ -112,7 +112,7 @@ public class JPAHostSystem extends JamesImapHostSystem {
JPAUserFlag.class.getName() + ";" +
JPASubscription.class.getName() + ")");
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
entityManagerFactory = OpenJPAPersistence.getEntityManagerFactory(properties);
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
JPAUidProvider uidProvider = new JPAUidProvider(locker, entityManagerFactory);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
index 52defda..73f132c 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
@@ -34,7 +34,7 @@ import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
import org.apache.james.mailbox.maildir.MaildirStore;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
@@ -52,7 +52,7 @@ public class MaildirHostSystem extends JamesImapHostSystem {
private static final ImapFeatures SUPPORTED_FEATURES = ImapFeatures.of();
private final StoreMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private final MaildirMailboxSessionMapperFactory mailboxSessionMapperFactory;
public static JamesImapHostSystem build() throws Exception {
@@ -60,7 +60,7 @@ public class MaildirHostSystem extends JamesImapHostSystem {
}
public MaildirHostSystem() throws MailboxException {
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user", locker);
mailboxSessionMapperFactory = new MaildirMailboxSessionMapperFactory(store);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index e38e78b..49dabd6 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
@@ -53,7 +53,7 @@ public class MailboxManagementTest {
inMemoryMapperFactory = new InMemoryMailboxSessionMapperFactory();
StoreMailboxManager mailboxManager = new StoreMailboxManager(
inMemoryMapperFactory,
- new MockAuthenticator(),
+ new FakeAuthenticator(),
new JVMMailboxPathLocker(),
new UnionMailboxACLResolver(),
new SimpleGroupMembershipResolver(),
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org