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 2006/08/04 17:08:23 UTC
svn commit: r428748 [3/3] - in /james/server/sandbox/handlerapi2/src:
java/org/apache/james/smtpserver/ java/org/apache/james/smtpserver/core/
java/org/apache/james/smtpserver/core/filter/
java/org/apache/james/smtpserver/core/filter/fastfail/ test/org...
Modified: james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java?rev=428748&r1=428747&r2=428748&view=diff
==============================================================================
--- james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java (original)
+++ james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/TarpitHandlerTest.java Fri Aug 4 08:08:20 2006
@@ -34,6 +34,10 @@
public int getRcptCount() {
return rcptCount;
}
+
+ public void doChain() {
+
+ }
};
@@ -52,13 +56,13 @@
// no tarpit used
startTime = System.currentTimeMillis();
- handler.onCommand(setupMockedSession(0), new Chain(null));
+ handler.onCommand(setupMockedSession(0));
assertTrue("No tarpit",
(System.currentTimeMillis() - startTime) < tarpitTime);
// tarpit used
startTime = System.currentTimeMillis();
- handler.onCommand(setupMockedSession(3), new Chain(null));
+ handler.onCommand(setupMockedSession(3));
assertTrue("tarpit",
(System.currentTimeMillis() - startTime) >= tarpitTime);
}
Modified: james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java?rev=428748&r1=428747&r2=428748&view=diff
==============================================================================
--- james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java (original)
+++ james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java Fri Aug 4 08:08:20 2006
@@ -36,74 +36,85 @@
import junit.framework.TestCase;
public class ValidSenderDomainHandlerTest extends TestCase {
-
+
private final int REJECT_CODE = 501;
-
+
private DNSServer setupDNSServer() {
- DNSServer dns = new DNSServer(){
+ DNSServer dns = new DNSServer() {
- public Collection findMXRecords(String hostname) {
- Collection mx = new ArrayList();
- if (hostname.equals("test.james.apache.org")) {
- mx.add("mail.james.apache.org");
- }
- return mx;
- }
-
- public Collection findTXTRecords(String hostname) {
- throw new UnsupportedOperationException("Unimplemented mock service");
- }
-
- public InetAddress[] getAllByName(String host) throws UnknownHostException {
- throw new UnsupportedOperationException("Unimplemented mock service");
- }
-
- public InetAddress getByName(String host) throws UnknownHostException {
- throw new UnsupportedOperationException("Unimplemented mock service");
- }
-
- public Iterator getSMTPHostAddresses(String domainName) {
- throw new UnsupportedOperationException("Unimplemented mock service");
- }
-
- };
- return dns;
+ public Collection findMXRecords(String hostname) {
+ Collection mx = new ArrayList();
+ if (hostname.equals("test.james.apache.org")) {
+ mx.add("mail.james.apache.org");
+ }
+ return mx;
+ }
+
+ public Collection findTXTRecords(String hostname) {
+ throw new UnsupportedOperationException(
+ "Unimplemented mock service");
+ }
+
+ public InetAddress[] getAllByName(String host)
+ throws UnknownHostException {
+ throw new UnsupportedOperationException(
+ "Unimplemented mock service");
+ }
+
+ public InetAddress getByName(String host)
+ throws UnknownHostException {
+ throw new UnsupportedOperationException(
+ "Unimplemented mock service");
+ }
+
+ public Iterator getSMTPHostAddresses(String domainName) {
+ throw new UnsupportedOperationException(
+ "Unimplemented mock service");
+ }
+
+ };
+ return dns;
}
-
+
private SMTPSession setupMockedSession(final MailAddress sender) {
- SMTPSession session = new AbstractSMTPSession() {
- HashMap state = new HashMap();
- SMTPResponse response = new SMTPResponse(500, "Unknown Response");
-
- public Map getState() {
-
- state.put(SMTPSession.SENDER, sender);
-
- return state;
- }
-
- public boolean isRelayingAllowed() {
- return false;
- }
-
- public SMTPResponse getSMTPResponse() {
- return response;
- }
-
- };
- return session;
+ SMTPSession session = new AbstractSMTPSession() {
+ HashMap state = new HashMap();
+
+ SMTPResponse response = new SMTPResponse(500, "Unknown Response");
+
+ public Map getState() {
+
+ state.put(SMTPSession.SENDER, sender);
+
+ return state;
+ }
+
+ public boolean isRelayingAllowed() {
+ return false;
+ }
+
+ public SMTPResponse getSMTPResponse() {
+ return response;
+ }
+
+ public void doChain() {
+
+ }
+ };
+ return session;
}
-
+
// Test for JAMES-580
public void testNullSender() {
- ValidSenderDomainHandler handler = new ValidSenderDomainHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
-
- SMTPSession session = setupMockedSession(null);
-
- handler.setDnsServer(setupDNSServer());
- handler.onCommand(session,new Chain(null));
-
- assertTrue("Not blocked cause its a nullsender",session.getSMTPResponse().getSMTPCode() != REJECT_CODE);
+ ValidSenderDomainHandler handler = new ValidSenderDomainHandler();
+ ContainerUtil.enableLogging(handler, new MockLogger());
+
+ SMTPSession session = setupMockedSession(null);
+
+ handler.setDnsServer(setupDNSServer());
+ handler.onCommand(session);
+
+ assertTrue("Not blocked cause its a nullsender", session
+ .getSMTPResponse().getSMTPCode() != REJECT_CODE);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org