Author: rdonkin
Date: Mon Sep 7 09:26:01 2009
New Revision: 812055
URL: http://svn.apache.org/viewvc?rev=812055&view=rev
Log:
Switch to a name which is evocative of testing
Added:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java
- copied, changed from r812004,
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java
Removed:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
Copied:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java
(from r812004,
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java?p2=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java&p1=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java&r1=812004&r2=812055&rev=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java
Mon Sep 7 09:26:01 2009
@@ -22,11 +22,15 @@
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Abstract class to simplify the mocks
*/
-public class AbstractSMTPSession implements SMTPSession {
+public class BaseFakeSMTPSession implements SMTPSession {
+ private static final Log log =
LogFactory.getLog(BaseFakeSMTPSession.class);
/**
* @see org.apache.james.smtpserver.SMTPSession#getConfigurationData()
@@ -38,7 +42,7 @@
/**
* @see org.apache.james.smtpserver.SMTPSession#getConnectionState()
*/
- public Map getConnectionState() {
+ public Map<String, Object> getConnectionState() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
@@ -73,7 +77,7 @@
/**
* @see org.apache.james.smtpserver.SMTPSession#getState()
*/
- public Map getState() {
+ public Map<String, Object> getState() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
@@ -168,4 +172,10 @@
return getConfigurationData().useAddressBracketsEnforcement();
}
+ /**
+ * @see org.apache.james.smtpserver.SMTPSession#getLogger()
+ */
+ public Log getLogger() {
+ return log;
+ }
}
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -121,7 +121,7 @@
* Setup mocked smtpsession
*/
private void setupMockedSMTPSession(final MailAddress rcpt) {
- mockedSMTPSession = new AbstractSMTPSession() {
+ mockedSMTPSession = new BaseFakeSMTPSession() {
HashMap state = new HashMap();
HashMap connectionState = new HashMap();
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -41,7 +41,7 @@
public class MaxRcptHandlerTest extends TestCase{
private SMTPSession setupMockedSession(final int rcptCount) {
- SMTPSession session = new AbstractSMTPSession() {
+ SMTPSession session = new BaseFakeSMTPSession() {
HashMap state = new HashMap();
public Map getState() {
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -32,7 +32,7 @@
private SMTPSession mockedSession;
private void setupMockedSMTPSession() {
- mockedSession = new AbstractSMTPSession() {
+ mockedSession = new BaseFakeSMTPSession() {
private boolean relayingAllowed = false;
public String getRemoteIPAddress() {
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -48,7 +48,7 @@
private SMTPSession setupMockSession(final String argument,
final boolean relaying, final boolean authRequired, final String
user, final MailAddress recipient) {
- SMTPSession session = new AbstractSMTPSession() {
+ SMTPSession session = new BaseFakeSMTPSession() {
HashMap connectionMap = new HashMap();
HashMap map = new HashMap();
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=812055&r1=812054&r2=812055&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
Mon Sep 7 09:26:01 2009
@@ -133,7 +133,7 @@
* Setup mocked smtpsession
*/
private void setupMockedSMTPSession(final String ip, final String helo) {
- mockedSMTPSession = new AbstractSMTPSession() {
+ mockedSMTPSession = new BaseFakeSMTPSession() {
HashMap state = new HashMap();
HashMap connectionState = new HashMap();
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -63,7 +63,7 @@
}
private void setupMockedSMTPSession() {
- mockedSMTPSession = new AbstractSMTPSession() {
+ mockedSMTPSession = new BaseFakeSMTPSession() {
public int getRcptCount() {
return 0;
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -50,7 +50,7 @@
private SMTPSession setupMockedSMTPSession(final Mail mail) {
mockedMail = mail;
- mockedSMTPSession = new AbstractSMTPSession() {
+ mockedSMTPSession = new BaseFakeSMTPSession() {
private HashMap state = new HashMap();
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -37,7 +37,7 @@
private static final String RECIP1 = "re...@localhost";
private SMTPSession setUpSMTPSession(final String ip) {
- return new AbstractSMTPSession() {
+ return new BaseFakeSMTPSession() {
public String getRemoteIPAddress() {
return ip;
}
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -32,7 +32,7 @@
private SMTPSession session;
private SMTPSession setupMockedSession(final int rcptCount) {
- session = new AbstractSMTPSession() {
+ session = new BaseFakeSMTPSession() {
public int getRcptCount() {
return rcptCount;
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -59,7 +59,7 @@
private SMTPSession setupMockedSMTPSession(final Mail mail) {
mockedMail = mail;
- mockedSMTPSession = new AbstractSMTPSession() {
+ mockedSMTPSession = new BaseFakeSMTPSession() {
private HashMap state = new HashMap();
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -62,7 +62,7 @@
}
private SMTPSession setupMockedSMTPSession(final SMTPConfiguration conf,
final MailAddress rcpt, final boolean relayingAllowed) {
- SMTPSession session = new AbstractSMTPSession() {
+ SMTPSession session = new BaseFakeSMTPSession() {
HashMap state = new HashMap();
public boolean isRelayingAllowed() {
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
Mon Sep 7 09:26:01 2009
@@ -47,7 +47,7 @@
private final static String LOOPBACK = "127.0.0.1";
private SMTPSession setupMockedSMTPSession(final MailAddress rcpt) {
- SMTPSession session = new AbstractSMTPSession() {
+ SMTPSession session = new BaseFakeSMTPSession() {
HashMap state = new HashMap();
public Map getState() {
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java?rev=812055&r1=812054&r2=812055&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
Mon Sep 7 09:26:01 2009
@@ -54,7 +54,7 @@
}
private SMTPSession setupMockedSession(final MailAddress sender) {
- SMTPSession session = new AbstractSMTPSession() {
+ SMTPSession session = new BaseFakeSMTPSession() {
HashMap state = new HashMap();
public Map getState() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
