Author: matthieu
Date: Fri Dec 11 12:31:35 2015
New Revision: 1719374
URL: http://svn.apache.org/viewvc?rev=1719374&view=rev
Log:
JAMES-1644 Rename MockUsersRepository to InMemoryUsersRepository
Added:
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java
- copied, changed from r1719373,
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
Removed:
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
Modified:
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Modified:
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java?rev=1719374&r1=1719373&r2=1719374&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
(original)
+++
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
Fri Dec 11 12:31:35 2015
@@ -20,7 +20,7 @@ package org.apache.james.user.lib;
import java.util.Arrays;
import java.util.List;
-import org.apache.james.user.lib.mock.MockUsersRepository;
+import org.apache.james.user.lib.mock.InMemoryUsersRepository;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
@@ -30,12 +30,12 @@ import org.junit.Test;
*/
public class UsersRepositoryManagementTest {
- private MockUsersRepository m_mockUsersRepository;
+ private InMemoryUsersRepository m_mockUsersRepository;
private UsersRepositoryManagement m_userManagement;
@Before
public void setUp() throws Exception {
- m_mockUsersRepository = new MockUsersRepository();
+ m_mockUsersRepository = new InMemoryUsersRepository();
m_userManagement = new UsersRepositoryManagement();
m_userManagement.setUsersRepository(m_mockUsersRepository);
Copied:
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java
(from r1719373,
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java?p2=james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java&p1=james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java&r1=1719373&r2=1719374&rev=1719374&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
(original)
+++
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java
Fri Dec 11 12:31:35 2015
@@ -30,7 +30,7 @@ import org.apache.james.user.lib.Abstrac
import org.apache.james.user.lib.model.DefaultJamesUser;
import org.apache.james.user.lib.model.DefaultUser;
-public class MockUsersRepository extends AbstractJamesUsersRepository {
+public class InMemoryUsersRepository extends AbstractJamesUsersRepository {
private final HashMap<String, User> m_users = new HashMap<String, User>();
/**
Modified:
james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1719374&r1=1719373&r2=1719374&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Fri Dec 11 12:31:35 2015
@@ -58,7 +58,7 @@ import org.apache.james.protocols.lib.Po
import org.apache.james.protocols.lib.mock.MockProtocolHandlerLoader;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.james.user.lib.mock.MockUsersRepository;
+import org.apache.james.user.lib.mock.InMemoryUsersRepository;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -70,7 +70,7 @@ public class POP3ServerTest {
private final int pop3Port = PortUtil.getNonPrivilegedPort();
private POP3TestConfiguration pop3Configuration;
- private final MockUsersRepository usersRepository = new
MockUsersRepository();
+ private final InMemoryUsersRepository usersRepository = new
InMemoryUsersRepository();
private POP3Client pop3Client = null;
protected MockFileSystem fileSystem;
protected MockProtocolHandlerLoader protocolHandlerChain;
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=1719374&r1=1719373&r2=1719374&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Fri Dec 11 12:31:35 2015
@@ -65,7 +65,7 @@ import org.apache.james.rrt.api.Recipien
import org.apache.james.rrt.lib.Mappings;
import org.apache.james.smtpserver.netty.SMTPServer;
import org.apache.james.user.api.UsersRepository;
-import org.apache.james.user.lib.mock.MockUsersRepository;
+import org.apache.james.user.lib.mock.InMemoryUsersRepository;
import org.apache.mailet.HostAddress;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -168,7 +168,7 @@ public class SMTPServerTest {
protected final int smtpListenerPort;
protected SMTPTestConfiguration smtpConfiguration;
- protected final MockUsersRepository usersRepository = new
MockUsersRepository();
+ protected final InMemoryUsersRepository usersRepository = new
InMemoryUsersRepository();
protected AlterableDNSServer dnsServer;
protected MockMailRepositoryStore store;
protected MockFileSystem fileSystem;
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1719374&r1=1719373&r2=1719374&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Fri Dec 11 12:31:35 2015
@@ -38,7 +38,7 @@ import org.apache.james.rrt.lib.Mappings
import org.apache.james.rrt.lib.MappingsImpl;
import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
import org.apache.james.user.api.UsersRepository;
-import org.apache.james.user.lib.mock.MockUsersRepository;
+import org.apache.james.user.lib.mock.InMemoryUsersRepository;
import org.junit.Before;
import org.junit.Test;
@@ -55,7 +55,7 @@ public class ValidRcptHandlerTest {
@Before
public void setUp() throws Exception {
- users = new MockUsersRepository();
+ users = new InMemoryUsersRepository();
users.addUser(VALID_USER, "xxx");
handler = new ValidRcptHandler();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
