Author: norman
Date: Sat Dec 23 08:02:13 2006
New Revision: 489902
URL: http://svn.apache.org/viewvc?view=rev&rev=489902
Log:
Fix SPFTests i break.
Modified:
james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
Modified:
james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java?view=diff&rev=489902&r1=489901&r2=489902
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
(original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
Sat Dec 23 08:02:13 2006
@@ -416,21 +416,18 @@
runHandlers(spf, mockedSMTPSession);
- assertNull("not reject", mockedSMTPSession.getState().get(
+ assertNotNull("not removed this state",
mockedSMTPSession.getState().get(
SPFHandler.SPF_BLOCKLISTED));
- assertNull("no details ", mockedSMTPSession.getState().get(
+ assertNotNull("not removed this state",
mockedSMTPSession.getState().get(
SPFHandler.SPF_DETAIL));
- assertNull("No tempError", mockedSMTPSession.getState().get(
- SPFHandler.SPF_TEMPBLOCKLISTED));
- assertNull("no Header should present", mockedSMTPSession.getState()
+ assertNotNull("not removed this state", mockedSMTPSession.getState()
.get(SPFHandler.SPF_HEADER));
- assertFalse(mockedSMTPSession.getStopHandlerProcessing());
+ assertFalse("not rejected",
mockedSMTPSession.getStopHandlerProcessing());
}
public void testSPFpermErrorNotRejectAbuse() throws Exception {
setupMockedSMTPSession("192.168.100.1", "spf4.james.apache.org",
- new MailAddress("[EMAIL PROTECTED]"), new MailAddress(
- "[EMAIL PROTECTED]"));
+ new MailAddress("[EMAIL PROTECTED]"), new MailAddress("[EMAIL
PROTECTED]"));
SPFHandler spf = new SPFHandler();
ContainerUtil.enableLogging(spf, new MockLogger());
@@ -442,15 +439,7 @@
runHandlers(spf, mockedSMTPSession);
- assertNull("not reject", mockedSMTPSession.getState().get(
- SPFHandler.SPF_BLOCKLISTED));
- assertNull("no details ", mockedSMTPSession.getState().get(
- SPFHandler.SPF_DETAIL));
- assertNull("No tempError", mockedSMTPSession.getState().get(
- SPFHandler.SPF_TEMPBLOCKLISTED));
- assertNull("no Header should present", mockedSMTPSession.getState()
- .get(SPFHandler.SPF_HEADER));
- assertFalse(mockedSMTPSession.getStopHandlerProcessing());
+ assertFalse("not
rejected",mockedSMTPSession.getStopHandlerProcessing());
}
public void testSPFpermErrorRejectDisabled() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
