Repository: james-project Updated Branches: refs/heads/master ac0f4a5a2 -> 27fd46dc4
JAMES-2285 Get ride of InMemoryRepository MemoryRepository, that is a real implementation, not based on deprecated super class, should be used instead. The only controversial move is moving UserRepositoryManagement test where memory implementation is available. Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2d88a92d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2d88a92d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2d88a92d Branch: refs/heads/master Commit: 2d88a92d632151d96a51f9db33d70456606bfbcc Parents: 27dc773 Author: benwa <[email protected]> Authored: Sat Jan 20 09:19:25 2018 +0700 Committer: benwa <[email protected]> Committed: Tue Jan 30 15:09:29 2018 +0700 ---------------------------------------------------------------------- .../user/lib/UsersRepositoryManagementTest.java | 119 ---------------- .../user/lib/mock/InMemoryUsersRepository.java | 140 ------------------- .../memory/UsersRepositoryManagementTest.java | 120 ++++++++++++++++ server/protocols/jmap/pom.xml | 5 + .../james/jmap/UserProvisioningFilterTest.java | 6 +- .../jmap/UserProvisioningFilterThreadTest.java | 6 +- server/protocols/protocols-pop3/pom.xml | 5 + .../apache/james/pop3server/POP3ServerTest.java | 4 +- .../apache/james/smtpserver/SMTPServerTest.java | 4 +- .../james/smtpserver/ValidRcptHandlerTest.java | 4 +- 10 files changed, 142 insertions(+), 271 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java deleted file mode 100644 index 7ffa5fa..0000000 --- a/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java +++ /dev/null @@ -1,119 +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.user.lib; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.Arrays; -import java.util.List; - -import org.apache.james.user.lib.mock.InMemoryUsersRepository; -import org.junit.Before; -import org.junit.Test; - -/** - * Tests the UserManagement - */ -public class UsersRepositoryManagementTest { - - private InMemoryUsersRepository mockUsersRepository; - private UsersRepositoryManagement userManagement; - - @Before - public void setUp() throws Exception { - mockUsersRepository = new InMemoryUsersRepository(); - - userManagement = new UsersRepositoryManagement(); - userManagement.setUsersRepository(mockUsersRepository); - } - - @Test - public void testUserCount() throws Exception { - assertEquals("no user yet", 0, userManagement.countUsers()); - mockUsersRepository.addUser("testCount1", "testCount"); - assertEquals("1 user", 1, userManagement.countUsers()); - mockUsersRepository.addUser("testCount2", "testCount"); - assertEquals("2 users", 2, userManagement.countUsers()); - mockUsersRepository.removeUser("testCount1"); - assertEquals("1 user", 1, userManagement.countUsers()); - } - - @Test - public void testAddUserAndVerify() throws Exception { - mockUsersRepository.addUser("testCount1", "testCount"); - assertFalse("user not there", userManagement.verifyExists("testNotAdded")); - assertTrue("user is there", userManagement.verifyExists("testCount1")); - mockUsersRepository.removeUser("testCount1"); - assertFalse("user not there", userManagement.verifyExists("testCount1")); - } - - @Test - public void testDelUser() throws Exception { - mockUsersRepository.addUser("testDel", "test"); - assertFalse("user not there", userManagement.verifyExists("testNotDeletable")); - assertTrue("user is there", userManagement.verifyExists("testDel")); - mockUsersRepository.removeUser("testDel"); - assertFalse("user no longer there", userManagement.verifyExists("testDel")); - } - - @Test - public void testListUsers() throws Exception { - - String[] usersArray = new String[]{"ccc", "aaa", "dddd", "bbbbb"}; - List<String> users = Arrays.asList(usersArray); - - for (String user : users) { - mockUsersRepository.addUser(user, "test"); - } - - String[] userNames = userManagement.listAllUsers(); - assertEquals("user count", users.size(), userNames.length); - - for (String user : userNames) { - if (!users.contains(user)) { - fail("user not listed"); - } - } - } - - @Test - public void testSetPassword() throws Exception { - - userManagement.addUser("testPwdUser", "pwd1"); - - assertTrue("initial password", mockUsersRepository.test("testPwdUser", "pwd1")); - - // set empty pwd - userManagement.setPassword("testPwdUser", ""); - assertTrue("password changed to empty", mockUsersRepository.test("testPwdUser", "")); - - // change pwd - userManagement.setPassword("testPwdUser", "pwd2"); - assertTrue("password not changed to pwd2", mockUsersRepository.test("testPwdUser", "pwd2")); - - // assure case sensitivity - userManagement.setPassword("testPwdUser", "pWD2"); - assertFalse("password no longer pwd2", mockUsersRepository.test("testPwdUser", "pwd2")); - assertTrue("password changed to pWD2", mockUsersRepository.test("testPwdUser", "pWD2")); - - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java deleted file mode 100644 index 6053070..0000000 --- a/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java +++ /dev/null @@ -1,140 +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.user.lib.mock; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; - -import org.apache.james.user.api.UsersRepositoryException; -import org.apache.james.user.api.model.User; -import org.apache.james.user.lib.AbstractJamesUsersRepository; -import org.apache.james.user.lib.model.DefaultJamesUser; -import org.apache.james.user.lib.model.DefaultUser; - -@SuppressWarnings("deprecation") -public class InMemoryUsersRepository extends AbstractJamesUsersRepository { - - private final HashMap<String, User> users = new HashMap<>(); - /** - * force the repository to hold implementations of JamesUser interface, - * instead of User JamesUser is _not_ required as of the UsersRepository - * interface, so the necessarity forcing it is due to code using - * UsersRepository while at the same time expecting it to hold JamesUsers - * (like in RemoteManagerHandler) - */ - private boolean forceUseJamesUser = false; - - public void setForceUseJamesUser() { - forceUseJamesUser = true; - } - - @Override - public User getUserByName(String name) throws UsersRepositoryException { - if (ignoreCase) { - return getUserByNameCaseInsensitive(name); - } else { - return users.get(name); - } - } - - public User getUserByNameCaseInsensitive(String name) { - return users.get(name.toLowerCase(Locale.US)); - } - - public String getRealName(String name) { - if (ignoreCase) { - return users.get(name.toLowerCase(Locale.US)) != null ? - users.get(name.toLowerCase(Locale.US)).getUserName() : null; - } else { - return users.get(name) != null ? name : null; - } - } - - @Override - public void removeUser(String name) throws UsersRepositoryException { - if (!users.containsKey(name)) { - throw new UsersRepositoryException("No such user"); - } else { - users.remove(name); - } - } - - @Override - public boolean contains(String name) throws UsersRepositoryException { - if (ignoreCase) { - return containsCaseInsensitive(name); - } else { - return users.containsKey(name); - } - } - - public boolean containsCaseInsensitive(String name) { - throw new UnsupportedOperationException("mock"); - } - - @Override - public boolean test(String name, String password) throws UsersRepositoryException { - User user = getUserByName(name); - return user != null && user.verifyPassword(password); - } - - @Override - public int countUsers() throws UsersRepositoryException { - return users.size(); - } - - protected List<String> listUserNames() { - Iterator<User> users = this.users.values().iterator(); - List<String> userNames = new LinkedList<>(); - while (users.hasNext()) { - User user = users.next(); - userNames.add(user.getUserName()); - } - - return userNames; - } - - @Override - public Iterator<String> list() throws UsersRepositoryException { - return listUserNames().iterator(); - } - - @Override - protected void doAddUser(User user) throws UsersRepositoryException { - if (forceUseJamesUser && user instanceof DefaultUser) { - DefaultUser aUser = (DefaultUser) user; - user = new DefaultJamesUser(aUser.getUserName(), aUser.getHashedPassword(), aUser.getHashAlgorithm()); - } - - String key = user.getUserName(); - users.put(key, user); - } - - @Override - protected void doUpdateUser(User user) throws UsersRepositoryException { - if (users.containsKey(user.getUserName())) { - users.put(user.getUserName(), user); - } else { - throw new UsersRepositoryException("No such user"); - } - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java b/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java new file mode 100644 index 0000000..6e5aa55 --- /dev/null +++ b/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java @@ -0,0 +1,120 @@ +/**************************************************************** + * 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.user.memory; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.Arrays; +import java.util.List; + +import org.apache.james.user.api.UsersRepository; +import org.apache.james.user.lib.UsersRepositoryManagement; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests the UserManagement + */ +public class UsersRepositoryManagementTest { + + private UsersRepository mockUsersRepository; + private UsersRepositoryManagement userManagement; + + @Before + public void setUp() throws Exception { + mockUsersRepository = MemoryUsersRepository.withoutVirtualHosting(); + + userManagement = new UsersRepositoryManagement(); + userManagement.setUsersRepository(mockUsersRepository); + } + + @Test + public void testUserCount() throws Exception { + assertEquals("no user yet", 0, userManagement.countUsers()); + mockUsersRepository.addUser("testCount1", "testCount"); + assertEquals("1 user", 1, userManagement.countUsers()); + mockUsersRepository.addUser("testCount2", "testCount"); + assertEquals("2 users", 2, userManagement.countUsers()); + mockUsersRepository.removeUser("testCount1"); + assertEquals("1 user", 1, userManagement.countUsers()); + } + + @Test + public void testAddUserAndVerify() throws Exception { + mockUsersRepository.addUser("testCount1", "testCount"); + assertFalse("user not there", userManagement.verifyExists("testNotAdded")); + assertTrue("user is there", userManagement.verifyExists("testCount1")); + mockUsersRepository.removeUser("testCount1"); + assertFalse("user not there", userManagement.verifyExists("testCount1")); + } + + @Test + public void testDelUser() throws Exception { + mockUsersRepository.addUser("testDel", "test"); + assertFalse("user not there", userManagement.verifyExists("testNotDeletable")); + assertTrue("user is there", userManagement.verifyExists("testDel")); + mockUsersRepository.removeUser("testDel"); + assertFalse("user no longer there", userManagement.verifyExists("testDel")); + } + + @Test + public void testListUsers() throws Exception { + + String[] usersArray = new String[]{"ccc", "aaa", "dddd", "bbbbb"}; + List<String> users = Arrays.asList(usersArray); + + for (String user : users) { + mockUsersRepository.addUser(user, "test"); + } + + String[] userNames = userManagement.listAllUsers(); + assertEquals("user count", users.size(), userNames.length); + + for (String user : userNames) { + if (!users.contains(user)) { + fail("user not listed"); + } + } + } + + @Test + public void testSetPassword() throws Exception { + + userManagement.addUser("testPwdUser", "pwd1"); + + assertTrue("initial password", mockUsersRepository.test("testPwdUser", "pwd1")); + + // set empty pwd + userManagement.setPassword("testPwdUser", ""); + assertTrue("password changed to empty", mockUsersRepository.test("testPwdUser", "")); + + // change pwd + userManagement.setPassword("testPwdUser", "pwd2"); + assertTrue("password not changed to pwd2", mockUsersRepository.test("testPwdUser", "pwd2")); + + // assure case sensitivity + userManagement.setPassword("testPwdUser", "pWD2"); + assertFalse("password no longer pwd2", mockUsersRepository.test("testPwdUser", "pwd2")); + assertTrue("password changed to pWD2", mockUsersRepository.test("testPwdUser", "pWD2")); + + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 7ac74f2..fa37e8f 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -105,6 +105,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-memory</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-jetty</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/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 dde8aa5..29e652b 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 @@ -38,7 +38,7 @@ 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; -import org.apache.james.user.lib.mock.InMemoryUsersRepository; +import org.apache.james.user.memory.MemoryUsersRepository; import org.junit.Before; import org.junit.Test; @@ -47,14 +47,14 @@ public class UserProvisioningFilterTest { private static final String MAIL = USERNAME + "@james.org"; private UserProvisioningFilter sut; - private InMemoryUsersRepository usersRepository; + private MemoryUsersRepository usersRepository; private HttpServletRequest request; private HttpServletResponse response; private FilterChain chain; @Before public void setup() throws Exception { - usersRepository = new InMemoryUsersRepository(); + usersRepository = MemoryUsersRepository.withoutVirtualHosting(); sut = new UserProvisioningFilter(usersRepository, new NoopMetricFactory()); request = mock(HttpServletRequest.class); response = mock(HttpServletResponse.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/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 2771384..14dd76f 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 @@ -21,7 +21,7 @@ package org.apache.james.jmap; 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.lib.mock.InMemoryUsersRepository; +import org.apache.james.user.memory.MemoryUsersRepository; import org.junit.Test; import com.google.testing.threadtester.AnnotatedTestRunner; @@ -33,12 +33,12 @@ import com.google.testing.threadtester.ThreadedSecondary; public class UserProvisioningFilterThreadTest { private UserProvisioningFilter sut; - private InMemoryUsersRepository usersRepository; + private MemoryUsersRepository usersRepository; private MailboxSession session; @ThreadedBefore public void before() { - usersRepository = new InMemoryUsersRepository(); + usersRepository = MemoryUsersRepository.withoutVirtualHosting(); session = new MockMailboxSession("username"); sut = new UserProvisioningFilter(usersRepository, new NoopMetricFactory()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/server/protocols/protocols-pop3/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml index be675b2..e68ea91 100644 --- a/server/protocols/protocols-pop3/pom.xml +++ b/server/protocols/protocols-pop3/pom.xml @@ -76,6 +76,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-memory</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java index 686919b..780286d 100644 --- a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java +++ b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java @@ -54,7 +54,7 @@ import org.apache.james.protocols.lib.POP3BeforeSMTPHelper; 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.InMemoryUsersRepository; +import org.apache.james.user.memory.MemoryUsersRepository; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -63,7 +63,7 @@ import org.junit.Test; public class POP3ServerTest { private POP3TestConfiguration pop3Configuration; - private final InMemoryUsersRepository usersRepository = new InMemoryUsersRepository(); + private final MemoryUsersRepository usersRepository = MemoryUsersRepository.withoutVirtualHosting(); private POP3Client pop3Client = null; protected MockFileSystem fileSystem; protected MockProtocolHandlerLoader protocolHandlerChain; http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java index 107c425..fd26ff6 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java @@ -63,7 +63,7 @@ import org.apache.james.rrt.memory.MemoryRecipientRewriteTable; import org.apache.james.smtpserver.netty.SMTPServer; import org.apache.james.smtpserver.netty.SmtpMetricsImpl; import org.apache.james.user.api.UsersRepository; -import org.apache.james.user.lib.mock.InMemoryUsersRepository; +import org.apache.james.user.memory.MemoryUsersRepository; import org.apache.mailet.Mail; import org.junit.After; import org.junit.Before; @@ -163,7 +163,7 @@ public class SMTPServerTest { private static final Logger LOGGER = LoggerFactory.getLogger(SMTPServerTest.class); protected SMTPTestConfiguration smtpConfiguration; - protected final InMemoryUsersRepository usersRepository = new InMemoryUsersRepository(); + protected final MemoryUsersRepository usersRepository = MemoryUsersRepository.withoutVirtualHosting(); protected AlterableDNSServer dnsServer; protected MockMailRepositoryStore store; protected MockFileSystem fileSystem; http://git-wip-us.apache.org/repos/asf/james-project/blob/2d88a92d/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java index 50c04a2..123a93b 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java @@ -40,7 +40,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.InMemoryUsersRepository; +import org.apache.james.user.memory.MemoryUsersRepository; import org.junit.Before; import org.junit.Test; @@ -57,7 +57,7 @@ public class ValidRcptHandlerTest { @Before public void setUp() throws Exception { - users = new InMemoryUsersRepository(); + users = MemoryUsersRepository.withoutVirtualHosting(); users.addUser(VALID_USER, "xxx"); handler = new ValidRcptHandler(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
