Author: norman
Date: Wed Jan 3 05:40:29 2007
New Revision: 492147
URL: http://svn.apache.org/viewvc?view=rev&rev=492147
Log:
Fix junit tests and javadocs
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UsersRepositoryAuthHook.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/WelcomeMessageHandler.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java?view=diff&rev=492147&r1=492146&r2=492147
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java
Wed Jan 3 05:40:29 2007
@@ -44,7 +44,7 @@
private final Object RSETCMDHANDLER = RsetCmdHandler.class.getName();
private final Object VRFYCMDHANDLER = VrfyCmdHandler.class.getName();
private final Object WELCOMEMESSAGEHANDLER =
WelcomeMessageHandler.class.getName();
- private final Object ADDDEFAULTATTRIBUTESHANDLER =
AddDefaultAttributesMessageHook.class.getClass();
+ private final Object ADDDEFAULTATTRIBUTESHANDLER =
AddDefaultAttributesMessageHook.class.getName();
private final Object SENDMAILHANDLER = SendMailHandler.class.getName();
private final Object USERSREPOSITORYAUTHHANDLER =
UsersRepositoryAuthHook.class.getName();
private final Object POSTMASTERABUSEHOOK =
PostmasterAbuseRcptHook.class.getName();
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java?view=diff&rev=492147&r1=492146&r2=492147
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java
Wed Jan 3 05:40:29 2007
@@ -30,7 +30,7 @@
import java.util.Locale;
/**
- * Handler which whitelist "postmaster" and "abuse" recipients.
+ * Handler which check if the authenticated user is incorrect
*/
public class SenderAuthIdentifyVerificationRcptHook extends AbstractLogEnabled
implements RcptHook {
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UsersRepositoryAuthHook.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UsersRepositoryAuthHook.java?view=diff&rev=492147&r1=492146&r2=492147
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UsersRepositoryAuthHook.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UsersRepositoryAuthHook.java
Wed Jan 3 05:40:29 2007
@@ -23,7 +23,11 @@
import org.apache.james.smtpserver.hook.HookResult;
import org.apache.james.smtpserver.hook.HookReturnCode;
+/**
+ * This Auth hook can be used to authenticate against the james user repository
+ */
public class UsersRepositoryAuthHook implements AuthHook {
+
/**
* @see
org.apache.james.smtpserver.hook.AuthHook#doAuth(org.apache.james.smtpserver.SMTPSession,
java.lang.String, java.lang.String)
*/
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/WelcomeMessageHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/WelcomeMessageHandler.java?view=diff&rev=492147&r1=492146&r2=492147
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/WelcomeMessageHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/WelcomeMessageHandler.java
Wed Jan 3 05:40:29 2007
@@ -30,7 +30,7 @@
import java.util.Date;
/**
- * This ConnectHandler can be used to activate pop-before-smtp
+ * This ConnectHandler print the greeting on connecting
*/
public class WelcomeMessageHandler implements ConnectHandler {
Modified:
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java?view=diff&rev=492147&r1=492146&r2=492147
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
Wed Jan 3 05:40:29 2007
@@ -193,39 +193,4 @@
int result = handler.doRcpt(session,null, mailAddress).getResult();
assertEquals("Reject", result,HookReturnCode.DENY);
}
-
- /* This is no more handled by the Resolvable handler
- * TODO: we should move this tests to generic RFC compliance tests against
the full default
- * SMTPServer.
- public void testNotRejectInvalidHeloPostmaster() throws ParseException {
- SMTPSession session =
setupMockSession(INVALID_HOST,false,false,null,new MailAddress("[EMAIL
PROTECTED]"));
- ResolvableEhloHeloHandler handler = new ResolvableEhloHeloHandler();
-
- ContainerUtil.enableLogging(handler,new MockLogger());
-
- handler.setDnsServer(setupMockDNSServer());
-
- handler.doHelo(session, INVALID_HOST);
-
assertNotNull("stored",session.getState().get(ResolvableEhloHeloHandler.BAD_EHLO_HELO));
-
- int result = handler.doRcpt(session,null, (MailAddress)
session.getState().get(SMTPSession.CURRENT_RECIPIENT)).getResult();
- assertEquals("Not reject", result,HookReturnCode.DECLINED);
- }
-
- public void testNotRejectInvalidHeloAbuse() throws ParseException {
- SMTPSession session =
setupMockSession(INVALID_HOST,false,false,null,new MailAddress("[EMAIL
PROTECTED]"));
- ResolvableEhloHeloHandler handler = new ResolvableEhloHeloHandler();
-
- ContainerUtil.enableLogging(handler,new MockLogger());
-
- handler.setDnsServer(setupMockDNSServer());
-
- handler.doHelo(session, INVALID_HOST);
-
assertNotNull("stored",session.getState().get(ResolvableEhloHeloHandler.BAD_EHLO_HELO));
-
-
- int result = handler.doRcpt(session,null, (MailAddress)
session.getState().get(SMTPSession.CURRENT_RECIPIENT)).getResult();
- assertEquals("Not reject", result,HookReturnCode.DECLINED);
- }
- */
}
Modified:
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SPFHandlerTest.java?view=diff&rev=492147&r1=492146&r2=492147
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
Wed Jan 3 05:40:29 2007
@@ -156,6 +156,10 @@
public boolean isAuthSupported() {
return false;
}
+
+ public String getUser() {
+ return null;
+ }
public int getRcptCount() {
return 0;
Modified:
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java?view=diff&rev=492147&r1=492146&r2=492147
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
Wed Jan 3 05:40:29 2007
@@ -113,10 +113,10 @@
public MimeMessage setupMockedMimeMessageMP(String text) throws
MessagingException {
MimeMessage message = new MimeMessage(new MockMimeMessage());
-// Create the message part
+ // Create the message part
BodyPart messageBodyPart = new MimeBodyPart();
-// Fill the message
+ // Fill the message
messageBodyPart.setText(text);
Multipart multipart = new MimeMultipart();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
