JAMES-2285 Get ride of an RRT test implementation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/583f348b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/583f348b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/583f348b Branch: refs/heads/master Commit: 583f348b8f5c257f270187eaefe1c64bacc7c4d5 Parents: 2d88a92 Author: benwa <[email protected]> Authored: Sat Jan 20 09:35:46 2018 +0700 Committer: benwa <[email protected]> Committed: Tue Jan 30 15:09:46 2018 +0700 ---------------------------------------------------------------------- .../memory/UsersRepositoryManagementTest.java | 50 ++++---- .../james/smtpserver/ValidRcptHandlerTest.java | 116 +++---------------- 2 files changed, 40 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/583f348b/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 index 6e5aa55..adb7c26 100644 --- 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 @@ -31,59 +31,55 @@ 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 UsersRepository usersRepository; private UsersRepositoryManagement userManagement; @Before public void setUp() throws Exception { - mockUsersRepository = MemoryUsersRepository.withoutVirtualHosting(); + usersRepository = MemoryUsersRepository.withoutVirtualHosting(); userManagement = new UsersRepositoryManagement(); - userManagement.setUsersRepository(mockUsersRepository); + userManagement.setUsersRepository(usersRepository); } @Test public void testUserCount() throws Exception { assertEquals("no user yet", 0, userManagement.countUsers()); - mockUsersRepository.addUser("testCount1", "testCount"); + usersRepository.addUser("testcount1", "testCount"); assertEquals("1 user", 1, userManagement.countUsers()); - mockUsersRepository.addUser("testCount2", "testCount"); + usersRepository.addUser("testcount2", "testCount"); assertEquals("2 users", 2, userManagement.countUsers()); - mockUsersRepository.removeUser("testCount1"); + usersRepository.removeUser("testcount1"); assertEquals("1 user", 1, userManagement.countUsers()); } @Test public void testAddUserAndVerify() throws Exception { - mockUsersRepository.addUser("testCount1", "testCount"); + usersRepository.addUser("testcount1", "testCount"); assertFalse("user not there", userManagement.verifyExists("testNotAdded")); assertTrue("user is there", userManagement.verifyExists("testCount1")); - mockUsersRepository.removeUser("testCount1"); + usersRepository.removeUser("testcount1"); assertFalse("user not there", userManagement.verifyExists("testCount1")); } @Test public void testDelUser() throws Exception { - mockUsersRepository.addUser("testDel", "test"); + usersRepository.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")); + assertTrue("user is there", userManagement.verifyExists("testdel")); + usersRepository.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"); + usersRepository.addUser(user, "test"); } String[] userNames = userManagement.listAllUsers(); @@ -98,23 +94,21 @@ public class UsersRepositoryManagementTest { @Test public void testSetPassword() throws Exception { + userManagement.addUser("testpwduser", "pwd1"); - userManagement.addUser("testPwdUser", "pwd1"); - - assertTrue("initial password", mockUsersRepository.test("testPwdUser", "pwd1")); + assertTrue("initial password", usersRepository.test("testpwduser", "pwd1")); // set empty pwd - userManagement.setPassword("testPwdUser", ""); - assertTrue("password changed to empty", mockUsersRepository.test("testPwdUser", "")); + userManagement.setPassword("testpwduser", ""); + assertTrue("password changed to empty", usersRepository.test("testpwduser", "")); // change pwd - userManagement.setPassword("testPwdUser", "pwd2"); - assertTrue("password not changed to pwd2", mockUsersRepository.test("testPwdUser", "pwd2")); + userManagement.setPassword("testpwduser", "pwd2"); + assertTrue("password not changed to pwd2", usersRepository.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")); - + userManagement.setPassword("testpwduser", "pWD2"); + assertFalse("password no longer pwd2", usersRepository.test("testpwduser", "pwd2")); + assertTrue("password changed to pWD2", usersRepository.test("testpwduser", "pWD2")); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/583f348b/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 123a93b..85fb7ab 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 @@ -22,12 +22,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.mock; -import java.util.Arrays; +import java.io.ByteArrayInputStream; import java.util.HashMap; -import java.util.Map; +import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; +import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.SMTPConfiguration; @@ -36,8 +37,7 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; import org.apache.james.rrt.api.RecipientRewriteTable; import org.apache.james.rrt.api.RecipientRewriteTableException; -import org.apache.james.rrt.lib.Mappings; -import org.apache.james.rrt.lib.MappingsImpl; +import org.apache.james.rrt.memory.MemoryRecipientRewriteTable; import org.apache.james.smtpserver.fastfail.ValidRcptHandler; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.memory.MemoryUsersRepository; @@ -59,13 +59,17 @@ public class ValidRcptHandlerTest { users = MemoryUsersRepository.withoutVirtualHosting(); users.addUser(VALID_USER, "xxx"); - - handler = new ValidRcptHandler(); - handler.setUsersRepository(users); - handler.setRecipientRewriteTable(setUpRecipientRewriteTable()); MemoryDomainList memoryDomainList = new MemoryDomainList(mock(DNSService.class)); memoryDomainList.addDomain(VALID_DOMAIN); + DefaultConfigurationBuilder config = new DefaultConfigurationBuilder(); + String configString = "<domainlist><defaultDomain>localhost</defaultDomain></domainlist>"; + config.load(new ByteArrayInputStream(configString.getBytes())); + memoryDomainList.configure(config); + + handler = new ValidRcptHandler(); + handler.setUsersRepository(users); + handler.setRecipientRewriteTable(setUpRecipientRewriteTable(memoryDomainList)); handler.setDomainList(memoryDomainList); } @@ -108,96 +112,12 @@ public class ValidRcptHandlerTest { }; } - private RecipientRewriteTable setUpRecipientRewriteTable() { - return new RecipientRewriteTable() { - - @Override - public Mappings getMappings(String user, String domain) throws ErrorMappingException, - RecipientRewriteTableException { - if (user.equals(USER1)) { - return MappingsImpl.fromCollection(Arrays.asList("address@localhost")); - } else if (user.equals(USER2)) { - throw new ErrorMappingException("554 BOUNCE"); - } - return MappingsImpl.empty(); - } - - @Override - public void addRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - } - - @Override - public void removeRegexMapping(String user, String domain, String regex) throws - RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - - @Override - public void addAddressMapping(String user, String domain, String address) throws - RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - - @Override - public void removeAddressMapping(String user, String domain, String address) throws - RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - - @Override - public void addErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - - @Override - public void removeErrorMapping(String user, String domain, String error) throws - RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - - @Override - public Mappings getUserDomainMappings(String user, String domain) throws - RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - } - - @Override - public void addMapping(String user, String domain, String mapping) throws RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - - @Override - public void removeMapping(String user, String domain, String mapping) throws RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - - @Override - public Map<String, Mappings> getAllMappings() throws RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - } - - @Override - public void addAliasDomainMapping(String aliasDomain, String realDomain) throws - RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - - @Override - public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws - RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - - } - }; + private RecipientRewriteTable setUpRecipientRewriteTable(DomainList domainList) throws RecipientRewriteTableException { + MemoryRecipientRewriteTable memoryRecipientRewriteTable = new MemoryRecipientRewriteTable(); + memoryRecipientRewriteTable.setDomainList(domainList); + memoryRecipientRewriteTable.addAddressMapping(USER1, "localhost", "address"); + memoryRecipientRewriteTable.addErrorMapping(USER2, "localhost", "554 BOUNCE"); + return memoryRecipientRewriteTable; } private SMTPConfiguration setupMockedSMTPConfiguration() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
