JAMES-2285 Further rely on memory implementation in SmtpServer test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/27dc7739 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/27dc7739 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/27dc7739 Branch: refs/heads/master Commit: 27dc7739e6585f939f1dc2f822a40ad6c083a82f Parents: 48f089f Author: benwa <[email protected]> Authored: Sat Jan 20 09:03:55 2018 +0700 Committer: benwa <[email protected]> Committed: Tue Jan 30 15:09:29 2018 +0700 ---------------------------------------------------------------------- server/protocols/protocols-smtp/pom.xml | 4 + .../apache/james/smtpserver/SMTPServerTest.java | 103 ++----------------- .../james/smtpserver/ValidRcptHandlerTest.java | 14 ++- 3 files changed, 19 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/27dc7739/server/protocols/protocols-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index 13267c2..8f4eda1 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -75,6 +75,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-memory</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-dnsservice-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/27dc7739/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 1f2382c..107c425 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 @@ -35,9 +35,7 @@ import java.net.Socket; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; -import java.util.Map; import javax.mail.internet.MimeMessage; @@ -48,7 +46,7 @@ import org.apache.commons.net.smtp.SMTPReply; 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.api.mock.SimpleDomainList; +import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.mailrepository.api.MailRepositoryStore; @@ -61,13 +59,11 @@ import org.apache.james.queue.api.MailQueueFactory; import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory; import org.apache.james.queue.memory.MemoryMailQueueFactory; 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.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.mailet.HostAddress; import org.apache.mailet.Mail; import org.junit.After; import org.junit.Before; @@ -97,10 +93,6 @@ public class SMTPServerTest { return res; } - public Iterator<HostAddress> getSMTPHostAddresses(String domainName) { - throw new UnsupportedOperationException("Unimplemented mock service"); - } - @Override public Collection<InetAddress> getAllByName(String host) throws UnknownHostException { return ImmutableList.of(getByName(host)); @@ -216,7 +208,7 @@ public class SMTPServerTest { smtpServer.init(); } - protected void setUpFakeLoader() throws IOException { + protected void setUpFakeLoader() throws Exception { chain = new MockProtocolHandlerLoader(); @@ -230,93 +222,16 @@ public class SMTPServerTest { fileSystem = new MockFileSystem(); chain.put("fileSystem", FileSystem.class, fileSystem); - - chain.put("recipientrewritetable", RecipientRewriteTable.class, new RecipientRewriteTable() { - - @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"); - } - - @Override - public Mappings getMappings(String user, String domain) throws ErrorMappingException, - RecipientRewriteTableException { - throw new UnsupportedOperationException("Not implemented"); - } - }); + + MemoryRecipientRewriteTable rewriteTable = new MemoryRecipientRewriteTable(); + chain.put("recipientrewritetable", RecipientRewriteTable.class, rewriteTable); queueFactory = new MemoryMailQueueFactory(new RawMailQueueItemDecoratorFactory()); queue = queueFactory.createQueue(MailQueueFactory.SPOOL); chain.put("mailqueuefactory", MailQueueFactory.class, queueFactory); - chain.put("domainlist", DomainList.class, new SimpleDomainList() { - - @Override - public boolean containsDomain(String serverName) { - return "localhost".equals(serverName); - } - }); + MemoryDomainList domainList = new MemoryDomainList(mock(DNSService.class)); + domainList.addDomain("localhost"); + chain.put("domainlist", DomainList.class, domainList); } http://git-wip-us.apache.org/repos/asf/james-project/blob/27dc7739/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 be88337..50c04a2 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 @@ -20,13 +20,15 @@ package org.apache.james.smtpserver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; import java.util.Arrays; import java.util.HashMap; import java.util.Map; import org.apache.james.core.MailAddress; -import org.apache.james.domainlist.api.mock.SimpleDomainList; +import org.apache.james.dnsservice.api.DNSService; +import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.protocols.smtp.SMTPSession; @@ -62,13 +64,9 @@ public class ValidRcptHandlerTest { handler.setUsersRepository(users); handler.setRecipientRewriteTable(setUpRecipientRewriteTable()); - handler.setDomainList(new SimpleDomainList() { - - @Override - public boolean containsDomain(String domain) { - return domain.equals(VALID_DOMAIN); - } - }); + MemoryDomainList memoryDomainList = new MemoryDomainList(mock(DNSService.class)); + memoryDomainList.addDomain(VALID_DOMAIN); + handler.setDomainList(memoryDomainList); } private SMTPSession setupMockedSMTPSession(SMTPConfiguration conf, MailAddress rcpt, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
