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 no...@apache.org on 2010/01/13 20:04:08 UTC

svn commit: r898887 - /james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java

Author: norman
Date: Wed Jan 13 19:04:07 2010
New Revision: 898887

URL: http://svn.apache.org/viewvc?rev=898887&view=rev
Log:
Remove MailetContext as dependency of SMTPServer (JAMES-739)

Modified:
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=898887&r1=898886&r2=898887&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Wed Jan 13 19:04:07 2010
@@ -69,8 +69,6 @@
 import org.apache.james.util.codec.Base64;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailetContext;
-import org.apache.mailet.base.test.FakeMailContext;
 
 /**
  * Tests the org.apache.james.smtpserver.SMTPServer unit 
@@ -162,7 +160,6 @@
     protected MockUsersRepository m_usersRepository = new MockUsersRepository();
     protected FakeLoader m_serviceManager;
     protected AlterableDNSServer m_dnsServer;
-    protected FakeMailContext mailetContext;
     protected MockSocketManager socketManager;
     protected MockThreadManager threadManager;
     protected MockStore store;
@@ -202,7 +199,6 @@
         m_smtpServer.setLog(smtpLog);
         m_smtpServer.setLoader(m_serviceManager);
         m_smtpServer.setDNSService(m_dnsServer);
-        m_smtpServer.setMailetContext(mailetContext);
         m_smtpServer.setMailServer(m_mailServer);
 
         
@@ -240,8 +236,6 @@
 
     protected FakeLoader setUpServiceManager() throws Exception {
         m_serviceManager = new FakeLoader();
-        mailetContext = new FakeMailContext();
-        m_serviceManager.put(MailetContext.class.getName(),mailetContext);
         m_mailServer = new MockMailServer(new MockUsersRepository());    
         m_serviceManager.put(MailServer.ROLE, m_mailServer);
         m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org