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 rd...@apache.org on 2009/09/18 08:56:41 UTC
svn commit: r816492 -
/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
Author: rdonkin
Date: Fri Sep 18 06:56:41 2009
New Revision: 816492
URL: http://svn.apache.org/viewvc?rev=816492&view=rev
Log:
JAMES-923 Replace initialisation with creation when the DNS service is set. https://issues.apache.org/jira/browse/JAMES-923
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=816492&r1=816491&r2=816492&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Fri Sep 18 06:56:41 2009
@@ -197,8 +197,6 @@
spf.setDNSService(mockedDnsService);
- spf.initialize();
-
assertEquals("declined",HookReturnCode.DECLINED, spf.doMail(mockedSMTPSession, sender).getResult());
assertEquals("declined", HookReturnCode.DECLINED, spf.doRcpt(mockedSMTPSession, sender, rcpt).getResult());
}
@@ -212,8 +210,6 @@
ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
-
- spf.initialize();
assertEquals("declined",HookReturnCode.DECLINED, spf.doMail(mockedSMTPSession, sender).getResult());
assertEquals("fail", HookReturnCode.DENY, spf.doRcpt(mockedSMTPSession, sender, rcpt).getResult());
@@ -229,8 +225,6 @@
spf.setDNSService(mockedDnsService);
- spf.initialize();
-
assertEquals("declined",HookReturnCode.DECLINED, spf.doMail(mockedSMTPSession, sender).getResult());
assertEquals("softfail declined", HookReturnCode.DECLINED, spf.doRcpt(mockedSMTPSession, sender, rcpt).getResult());
}
@@ -245,8 +239,6 @@
ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
-
- spf.initialize();
spf.setBlockSoftFail(true);
@@ -265,8 +257,6 @@
spf.setDNSService(mockedDnsService);
- spf.initialize();
-
spf.setBlockSoftFail(true);
assertEquals("declined",HookReturnCode.DECLINED, spf.doMail(mockedSMTPSession, sender).getResult());
@@ -285,9 +275,6 @@
spf.setDNSService(mockedDnsService);
- spf.initialize();
-
-
assertEquals("declined",HookReturnCode.DECLINED, spf.doMail(mockedSMTPSession, sender).getResult());
assertEquals("temperror denysoft", HookReturnCode.DENYSOFT, spf.doRcpt(mockedSMTPSession, sender, rcpt).getResult());
}
@@ -303,9 +290,6 @@
spf.setDNSService(mockedDnsService);
- spf.initialize();
-
-
assertEquals("declined",HookReturnCode.DECLINED, spf.doMail(mockedSMTPSession, sender).getResult());
assertEquals("declined", HookReturnCode.DECLINED, spf.doRcpt(mockedSMTPSession, sender, rcpt).getResult());
}
@@ -321,8 +305,6 @@
spf.setDNSService(mockedDnsService);
- spf.initialize();
-
spf.setBlockPermError(false);
assertEquals("declined",HookReturnCode.DECLINED, spf.doMail(mockedSMTPSession, sender).getResult());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org