Author: norman
Date: Thu Jul 27 06:31:08 2006
New Revision: 426066
URL: http://svn.apache.org/viewvc?rev=426066&view=rev
Log:
Fix log messages
Add new junit test
Modified:
james/server/trunk/src/java/org/apache/james/util/SpamAssassinInvoker.java
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
Modified:
james/server/trunk/src/java/org/apache/james/util/SpamAssassinInvoker.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/util/SpamAssassinInvoker.java?rev=426066&r1=426065&r2=426066&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/util/SpamAssassinInvoker.java
(original)
+++ james/server/trunk/src/java/org/apache/james/util/SpamAssassinInvoker.java
Thu Jul 27 06:31:08 2006
@@ -141,10 +141,10 @@
+ spamdHost);
} catch (IOException e1) {
throw new MessagingException("Error communicating with spamd on "
- + spamdHost + ":" + spamdPort + "Exception:" + e1);
+ + spamdHost + ":" + spamdPort + " Exception: " + e1);
} catch (MessagingException e1) {
throw new MessagingException("Error communicating with spamd on "
- + spamdHost + ":" + spamdPort + "Exception:" + e1);
+ + spamdHost + ":" + spamdPort + " Exception: " + e1);
} finally {
try {
in.close();
Modified:
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java?rev=426066&r1=426065&r2=426066&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
Thu Jul 27 06:31:08 2006
@@ -28,6 +28,9 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.services.DNSServer;
import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler;
@@ -267,6 +270,18 @@
rbl.onConnect(mockedSMTPSession);
assertNull(mockedSMTPSession.getConnectionState().get(RBL_DETAIL_MAIL_ATTRIBUTE_NAME));
assertEquals("false",mockedSMTPSession.getConnectionState().get(RBL_BLOCKLISTED_MAIL_ATTRIBUTE_NAME));
+ }
+
+ public void testInvalidConfig() {
+ boolean exception = false;
+ DNSRBLHandler rbl = new DNSRBLHandler();
+ try {
+ rbl.configure((Configuration) new
DefaultConfiguration("rblserver"));
+ } catch (ConfigurationException e) {
+ exception = true;
+ }
+
+ assertTrue("Invalid config",exception);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
