svn commit: r406916 - in /james/server/trunk/src/test/org/apache/james: smtpserver/SMTPServerTest.java smtpserver/SMTPTestConfiguration.java test/mock/james/MockMailServer.java

[berndf]

Author: berndf
Date: Tue May 16 04:32:39 2006
New Revision: 406916

URL: http://svn.apache.org/viewcvs?rev=406916&view=rev
Log:
moved the KB-to-B-conversion to place where the different dimensions meet

Modified:
    james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
    
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
    
james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java

Modified: 
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
URL: 
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java?rev=406916&r1=406915&r2=406916&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java 
(original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java 
Tue May 16 04:32:39 2006
@@ -107,7 +107,7 @@
         testConfiguration.init();
         ContainerUtil.configure(m_smtpServer, testConfiguration);
         ContainerUtil.initialize(m_smtpServer);
-        
m_mailServer.setMaxMessageSizeBytes(m_testConfiguration.getMaxMessageSize());
+        
m_mailServer.setMaxMessageSizeBytes(m_testConfiguration.getMaxMessageSize()*1024);
     }
 
     private MockServiceManager setUpServiceManager() throws Exception {

Modified: 
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL: 
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=406916&r1=406915&r2=406916&view=diff
==============================================================================
--- 
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
 (original)
+++ 
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
 Tue May 16 04:32:39 2006
@@ -26,7 +26,7 @@
 public class SMTPTestConfiguration extends DefaultConfiguration {
 
     private int m_smtpListenerPort;
-    private int m_maxMessageSize = 0;
+    private int m_maxMessageSizeKB = 0;
     private String m_authorizedAddresses = "127.0.0.0/8";
     private String m_authorizingMode = "false";
     private boolean m_verifyIdentity = false;
@@ -53,11 +53,11 @@
 
     public void setMaxMessageSize(int kilobytes)
     {
-        m_maxMessageSize = kilobytes;
+        m_maxMessageSizeKB = kilobytes;
     }
     
     public int getMaxMessageSize() {
-        return m_maxMessageSize;
+        return m_maxMessageSizeKB;
     }
 
     public String getAuthorizedAddresses() {
@@ -122,7 +122,7 @@
         handlerConfig.addChild(Util.getValuedConfiguration("helloName", 
"myMailServer"));
         
handlerConfig.addChild(Util.getValuedConfiguration("connectiontimeout", 
"360000"));
         
handlerConfig.addChild(Util.getValuedConfiguration("authorizedAddresses", 
m_authorizedAddresses));
-        handlerConfig.addChild(Util.getValuedConfiguration("maxmessagesize", 
"" + m_maxMessageSize));
+        handlerConfig.addChild(Util.getValuedConfiguration("maxmessagesize", 
"" + m_maxMessageSizeKB));
         handlerConfig.addChild(Util.getValuedConfiguration("authRequired", 
m_authorizingMode));
         
handlerConfig.addChild(Util.getValuedConfiguration("heloEhloEnforcement", 
m_heloEhloEnforcement+""));
         if (m_verifyIdentity) 
handlerConfig.addChild(Util.getValuedConfiguration("verifyIdentity", "" + 
m_verifyIdentity));

Modified: 
james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java
URL: 
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java?rev=406916&r1=406915&r2=406916&view=diff
==============================================================================
--- 
james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java
 (original)
+++ 
james/server/trunk/src/test/org/apache/james/test/mock/james/MockMailServer.java
 Tue May 16 04:32:39 2006
@@ -59,7 +59,7 @@
     public void sendMail(Mail mail) throws MessagingException {
         int bodySize = mail.getMessage().getSize();
         try {
-            if (m_maxMessageSizeBytes != 0 && m_maxMessageSizeBytes*1024 < 
bodySize) throw new MessageSizeException();
+            if (m_maxMessageSizeBytes != 0 && m_maxMessageSizeBytes < 
bodySize) throw new MessageSizeException();
         } catch (MessageSizeException e) {
             throw new MessagingException("message size exception is nested", 
e);
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]