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 fe...@apache.org on 2011/04/04 22:38:17 UTC
svn commit: r1088781 [1/5] - in /james/server/trunk:
core/src/test/java/org/apache/james/core/
data-api/src/test/java/org/apache/james/domainlist/api/mock/
data-library/src/test/java/org/apache/james/mailrepository/
data-library/src/test/java/org/apach...
Author: felixk
Date: Mon Apr 4 20:38:14 2011
New Revision: 1088781
URL: http://svn.apache.org/viewvc?rev=1088781&view=rev
Log:
Formatting (see JAMES-711)
Modified:
james/server/trunk/core/src/test/java/org/apache/james/core/MailHeadersTest.java
james/server/trunk/core/src/test/java/org/apache/james/core/MailImplTest.java
james/server/trunk/core/src/test/java/org/apache/james/core/MailTestAllImplementations.java
james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromMimeMessageTest.java
james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromSharedStreamTest.java
james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromStreamTest.java
james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageTest.java
james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageUtilTest.java
james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
james/server/trunk/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
james/server/trunk/data-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java
james/server/trunk/data-library/src/test/java/org/apache/james/vut/lib/mock/MockVirtualUserTableManagementImpl.java
james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java
james/server/trunk/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
james/server/trunk/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java
james/server/trunk/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
james/server/trunk/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java
james/server/trunk/file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
james/server/trunk/file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
james/server/trunk/file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/server/trunk/file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
james/server/trunk/file/src/test/java/org/apache/james/vut/file/XMLVirtualUserTableTest.java
james/server/trunk/filesystem-api/src/test/java/org/apache/james/filesystem/api/mock/MockFileSystem.java
james/server/trunk/jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java
james/server/trunk/jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCDBFileMailRepositoryTest.java
james/server/trunk/jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
james/server/trunk/jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
james/server/trunk/jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java
james/server/trunk/jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
james/server/trunk/jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
james/server/trunk/jpa/src/test/java/org/apache/james/vut/jpa/JPAVirtualUserTableTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessorTest.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMailet.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/CRLFTerminatedInputStreamTest.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/ExtraDotInputStreamTest.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/OioPOP3ServerTest.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java
james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/Base64.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/Util.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java
james/server/trunk/util/src/test/java/org/apache/james/util/TimeConverterTest.java
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MailHeadersTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MailHeadersTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MailHeadersTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MailHeadersTest.java Mon Apr 4 20:38:14 2011
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.james.core;
import org.apache.mailet.base.RFC2822Headers;
@@ -32,13 +31,13 @@ import junit.framework.TestCase;
public class MailHeadersTest extends TestCase {
public void testHeadersOrder() throws MessagingException {
- MailHeaders header = new MailHeaders(new ByteArrayInputStream((RFC2822Headers.SUBJECT+": testsubject\r\n").getBytes()));
+ MailHeaders header = new MailHeaders(new ByteArrayInputStream((RFC2822Headers.SUBJECT + ": testsubject\r\n").getBytes()));
header.setHeader(RFC2822Headers.RETURN_PATH, "<te...@test>");
header.setHeader(RFC2822Headers.FROM, "<te...@test.de>");
Enumeration h = header.getAllHeaderLines();
-
- assertEquals(h.nextElement(),"Return-Path: <te...@test>");
- assertEquals(h.nextElement(),"From: <te...@test.de>");
- assertEquals(h.nextElement(),"Subject: testsubject");
+
+ assertEquals(h.nextElement(), "Return-Path: <te...@test>");
+ assertEquals(h.nextElement(), "From: <te...@test.de>");
+ assertEquals(h.nextElement(), "Subject: testsubject");
}
}
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MailImplTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MailImplTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MailImplTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MailImplTest.java Mon Apr 4 20:38:14 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.core;
import org.apache.mailet.base.test.FakeMimeMessage;
@@ -70,7 +68,7 @@ public class MailImplTest extends MailTe
FakeMimeMessage mimeMessage = new FakeMimeMessage();
MailImpl mail = new MailImpl(name, senderMailAddress, recepients, mimeMessage);
- helperTestInitialState(mail);
+ helperTestInitialState(mail);
helperTestMessageSize(mail, 0);
assertEquals("initial message", mimeMessage.getMessageID(), mail.getMessage().getMessageID());
assertEquals("sender", sender, mail.getSender().toString());
@@ -88,10 +86,10 @@ public class MailImplTest extends MailTe
public void testDuplicateNewName() throws MessagingException {
String newName = "aNewName";
-
+
MailImpl mail = new MailImpl();
assertFalse("before + after names differ", newName.equals(mail.getName()));
-
+
MailImpl duplicate = (MailImpl) mail.duplicate(newName);
assertEquals("new name set", newName, duplicate.getName());
helperTestInitialState(duplicate);
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MailTestAllImplementations.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MailTestAllImplementations.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MailTestAllImplementations.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MailTestAllImplementations.java Mon Apr 4 20:38:14 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.core;
import junit.framework.TestCase;
@@ -28,7 +26,8 @@ import javax.mail.MessagingException;
import org.apache.mailet.Mail;
/**
- * testing common behavior of Mail implementors. subclasses automatically get their Mail-behavior tested.
+ * testing common behavior of Mail implementors. subclasses automatically get
+ * their Mail-behavior tested.
*/
public abstract class MailTestAllImplementations extends TestCase {
@@ -42,7 +41,8 @@ public abstract class MailTestAllImpleme
try {
assertTrue("no initial recipient", mail.getRecipients().isEmpty());
} catch (NullPointerException e) {
- // current behavior. *BUT*, shouldn't this method better return with an empty list?!
+ // current behavior. *BUT*, shouldn't this method better return with
+ // an empty list?!
}
assertEquals("initial remote address is localhost ip", "127.0.0.1", mail.getRemoteAddr());
assertEquals("initial remote host is localhost", "localhost", mail.getRemoteHost());
@@ -53,7 +53,8 @@ public abstract class MailTestAllImpleme
try {
assertEquals("initial message size == " + expectedMsgSize, expectedMsgSize, mail.getMessageSize());
} catch (NullPointerException e) {
- // current behavior. *BUT*, shouldn't this method return more gracefully?!
+ // current behavior. *BUT*, shouldn't this method return more
+ // gracefully?!
}
}
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java Mon Apr 4 20:38:14 2011
@@ -44,119 +44,123 @@ public class MimeMessageCopyOnWriteProxy
} catch (MessagingException e) {
}
return new MimeMessageCopyOnWriteProxy(mmis);
-// return new MimeMessage(Session.getDefaultInstance(new Properties()),new ByteArrayInputStream(sources.getBytes()));
+ // return new MimeMessage(Session.getDefaultInstance(new
+ // Properties()),new ByteArrayInputStream(sources.getBytes()));
}
public void testMessageCloning1() throws Exception {
ArrayList r = new ArrayList();
r.add(new MailAddress("recipient@test.com"));
- MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(content+sep+body);
- MailImpl mail = new MailImpl("test",new MailAddress("test@test.com"),r,messageFromSources);
+ MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(content + sep + body);
+ MailImpl mail = new MailImpl("test", new MailAddress("test@test.com"), r, messageFromSources);
MailImpl m2 = (MailImpl) mail.duplicate();
- System.out.println("mail: "+getReferences(mail.getMessage())+" m2: "+getReferences(m2.getMessage()));
- assertNotSame(m2,mail);
- assertNotSame(m2.getMessage(),mail.getMessage());
+ System.out.println("mail: " + getReferences(mail.getMessage()) + " m2: " + getReferences(m2.getMessage()));
+ assertNotSame(m2, mail);
+ assertNotSame(m2.getMessage(), mail.getMessage());
// test that the wrapped message is the same
- assertTrue(isSameMimeMessage(m2.getMessage(),mail.getMessage()));
+ assertTrue(isSameMimeMessage(m2.getMessage(), mail.getMessage()));
// test it is the same after read only operations!
mail.getMessage().getSubject();
- assertTrue(isSameMimeMessage(m2.getMessage(),mail.getMessage()));
+ assertTrue(isSameMimeMessage(m2.getMessage(), mail.getMessage()));
mail.getMessage().setText("new body");
mail.getMessage().saveChanges();
// test it is different after a write operation!
mail.getMessage().setSubject("new Subject");
- assertTrue(!isSameMimeMessage(m2.getMessage(),mail.getMessage()));
+ assertTrue(!isSameMimeMessage(m2.getMessage(), mail.getMessage()));
LifecycleUtil.dispose(mail);
LifecycleUtil.dispose(m2);
LifecycleUtil.dispose(messageFromSources);
}
-
public void testMessageCloning2() throws Exception {
ArrayList r = new ArrayList();
r.add(new MailAddress("recipient@test.com"));
- MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(content+sep+body);
- MailImpl mail = new MailImpl("test",new MailAddress("test@test.com"),r,messageFromSources);
+ MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(content + sep + body);
+ MailImpl mail = new MailImpl("test", new MailAddress("test@test.com"), r, messageFromSources);
MailImpl m2 = (MailImpl) mail.duplicate();
- System.out.println("mail: "+getReferences(mail.getMessage())+" m2: "+getReferences(m2.getMessage()));
- assertNotSame(m2,mail);
- assertNotSame(m2.getMessage(),mail.getMessage());
+ System.out.println("mail: " + getReferences(mail.getMessage()) + " m2: " + getReferences(m2.getMessage()));
+ assertNotSame(m2, mail);
+ assertNotSame(m2.getMessage(), mail.getMessage());
// test that the wrapped message is the same
- assertTrue(isSameMimeMessage(m2.getMessage(),mail.getMessage()));
+ assertTrue(isSameMimeMessage(m2.getMessage(), mail.getMessage()));
// test it is the same after real only operations!
m2.getMessage().getSubject();
- assertTrue(isSameMimeMessage(m2.getMessage(),mail.getMessage()));
+ assertTrue(isSameMimeMessage(m2.getMessage(), mail.getMessage()));
m2.getMessage().setText("new body");
m2.getMessage().saveChanges();
// test it is different after a write operation!
m2.getMessage().setSubject("new Subject");
- assertTrue(!isSameMimeMessage(m2.getMessage(),mail.getMessage()));
+ assertTrue(!isSameMimeMessage(m2.getMessage(), mail.getMessage()));
// check that the subjects are correct on both mails!
- assertEquals(m2.getMessage().getSubject(),"new Subject");
- assertEquals(mail.getMessage().getSubject(),"foo");
+ assertEquals(m2.getMessage().getSubject(), "new Subject");
+ assertEquals(mail.getMessage().getSubject(), "foo");
// cloning again the messages
Mail m2clone = m2.duplicate();
- assertTrue(isSameMimeMessage(m2clone.getMessage(),m2.getMessage()));
+ assertTrue(isSameMimeMessage(m2clone.getMessage(), m2.getMessage()));
MimeMessage mm = getWrappedMessage(m2.getMessage());
- assertNotSame(m2.getMessage(),m2clone.getMessage());
+ assertNotSame(m2.getMessage(), m2clone.getMessage());
// test that m2clone has a valid wrapped message
MimeMessage mm3 = getWrappedMessage(m2clone.getMessage());
assertNotNull(mm3);
- // dispose m2 and check that the clone has still a valid message and it is the same!
+ // dispose m2 and check that the clone has still a valid message and it
+ // is the same!
LifecycleUtil.dispose(m2);
- assertEquals(mm3,getWrappedMessage(m2clone.getMessage()));
+ assertEquals(mm3, getWrappedMessage(m2clone.getMessage()));
// change the message that should be not referenced by m2 that has
// been disposed, so it should not clone it!
m2clone.getMessage().setSubject("new Subject 2");
m2clone.getMessage().setText("new Body 3");
- assertTrue(isSameMimeMessage(m2clone.getMessage(),mm));
+ assertTrue(isSameMimeMessage(m2clone.getMessage(), mm));
LifecycleUtil.dispose(mail);
LifecycleUtil.dispose(messageFromSources);
}
-
+
/**
- * If I create a new MimeMessageCopyOnWriteProxy from another MimeMessageCopyOnWriteProxy,
- * I remove references to the first and I change the second, then it should not clone
+ * If I create a new MimeMessageCopyOnWriteProxy from another
+ * MimeMessageCopyOnWriteProxy, I remove references to the first and I
+ * change the second, then it should not clone
*/
public void testMessageAvoidCloning() throws Exception {
ArrayList r = new ArrayList();
r.add(new MailAddress("recipient@test.com"));
- MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(content+sep+body);
- MailImpl mail = new MailImpl("test",new MailAddress("test@test.com"),r,messageFromSources);
+ MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(content + sep + body);
+ MailImpl mail = new MailImpl("test", new MailAddress("test@test.com"), r, messageFromSources);
// cloning the message
Mail mailClone = mail.duplicate();
- assertTrue(isSameMimeMessage(mailClone.getMessage(),mail.getMessage()));
+ assertTrue(isSameMimeMessage(mailClone.getMessage(), mail.getMessage()));
MimeMessage mm = getWrappedMessage(mail.getMessage());
- assertNotSame(mail.getMessage(),mailClone.getMessage());
- // dispose mail and check that the clone has still a valid message and it is the same!
+ assertNotSame(mail.getMessage(), mailClone.getMessage());
+ // dispose mail and check that the clone has still a valid message and
+ // it is the same!
LifecycleUtil.dispose(mail);
LifecycleUtil.dispose(messageFromSources);
- // need to add a gc and a wait, because the original mimemessage should be finalized before the test.
+ // need to add a gc and a wait, because the original mimemessage should
+ // be finalized before the test.
System.gc();
Thread.sleep(1000);
// dumb test
- assertTrue(isSameMimeMessage(mailClone.getMessage(),mailClone.getMessage()));
+ assertTrue(isSameMimeMessage(mailClone.getMessage(), mailClone.getMessage()));
// change the message that should be not referenced by mail that has
// been disposed, so it should not clone it!
mailClone.getMessage().setSubject("new Subject 2");
mailClone.getMessage().setText("new Body 3");
- assertTrue(isSameMimeMessage(mailClone.getMessage(),mm));
+ assertTrue(isSameMimeMessage(mailClone.getMessage(), mm));
LifecycleUtil.dispose(mailClone);
LifecycleUtil.dispose(mm);
}
-
/**
- * If I create a new MimeMessageCopyOnWriteProxy from a MimeMessage and I change the new
- * message, the original should be unaltered and the proxy should clone the message.
+ * If I create a new MimeMessageCopyOnWriteProxy from a MimeMessage and I
+ * change the new message, the original should be unaltered and the proxy
+ * should clone the message.
*/
public void testMessageCloning3() throws Exception {
ArrayList r = new ArrayList();
r.add(new MailAddress("recipient@test.com"));
MimeMessage m = new MimeMessage(Session.getDefaultInstance(new Properties(null)));
m.setText("CIPS");
- MailImpl mail = new MailImpl("test",new MailAddress("test@test.com"),r,m);
- assertTrue(isSameMimeMessage(m,mail.getMessage()));
+ MailImpl mail = new MailImpl("test", new MailAddress("test@test.com"), r, m);
+ assertTrue(isSameMimeMessage(m, mail.getMessage()));
// change the message that should be not referenced by mail that has
// been disposed, so it should not clone it!
System.gc();
@@ -165,17 +169,16 @@ public class MimeMessageCopyOnWriteProxy
mail.getMessage().setText("new Body 3");
System.gc();
Thread.sleep(100);
- assertFalse(isSameMimeMessage(m,mail.getMessage()));
+ assertFalse(isSameMimeMessage(m, mail.getMessage()));
LifecycleUtil.dispose(mail);
LifecycleUtil.dispose(m);
}
-
public void testMessageDisposing() throws Exception {
ArrayList r = new ArrayList();
r.add(new MailAddress("recipient@test.com"));
- MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(content+sep+body);
- MailImpl mail = new MailImpl("test",new MailAddress("test@test.com"),r,messageFromSources);
+ MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(content + sep + body);
+ MailImpl mail = new MailImpl("test", new MailAddress("test@test.com"), r, messageFromSources);
// cloning the message
MailImpl mailClone = (MailImpl) mail.duplicate();
LifecycleUtil.dispose(mail);
@@ -184,25 +187,18 @@ public class MimeMessageCopyOnWriteProxy
assertNull(mail.getMessage());
LifecycleUtil.dispose(mailClone);
-
+
assertNull(mailClone.getMessage());
assertNull(mail.getMessage());
LifecycleUtil.dispose(mail);
LifecycleUtil.dispose(messageFromSources);
}
-
+
public void testNPE1() throws MessagingException, InterruptedException {
ArrayList recipients = new ArrayList();
recipients.add(new MailAddress("recipient@test.com"));
- MimeMessageCopyOnWriteProxy mw = new MimeMessageCopyOnWriteProxy(
- new MimeMessageInputStreamSource(
- "test",
- new SharedByteArrayInputStream(
- ("Return-path: return@test.com\r\n"+
- "Content-Transfer-Encoding: plain\r\n"+
- "Subject: test\r\n\r\n"+
- "Body Text testNPE1\r\n").getBytes())));
-
+ MimeMessageCopyOnWriteProxy mw = new MimeMessageCopyOnWriteProxy(new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream(("Return-path: return@test.com\r\n" + "Content-Transfer-Encoding: plain\r\n" + "Subject: test\r\n\r\n" + "Body Text testNPE1\r\n").getBytes())));
+
MimeMessageCopyOnWriteProxy mw2 = new MimeMessageCopyOnWriteProxy(mw);
LifecycleUtil.dispose(mw2);
mw2 = null;
@@ -213,16 +209,15 @@ public class MimeMessageCopyOnWriteProxy
LifecycleUtil.dispose(mw);
}
-
/**
- * This test throw a NullPointerException when the original message was created by
- * a MimeMessageInputStreamSource.
+ * This test throw a NullPointerException when the original message was
+ * created by a MimeMessageInputStreamSource.
*/
public void testMessageCloningViaCoW3() throws Exception {
MimeMessage mmorig = getSimpleMessage();
-
+
MimeMessage mm = new MimeMessageCopyOnWriteProxy(mmorig);
-
+
LifecycleUtil.dispose(mmorig);
mmorig = null;
System.gc();
@@ -234,14 +229,14 @@ public class MimeMessageCopyOnWriteProxy
e.printStackTrace();
fail("Exception while writing the message to output");
}
-
+
LifecycleUtil.dispose(mm);
}
private static String getReferences(MimeMessage m) {
StringBuffer ref = new StringBuffer("/");
while (m instanceof MimeMessageCopyOnWriteProxy) {
- ref.append(((MimeMessageCopyOnWriteProxy) m).refCount.getReferenceCount()+"/");
+ ref.append(((MimeMessageCopyOnWriteProxy) m).refCount.getReferenceCount() + "/");
m = ((MimeMessageCopyOnWriteProxy) m).getWrappedMessage();
}
if (m instanceof MimeMessageWrapper) {
@@ -251,17 +246,17 @@ public class MimeMessageCopyOnWriteProxy
}
return ref.toString();
}
-
+
private static MimeMessage getWrappedMessage(MimeMessage m) {
while (m instanceof MimeMessageCopyOnWriteProxy) {
- m = ((MimeMessageCopyOnWriteProxy) m).getWrappedMessage();
+ m = ((MimeMessageCopyOnWriteProxy) m).getWrappedMessage();
}
return m;
}
-
+
private static boolean isSameMimeMessage(MimeMessage first, MimeMessage second) {
return getWrappedMessage(first) == getWrappedMessage(second);
-
+
}
}
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromMimeMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromMimeMessageTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromMimeMessageTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromMimeMessageTest.java Mon Apr 4 20:38:14 2011
@@ -22,7 +22,7 @@ package org.apache.james.core;
import javax.mail.internet.MimeMessage;
public class MimeMessageFromMimeMessageTest extends MimeMessageFromStreamTest {
-
+
protected MimeMessage getMessageFromSources(String sources) throws Exception {
return new MimeMessage(super.getMessageFromSources(sources));
}
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromSharedStreamTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromSharedStreamTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromSharedStreamTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromSharedStreamTest.java Mon Apr 4 20:38:14 2011
@@ -27,9 +27,9 @@ import javax.mail.internet.MimeMessage;
import java.util.Properties;
public class MimeMessageFromSharedStreamTest extends MimeMessageFromStreamTest {
-
+
protected MimeMessage getMessageFromSources(String sources) throws Exception {
- return new MimeMessage(Session.getDefaultInstance(new Properties()),new SharedByteArrayInputStream(sources.getBytes()));
+ return new MimeMessage(Session.getDefaultInstance(new Properties()), new SharedByteArrayInputStream(sources.getBytes()));
}
}
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromStreamTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromStreamTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromStreamTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageFromStreamTest.java Mon Apr 4 20:38:14 2011
@@ -26,9 +26,9 @@ import java.io.ByteArrayInputStream;
import java.util.Properties;
public class MimeMessageFromStreamTest extends MimeMessageTest {
-
+
protected MimeMessage getMessageFromSources(String sources) throws Exception {
- return new MimeMessage(Session.getDefaultInstance(new Properties()),new ByteArrayInputStream(sources.getBytes()));
+ return new MimeMessage(Session.getDefaultInstance(new Properties()), new ByteArrayInputStream(sources.getBytes()));
}
protected MimeMessage getMultipartMessage() throws Exception {
@@ -51,5 +51,4 @@ public class MimeMessageFromStreamTest e
return getMessageFromSources(getMissingEncodingMessageSource());
}
-
}
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageTest.java Mon Apr 4 20:38:14 2011
@@ -49,7 +49,7 @@ public class MimeMessageTest extends Tes
mmCreated.saveChanges();
return mmCreated;
}
-
+
protected String getSimpleMessageCleanedSource() throws Exception {
return "Subject: test\r\n"
+"MIME-Version: 1.0\r\n"
@@ -80,9 +80,9 @@ public class MimeMessageTest extends Tes
}
protected String getSimpleMessageCleanedSourceHeaderExpected() throws Exception {
- return "X-Test: foo\r\n"+getSimpleMessageCleanedSource();
+ return "X-Test: foo\r\n" + getSimpleMessageCleanedSource();
}
-
+
/*
* Class under test for String getSubject()
*/
@@ -91,14 +91,13 @@ public class MimeMessageTest extends Tes
assertEquals(getSimpleMessageCleanedSource(), getCleanedMessageSource(m));
LifecycleUtil.dispose(m);
}
-
-
+
protected MimeMessage getMultipartMessage() throws Exception {
MimeMessage mmCreated = new MimeMessage(Session.getDefaultInstance(new Properties()));
mmCreated.setSubject("test");
MimeMultipart mm = new MimeMultipart("alternative");
- mm.addBodyPart(new MimeBodyPart(new InternetHeaders(new ByteArrayInputStream("X-header: test1\r\nContent-Type: text/plain; charset=Cp1252\r\n".getBytes())),"first part \u00F2\u00E0\u00F9".getBytes()));
- mm.addBodyPart(new MimeBodyPart(new InternetHeaders(new ByteArrayInputStream("X-header: test2\r\nContent-Type: text/plain; charset=Cp1252\r\nContent-Transfer-Encoding: quoted-printable\r\n".getBytes())),"second part =E8=E8".getBytes()));
+ mm.addBodyPart(new MimeBodyPart(new InternetHeaders(new ByteArrayInputStream("X-header: test1\r\nContent-Type: text/plain; charset=Cp1252\r\n".getBytes())), "first part \u00F2\u00E0\u00F9".getBytes()));
+ mm.addBodyPart(new MimeBodyPart(new InternetHeaders(new ByteArrayInputStream("X-header: test2\r\nContent-Type: text/plain; charset=Cp1252\r\nContent-Transfer-Encoding: quoted-printable\r\n".getBytes())), "second part =E8=E8".getBytes()));
mmCreated.setContent(mm);
mmCreated.saveChanges();
return mmCreated;
@@ -194,38 +193,37 @@ public class MimeMessageTest extends Tes
public void testMultipartMessageChanges() throws Exception {
MimeMessage mm = getMultipartMessage();
-
-// ByteArrayOutputStream out = new ByteArrayOutputStream();
-// mmCreated.writeTo(out,new String[] {"Message-ID"});
-// String messageSource = out.toString();
-// System.out.println(messageSource);
-
-
+
+ // ByteArrayOutputStream out = new ByteArrayOutputStream();
+ // mmCreated.writeTo(out,new String[] {"Message-ID"});
+ // String messageSource = out.toString();
+ // System.out.println(messageSource);
+
MimeMultipart content1 = (MimeMultipart) mm.getContent();
BodyPart b1 = content1.getBodyPart(0);
- b1.setContent("test\u20AC","text/plain; charset=Cp1252");
- mm.setContent(content1,mm.getContentType());
- //.setHeader(RFC2822Headers.CONTENT_TYPE,contentType);
+ b1.setContent("test\u20AC", "text/plain; charset=Cp1252");
+ mm.setContent(content1, mm.getContentType());
+ // .setHeader(RFC2822Headers.CONTENT_TYPE,contentType);
mm.saveChanges();
- assertEquals(getMultipartMessageExpected1(),getCleanedMessageSource(mm));
+ assertEquals(getMultipartMessageExpected1(), getCleanedMessageSource(mm));
MimeMultipart content2 = (MimeMultipart) mm.getContent();
- content2.addBodyPart(new MimeBodyPart(new InternetHeaders(new ByteArrayInputStream("Subject: test3\r\n".getBytes())),"second part".getBytes()));
- mm.setContent(content2,mm.getContentType());
+ content2.addBodyPart(new MimeBodyPart(new InternetHeaders(new ByteArrayInputStream("Subject: test3\r\n".getBytes())), "second part".getBytes()));
+ mm.setContent(content2, mm.getContentType());
mm.saveChanges();
- assertEquals(getMultipartMessageExpected2(),getCleanedMessageSource(mm));
+ assertEquals(getMultipartMessageExpected2(), getCleanedMessageSource(mm));
- mm.setContent("mynewco\u00F2\u00E0\u00F9ntent\u20AC\u00E0!","text/plain; charset=cp1252");
- mm.setHeader(RFC2822Headers.CONTENT_TYPE,"binary/octet-stream");
- //mm.setHeader("Content-Transfer-Encoding","8bit");
+ mm.setContent("mynewco\u00F2\u00E0\u00F9ntent\u20AC\u00E0!", "text/plain; charset=cp1252");
+ mm.setHeader(RFC2822Headers.CONTENT_TYPE, "binary/octet-stream");
+ // mm.setHeader("Content-Transfer-Encoding","8bit");
mm.saveChanges();
-
- assertEquals(getMultipartMessageExpected3(),getCleanedMessageSource(mm));
-
+
+ assertEquals(getMultipartMessageExpected3(), getCleanedMessageSource(mm));
+
LifecycleUtil.dispose(mm);
-
+
}
protected MimeMessage getMissingEncodingAddHeaderMessage() throws Exception {
@@ -235,7 +233,6 @@ public class MimeMessageTest extends Tes
m.saveChanges();
return m;
}
-
protected String getMissingEncodingAddHeaderSource() {
return "Subject: test\r\n"+
@@ -257,60 +254,57 @@ public class MimeMessageTest extends Tes
* This test is not usable in different locale environment.
*/
/*
- public void testMissingEncodingAddHeader() throws Exception {
-
-
- MimeMessage mm = getMissingEncodingAddHeaderMessage();
- mm.setHeader("Content-Transfer-Encoding", "quoted-printable");
- mm.saveChanges();
-
- assertEquals(getMissingEncodingAddHeaderExpected(),getCleanedMessageSource(mm));
- }
- */
-
+ * public void testMissingEncodingAddHeader() throws Exception {
+ *
+ *
+ * MimeMessage mm = getMissingEncodingAddHeaderMessage();
+ * mm.setHeader("Content-Transfer-Encoding", "quoted-printable");
+ * mm.saveChanges();
+ *
+ * assertEquals(getMissingEncodingAddHeaderExpected(),getCleanedMessageSource
+ * (mm)); }
+ */
protected String getCleanedMessageSource(MimeMessage mm) throws Exception {
ByteArrayOutputStream out2;
out2 = new ByteArrayOutputStream();
- mm.writeTo(out2,new String[] {"Message-ID"});
+ mm.writeTo(out2, new String[] { "Message-ID" });
String res = out2.toString();
int p = res.indexOf("\r\n\r\n");
if (p > 0) {
- String head = res.substring(0,p);
+ String head = res.substring(0, p);
String[] str = head.split("\r\n");
Arrays.sort(str);
StringBuffer outputHead = new StringBuffer();
- for (int i = str.length-1; i >= 0; i--) {
+ for (int i = str.length - 1; i >= 0; i--) {
outputHead.append(str[i]);
outputHead.append("\r\n");
}
- outputHead.append(res.substring(p+2));
+ outputHead.append(res.substring(p + 2));
res = outputHead.toString();
}
-
- res = res.replaceAll("----=_Part_\\d*_\\d+\\.\\d+","----=_Part_\\0_XXXXXXXXXXX.XXXXXXXXXXX");
+
+ res = res.replaceAll("----=_Part_\\d*_\\d+\\.\\d+", "----=_Part_\\0_XXXXXXXXXXX.XXXXXXXXXXX");
return res;
}
-
+
protected void debugMessage(MimeMessage mm) throws Exception {
System.out.println("-------------------");
System.out.println(getCleanedMessageSource(mm));
System.out.println("-------------------");
}
-
protected MimeMessage getMissingEncodingMessage() throws Exception {
MimeMessage mmCreated = new MimeMessage(Session.getDefaultInstance(new Properties()));
mmCreated.setSubject("test");
MimeMultipart mm = new MimeMultipart("alternative");
- mm.addBodyPart(new MimeBodyPart(new InternetHeaders(new ByteArrayInputStream("X-header: test2\r\nContent-Type: text/plain; charset=Cp1252\r\nContent-Transfer-Encoding: quoted-printable\r\n".getBytes())),"second part =E8=E8".getBytes()));
+ mm.addBodyPart(new MimeBodyPart(new InternetHeaders(new ByteArrayInputStream("X-header: test2\r\nContent-Type: text/plain; charset=Cp1252\r\nContent-Transfer-Encoding: quoted-printable\r\n".getBytes())), "second part =E8=E8".getBytes()));
mmCreated.setContent(mm);
mmCreated.saveChanges();
return mmCreated;
}
-
protected String getMissingEncodingMessageSource() {
return "Subject: test\r\n"
@@ -326,7 +320,6 @@ public class MimeMessageTest extends Tes
+"second part =E8=E8\r\n"
+"------=_Part_0_XXXXXXXXXXX.XXXXXXXXXXX--\r\n";
}
-
public void testGetLineCount() throws Exception {
MimeMessage mm = getMissingEncodingMessage();
@@ -338,42 +331,42 @@ public class MimeMessageTest extends Tes
}
LifecycleUtil.dispose(mm);
}
-
+
/**
- * This test throw a NullPointerException when the original message was created by
- * a MimeMessageInputStreamSource.
+ * This test throw a NullPointerException when the original message was
+ * created by a MimeMessageInputStreamSource.
*/
public void testMessageCloningViaCoW() throws Exception {
MimeMessage mmorig = getSimpleMessage();
-
+
MimeMessage mm = new MimeMessageCopyOnWriteProxy(mmorig);
MimeMessage mm2 = new MimeMessageCopyOnWriteProxy(mm);
mm2.setHeader("Subject", "Modified");
-
+
LifecycleUtil.dispose(mm2);
System.gc();
Thread.sleep(200);
- //((Disposable)mail_dup.getMessage()).dispose();
-
+ // ((Disposable)mail_dup.getMessage()).dispose();
+
mm.setHeader("Subject", "Modified");
-
+
LifecycleUtil.dispose(mm);
LifecycleUtil.dispose(mmorig);
}
-
+
/**
- * This test throw a NullPointerException when the original message was created by
- * a MimeMessageInputStreamSource.
+ * This test throw a NullPointerException when the original message was
+ * created by a MimeMessageInputStreamSource.
*/
public void testMessageCloningViaCoW2() throws Exception {
MimeMessage mmorig = getSimpleMessage();
-
+
MimeMessage mm = new MimeMessageCopyOnWriteProxy(mmorig);
-
+
MimeMessage mm2 = new MimeMessageCopyOnWriteProxy(mm);
-
+
LifecycleUtil.dispose(mm);
mm = null;
System.gc();
@@ -385,61 +378,55 @@ public class MimeMessageTest extends Tes
e.printStackTrace();
fail("Exception while writing the message to output");
}
-
+
LifecycleUtil.dispose(mm2);
LifecycleUtil.dispose(mmorig);
}
-
/**
- * This test throw a NullPointerException when the original message was created by
- * a MimeMessageInputStreamSource.
+ * This test throw a NullPointerException when the original message was
+ * created by a MimeMessageInputStreamSource.
*/
public void testMessageCloningViaCoWSubjectLost() throws Exception {
MimeMessage mmorig = getSimpleMessage();
-
+
MimeMessage mm = new MimeMessageCopyOnWriteProxy(mmorig);
mm.setHeader("X-Test", "foo");
mm.saveChanges();
-
- assertEquals(getSimpleMessageCleanedSourceHeaderExpected(),getCleanedMessageSource(mm));
+
+ assertEquals(getSimpleMessageCleanedSourceHeaderExpected(), getCleanedMessageSource(mm));
LifecycleUtil.dispose(mm);
LifecycleUtil.dispose(mmorig);
}
-
+
public void testReturnPath() throws Exception {
MimeMessage message = getSimpleMessage();
assertNull(message.getHeader(RFC2822Headers.RETURN_PATH));
LifecycleUtil.dispose(message);
}
-
+
public void testHeaderOrder() throws Exception {
MimeMessage message = getSimpleMessage();
message.setHeader(RFC2822Headers.RETURN_PATH, "<te...@test.de>");
- Enumeration h = message.getAllHeaderLines();
-
- assertEquals(h.nextElement(),"Return-Path: <te...@test.de>");
+ Enumeration h = message.getAllHeaderLines();
+
+ assertEquals(h.nextElement(), "Return-Path: <te...@test.de>");
LifecycleUtil.dispose(message);
}
-
-
+
/**
* http://issues.apache.org/jira/browse/GERONIMO-4261
*
- * This bug was in geronimo-javamail_1.4-1.5
- * Has been fixed in geronimo-javamail_1.4-1.6
+ * This bug was in geronimo-javamail_1.4-1.5 Has been fixed in
+ * geronimo-javamail_1.4-1.6
*/
public void testGeronimoIndexOutOfBounds() throws Exception {
- String message = " \r\n"+
- "Subject: test\r\n"+
- "\r\n"+
- "Body\r\n";
+ String message = " \r\n" + "Subject: test\r\n" + "\r\n" + "Body\r\n";
byte[] messageBytes = message.getBytes("US-ASCII");
- new MimeMessage(null, new ByteArrayInputStream(
- messageBytes));
+ new MimeMessage(null, new ByteArrayInputStream(messageBytes));
}
}
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageUtilTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageUtilTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageUtilTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageUtilTest.java Mon Apr 4 20:38:14 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.core;
import javax.mail.MessagingException;
@@ -35,31 +33,29 @@ import junit.framework.TestCase;
public class MimeMessageUtilTest extends TestCase {
public void testWriteMimeMessageMultipartWithMessageID() throws MessagingException, IOException {
- String message = "Received: from localhost.localdomain ([127.0.0.1])\r\n"+
- " by athlon14 (JAMES SMTP Server 2.3-dev) with SMTP ID 694\r\n"+
- " for <te...@athlon14.bf.loc>;\r\n"+
- " Sat, 18 Feb 2006 19:30:53 +0100 (CET)\r\n"+
- "Subject: ext2int\r\n"+
- "X-James-Postage: This is a test mail sent by James Postage\r\n"+
- "Mime-Version: 1.0\r\n"+
- "Content-Type: multipart/alternative; boundary=\"XyoYyxCQIfmZ5Sxofid6XQVZt5Z09XtTnqBF4Z45XSA=\"\r\n"+
- "Date: Sat, 18 Feb 2006 19:30:53 +0100 (CET)\r\n"+
- "From: test_ext2@another.bf.loc\r\n"+
- "\r\n"+
- "\r\n"+
- "--XyoYyxCQIfmZ5Sxofid6XQVZt5Z09XtTnqBF4Z45XSA=\r\n"+
- "Content-Type: text/plain\r\n"+
- "\r\n"+
- "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\r\n"+
- "--XyoYyxCQIfmZ5Sxofid6XQVZt5Z09XtTnqBF4Z45XSA=\r\n"+
- "Content-Type: application/octet-stream\r\n"+
- "\r\n"+
- "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\r\n"+
+ String message = "Received: from localhost.localdomain ([127.0.0.1])\r\n" +
+ " by athlon14 (JAMES SMTP Server 2.3-dev) with SMTP ID 694\r\n" +
+ " for <te...@athlon14.bf.loc>;\r\n" +
+ " Sat, 18 Feb 2006 19:30:53 +0100 (CET)\r\n" +
+ "Subject: ext2int\r\n" +
+ "X-James-Postage: This is a test mail sent by James Postage\r\n" +
+ "Mime-Version: 1.0\r\n" +
+ "Content-Type: multipart/alternative; boundary=\"XyoYyxCQIfmZ5Sxofid6XQVZt5Z09XtTnqBF4Z45XSA=\"\r\n" +
+ "Date: Sat, 18 Feb 2006 19:30:53 +0100 (CET)\r\n" +
+ "From: test_ext2@another.bf.loc\r\n" +
+ "\r\n" +
+ "\r\n" +
+ "--XyoYyxCQIfmZ5Sxofid6XQVZt5Z09XtTnqBF4Z45XSA=\r\n" +
+ "Content-Type: text/plain\r\n" +
+ "\r\n" +
+ "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\r\n" +
+ "--XyoYyxCQIfmZ5Sxofid6XQVZt5Z09XtTnqBF4Z45XSA=\r\n" +
+ "Content-Type: application/octet-stream\r\n" +
+ "\r\n" +
+ "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\r\n" +
"--XyoYyxCQIfmZ5Sxofid6XQVZt5Z09XtTnqBF4Z45XSA=--\r\n";
-
- ;
- MimeMessage mimeMessage = new MimeMessage(Session.getDefaultInstance(new Properties()),new ByteArrayInputStream(message.getBytes()));
+ MimeMessage mimeMessage = new MimeMessage(Session.getDefaultInstance(new Properties()), new ByteArrayInputStream(message.getBytes()));
mimeMessage.getSize();
ByteArrayOutputStream headerOut = new ByteArrayOutputStream();
ByteArrayOutputStream bodyOut = new ByteArrayOutputStream();
Modified: james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java (original)
+++ james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java Mon Apr 4 20:38:14 2011
@@ -39,10 +39,10 @@ import java.util.Enumeration;
public class MimeMessageWrapperTest extends MimeMessageFromStreamTest {
private final class TestableMimeMessageWrapper extends MimeMessageWrapper {
-
+
boolean messageLoadable = true;
boolean headersLoadable = true;
-
+
private TestableMimeMessageWrapper(MimeMessageSource source) throws MessagingException {
super(source);
}
@@ -94,9 +94,7 @@ public class MimeMessageWrapperTest exte
throw new IllegalStateException("messageLoadable disabled");
}
}
-
-
-
+
}
TestableMimeMessageWrapper mw = null;
@@ -114,49 +112,46 @@ public class MimeMessageWrapperTest exte
}
protected void setUp() throws Exception {
- mw = (TestableMimeMessageWrapper) getMessageFromSources(content+sep+body);
+ mw = (TestableMimeMessageWrapper) getMessageFromSources(content + sep + body);
}
protected void tearDown() throws Exception {
LifecycleUtil.dispose(mw);
}
-
public void testDeferredMessageLoading() throws MessagingException, IOException {
- assertEquals("foo",mw.getSubject());
+ assertEquals("foo", mw.getSubject());
assertFalse(mw.messageParsed());
- assertEquals("bar\r\n",mw.getContent());
+ assertEquals("bar\r\n", mw.getContent());
assertTrue(mw.messageParsed());
assertFalse(mw.isModified());
}
- /** this is commented out due optimisation reverts (JAMES-559)
- public void testDeferredMessageLoadingWhileWriting() throws MessagingException, IOException {
- mw.setMessageLoadable(false);
- assertEquals("foo",mw.getSubject());
- assertFalse(mw.isModified());
- mw.setSubject("newSubject");
- assertEquals("newSubject",mw.getSubject());
- assertFalse(mw.messageParsed());
- assertTrue(mw.isModified());
- mw.setMessageLoadable(true);
-
- }
- */
+ /**
+ * this is commented out due optimisation reverts (JAMES-559) public void
+ * testDeferredMessageLoadingWhileWriting() throws MessagingException,
+ * IOException { mw.setMessageLoadable(false);
+ * assertEquals("foo",mw.getSubject()); assertFalse(mw.isModified());
+ * mw.setSubject("newSubject"); assertEquals("newSubject",mw.getSubject());
+ * assertFalse(mw.messageParsed()); assertTrue(mw.isModified());
+ * mw.setMessageLoadable(true);
+ *
+ * }
+ */
public void testDeferredHeaderLoading() throws MessagingException, IOException {
mw.setHeadersLoadable(false);
try {
- assertEquals("foo",mw.getSubject());
+ assertEquals("foo", mw.getSubject());
fail("subject should not be loadable here, headers loading is disabled");
} catch (IllegalStateException e) {
-
+
}
}
/**
- * See JAMES-474
- * MimeMessageWrapper(MimeMessage) should clone the original message.
+ * See JAMES-474 MimeMessageWrapper(MimeMessage) should clone the original
+ * message.
*/
public void testMessageCloned() throws MessagingException, IOException, InterruptedException {
MimeMessageWrapper mmw = new MimeMessageWrapper(mw);
@@ -177,10 +172,10 @@ public class MimeMessageWrapperTest exte
String line;
while (r.ready()) {
line = r.readLine();
- res.append(line+"\r\n");
+ res.append(line + "\r\n");
}
r.close();
- assertEquals(body,res.toString());
+ assertEquals(body, res.toString());
} catch (MessagingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -189,27 +184,27 @@ public class MimeMessageWrapperTest exte
e.printStackTrace();
}
}
-
+
/*
* Class under test for String getSubject()
*/
public void testAddHeaderAndSave() {
try {
mw.addHeader("X-Test", "X-Value");
-
+
assertEquals("X-Value", mw.getHeader("X-Test")[0]);
-
+
mw.saveChanges();
ByteArrayOutputStream rawMessage = new ByteArrayOutputStream();
mw.writeTo(rawMessage);
-
+
assertEquals("X-Value", mw.getHeader("X-Test")[0]);
String res = rawMessage.toString();
-
+
boolean found = res.indexOf("X-Test: X-Value") > 0;
- assertEquals(true,found);
+ assertEquals(true, found);
} catch (MessagingException e) {
// TODO Auto-generated catch block
@@ -220,33 +215,31 @@ public class MimeMessageWrapperTest exte
}
}
-
public void testReplaceReturnPathOnBadMessage() throws Exception {
MimeMessage message = getMessageWithBadReturnPath();
message.setHeader(RFC2822Headers.RETURN_PATH, "<te...@test.de>");
- Enumeration e = message.getMatchingHeaderLines(new String[] {"Return-Path"});
- assertEquals("Return-Path: <te...@test.de>",e.nextElement());
+ Enumeration e = message.getMatchingHeaderLines(new String[] { "Return-Path" });
+ assertEquals("Return-Path: <te...@test.de>", e.nextElement());
assertFalse(e.hasMoreElements());
- Enumeration h = message.getAllHeaderLines();
- assertEquals("Return-Path: <te...@test.de>",h.nextElement());
+ Enumeration h = message.getAllHeaderLines();
+ assertEquals("Return-Path: <te...@test.de>", h.nextElement());
assertFalse(h.nextElement().toString().startsWith("Return-Path:"));
LifecycleUtil.dispose(message);
}
-
+
public void testAddReturnPathOnBadMessage() throws Exception {
MimeMessage message = getMessageWithBadReturnPath();
message.addHeader(RFC2822Headers.RETURN_PATH, "<te...@test.de>");
// test that we have now 2 return-paths
- Enumeration e = message.getMatchingHeaderLines(new String[] {"Return-Path"});
- assertEquals("Return-Path: <te...@test.de>",e.nextElement());
- assertEquals("Return-Path: <my...@example.com>",e.nextElement());
+ Enumeration e = message.getMatchingHeaderLines(new String[] { "Return-Path" });
+ assertEquals("Return-Path: <te...@test.de>", e.nextElement());
+ assertEquals("Return-Path: <my...@example.com>", e.nextElement());
// test that return-path is the first line
- Enumeration h = message.getAllHeaderLines();
- assertEquals("Return-Path: <te...@test.de>",h.nextElement());
+ Enumeration h = message.getAllHeaderLines();
+ assertEquals("Return-Path: <te...@test.de>", h.nextElement());
LifecycleUtil.dispose(message);
}
-
/**
* Test for JAMES-1154
*/
@@ -276,8 +269,8 @@ public class MimeMessageWrapperTest exte
*/
public void testMessageStreamWithUpatedContent() throws MessagingException, IOException {
String newContent = "This is the new message content!";
- mw.setText(newContent);
- assertEquals(newContent, (String)mw.getContent());
+ mw.setText(newContent);
+ assertEquals(newContent, (String) mw.getContent());
mw.saveChanges();
@@ -294,23 +287,22 @@ public class MimeMessageWrapperTest exte
reader.close();
assertTrue(contentUpdated);
}
-
+
public void testSize() throws MessagingException {
assertEquals(body.length(), mw.getSize());
}
-
-
+
public void testSizeModifiedHeaders() throws MessagingException {
mw.addHeader("whatever", "test");
assertEquals(body.length(), mw.getSize());
}
-
+
public void testSizeModifiedBodyWithoutSave() throws MessagingException {
String newBody = "This is the new body of the message";
mw.setText(newBody);
assertEquals(body.length(), mw.getSize());
}
-
+
public void testSizeModifiedBodyWithSave() throws MessagingException {
String newBody = "This is the new body of the message";
mw.setText(newBody);
Modified: james/server/trunk/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java (original)
+++ james/server/trunk/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java Mon Apr 4 20:38:14 2011
@@ -17,10 +17,8 @@
* under the License. *
****************************************************************/
-
package org.apache.james.domainlist.api.mock;
-
import java.util.LinkedList;
import java.util.List;
@@ -37,17 +35,18 @@ public class SimpleDomainList implements
return domains.contains(domain);
}
- public String[] getDomains() throws DomainListException{
+ public String[] getDomains() throws DomainListException {
return domains.toArray(new String[domains.size()]);
}
- public void addDomain(String domain) throws DomainListException{
- if (domains.contains(domain)) throw new DomainListException("Domain " + domain + " already exist");
+ public void addDomain(String domain) throws DomainListException {
+ if (domains.contains(domain))
+ throw new DomainListException("Domain " + domain + " already exist");
domains.add(domain);
}
public void removeDomain(String domain) throws DomainListException {
- if(domains.remove(domain) == false) {
+ if (domains.remove(domain) == false) {
throw new DomainListException("Domain " + domain + " does not exist");
}
}
Modified: james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java (original)
+++ james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java Mon Apr 4 20:38:14 2011
@@ -43,7 +43,7 @@ public abstract class AbstractMailReposi
String content = "Subject: test\r\nAAAContent-Transfer-Encoding: text/plain";
String sep = "\r\n\r\n";
String body = "original body\r\n.\r\n";
-
+
protected Mail mail;
protected MailRepository mailRepository;
protected MimeMessage mimeMessage;
@@ -57,21 +57,21 @@ public abstract class AbstractMailReposi
mailRepository = getMailRepository();
MimeMessageInputStreamSource mmis = null;
try {
- mmis = new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream((content+sep+body).getBytes()));
+ mmis = new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream((content + sep + body).getBytes()));
} catch (MessagingException e) {
}
mimeMessage = new MimeMessageCopyOnWriteProxy(mmis);
Collection<MailAddress> recipients = new ArrayList<MailAddress>();
- recipients.add(new MailAddress("rec1","domain.com"));
- recipients.add(new MailAddress("rec2","domain.com"));
- mail = new MailImpl("mail1",new MailAddress("sender","domain.com"),recipients,mimeMessage);
+ recipients.add(new MailAddress("rec1", "domain.com"));
+ recipients.add(new MailAddress("rec2", "domain.com"));
+ mail = new MailImpl("mail1", new MailAddress("sender", "domain.com"), recipients, mimeMessage);
mail.setAttribute("testAttribute", "testValue");
}
protected abstract MailRepository getMailRepository() throws Exception;
-
+
protected void tearDown() throws Exception {
- for (Iterator<String> i = mailRepository.list(); i.hasNext(); ) {
+ for (Iterator<String> i = mailRepository.list(); i.hasNext();) {
mailRepository.remove(i.next());
}
LifecycleUtil.dispose(mail);
@@ -79,7 +79,7 @@ public abstract class AbstractMailReposi
LifecycleUtil.dispose(mailRepository);
super.tearDown();
}
-
+
public void testStoreAndRetrieveMail() throws MessagingException, IOException {
try {
mailRepository.store(mail);
@@ -87,15 +87,15 @@ public abstract class AbstractMailReposi
fail("Failed to store mail");
}
Mail m2 = mailRepository.retrieve((String) mailRepository.list().next());
-
- assertEquals("stored and retrieved messages do not match", mail.getMessage().getContent().toString(),m2.getMessage().getContent().toString());
+
+ assertEquals("stored and retrieved messages do not match", mail.getMessage().getContent().toString(), m2.getMessage().getContent().toString());
assertEquals("stored and retrieved message sizes do not match", mail.getMessageSize(), m2.getMessageSize());
assertEquals("stored and retrieved keys do not match", mail.getName(), m2.getName());
assertEquals("stored and retrieved states do not match", mail.getState(), m2.getState());
assertEquals("stored and retrieved attributes do not match", mail.getAttribute("testAttribute"), m2.getAttribute("testAttribute"));
LifecycleUtil.dispose(m2);
}
-
+
public void testEmptyRepository() throws MessagingException {
assertFalse(mailRepository.list().hasNext());
// locking does not check for the existence of the file
@@ -104,13 +104,13 @@ public abstract class AbstractMailReposi
// removing an unexisting message does not throw/return errors
mailRepository.remove("random");
}
-
+
public void testListMail() throws MessagingException {
mailRepository.store(mail);
mailRepository.store(mail);
Iterator<String> i = mailRepository.list();
assertTrue(i.hasNext());
- assertEquals(mail.getName(),i.next());
+ assertEquals(mail.getName(), i.next());
assertFalse("Found more than one message after storing 2 times the SAME message: it MUST update the previous", i.hasNext());
}
@@ -120,22 +120,22 @@ public abstract class AbstractMailReposi
*/
public void testJames559() throws Exception {
mailRepository.store(mail);
-
+
Mail m2 = mailRepository.retrieve("mail1");
m2.getMessage().setHeader("X-Header", "foobar");
m2.getMessage().saveChanges();
-
+
mailRepository.store(m2);
// ALWAYS remember to dispose mails!
LifecycleUtil.dispose(m2);
-
+
m2 = mailRepository.retrieve("mail1");
- assertEquals(mail.getMessage().getContent().toString(),m2.getMessage().getContent().toString());
-
+ assertEquals(mail.getMessage().getContent().toString(), m2.getMessage().getContent().toString());
+
LifecycleUtil.dispose(mail);
mail = null;
LifecycleUtil.dispose(m2);
-
+
mailRepository.remove("mail1");
}
@@ -145,22 +145,22 @@ public abstract class AbstractMailReposi
*/
public void testJames559WithoutSaveChanges() throws Exception {
mailRepository.store(mail);
-
+
Mail m2 = mailRepository.retrieve("mail1");
m2.getMessage().setHeader("X-Header", "foobar");
-
+
mailRepository.store(m2);
// ALWAYS remember to dispose mails!
LifecycleUtil.dispose(m2);
-
+
m2 = mailRepository.retrieve("mail1");
- assertEquals(mail.getMessage().getContent().toString(),m2.getMessage().getContent().toString());
-
+ assertEquals(mail.getMessage().getContent().toString(), m2.getMessage().getContent().toString());
+
LifecycleUtil.dispose(mail);
mail = null;
-
+
LifecycleUtil.dispose(m2);
-
+
mailRepository.remove("mail1");
}
Modified: james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java (original)
+++ james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java Mon Apr 4 20:38:14 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.mailrepository.mock;
import java.util.ArrayList;
@@ -31,12 +29,12 @@ import org.apache.james.mailrepository.a
public class MockMailRepositoryStore implements MailRepositoryStore {
- Map<String,MailRepository> m_storedObjectMap = new HashMap<String,MailRepository>();
+ Map<String, MailRepository> m_storedObjectMap = new HashMap<String, MailRepository>();
public void add(String url, MailRepository obj) {
m_storedObjectMap.put(url, obj);
}
-
+
public MailRepository select(String url) throws MailRepositoryStoreException {
MailRepository result = get(url);
return result;
Modified: james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java (original)
+++ james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java Mon Apr 4 20:38:14 2011
@@ -30,7 +30,7 @@ import org.apache.james.user.api.UsersRe
import org.apache.james.user.api.model.User;
/**
- * Test basic behaviours of UsersFileRepository
+ * Test basic behaviors of UsersFileRepository
*/
public abstract class AbstractUsersRepositoryTest extends TestCase {
@@ -43,7 +43,7 @@ public abstract class AbstractUsersRepos
* Create the repository to be tested.
*
* @return the user repository
- * @throws Exception
+ * @throws Exception
*/
protected abstract UsersRepository getUsersRepository() throws Exception;
@@ -78,29 +78,29 @@ public abstract class AbstractUsersRepos
assertNotNull(user);
assertEquals("username does not match", user.getUserName(), "username");
assertTrue("user not contained in the repository", usersRepository.contains("username"));
-
+
User u = usersRepository.getUserByName("uSERNAMe");
assertNull("found the user searching for a different case!", u);
-
- //String realname = usersRepository.getRealName("uSERNAMe");
- //assertNull("name is not null", realname);
+
+ // String realname = usersRepository.getRealName("uSERNAMe");
+ // assertNull("name is not null", realname);
// assertEquals("name is different", "username", realname);
}
-
+
public void testUserListing() throws UsersRepositoryException {
ArrayList<String> keys = new ArrayList<String>(3);
keys.add("username1");
keys.add("username2");
keys.add("username3");
- for (Iterator<String> i = keys.iterator(); i.hasNext(); ) {
+ for (Iterator<String> i = keys.iterator(); i.hasNext();) {
String username = i.next();
- usersRepository.addUser(username, username);
+ usersRepository.addUser(username, username);
}
assertEquals("Wrong number of users found", keys.size(), usersRepository.countUsers());
// check list return all and only the expected users
ArrayList<String> check = new ArrayList<String>(keys);
- for (Iterator<String> i = usersRepository.list(); i.hasNext(); ) {
+ for (Iterator<String> i = usersRepository.list(); i.hasNext();) {
String username = (String) i.next();
if (getPasswordsEnabled()) {
assertTrue(usersRepository.test(username, username));
@@ -113,9 +113,9 @@ public abstract class AbstractUsersRepos
}
assertEquals("Some user has not be found", 0, check.size());
}
-
+
public void testUserPassword() throws UsersRepositoryException {
- usersRepository.addUser("username","password");
+ usersRepository.addUser("username", "password");
assertEquals("didn't accept the correct password ", usersRepository.test("username", "password"), getPasswordsEnabled());
assertFalse("accepted the wrong password #1", usersRepository.test("username", "password2"));
assertFalse("accepted the wrong password #2", usersRepository.test("username2", "password"));
@@ -123,7 +123,7 @@ public abstract class AbstractUsersRepos
assertFalse("accepted the wrong password #4", usersRepository.test("username", "passwords"));
assertFalse("accepted the wrong password #5", usersRepository.test("userName", "password"));
}
-
+
protected boolean getPasswordsEnabled() {
return true;
}
@@ -137,8 +137,8 @@ public abstract class AbstractUsersRepos
} catch (Exception e) {
e.printStackTrace();
}
- usersRepository.addUser("username","password");
- assertEquals("didn't accept the correct password", usersRepository.test("username", "password"),getPasswordsEnabled());
+ usersRepository.addUser("username", "password");
+ assertEquals("didn't accept the correct password", usersRepository.test("username", "password"), getPasswordsEnabled());
User user = usersRepository.getUserByName("username");
user.setPassword("newpass");
try {
@@ -146,7 +146,8 @@ public abstract class AbstractUsersRepos
assertEquals("new password accepted", usersRepository.test("username", "newpass"), getPasswordsEnabled());
assertFalse("old password rejected", usersRepository.test("username", "password"));
} catch (UnsupportedOperationException e) {
- // if updating users is not allowed check that this is a repository without password checking
+ // if updating users is not allowed check that this is a repository
+ // without password checking
assertFalse(getPasswordsEnabled());
}
try {
@@ -161,26 +162,21 @@ public abstract class AbstractUsersRepos
usersRepository.updateUser(user);
fail();
} catch (UsersRepositoryException e) {
-
+
}
}
-
-
-
-
-
+
/**
* @return
*/
protected boolean getCheckCase() {
return true;
}
-
+
protected boolean getAllowMultipleUsersWithDifferentCases() {
return getCheckCase();
}
-
/**
* @see junit.framework.TestCase#setUp()
*/
@@ -197,10 +193,10 @@ public abstract class AbstractUsersRepos
super.tearDown();
}
-
/**
* Dispose the repository
- * @throws UsersRepositoryException
+ *
+ * @throws UsersRepositoryException
*/
protected void disposeUsersRepository() throws UsersRepositoryException {
if (usersRepository != null) {
Modified: james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java (original)
+++ james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java Mon Apr 4 20:38:14 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.user.lib;
import java.util.Arrays;
@@ -40,12 +38,10 @@ public class UsersRepositoryManagementTe
protected void setUp() throws Exception {
m_mockUsersRepository = new MockUsersRepository();
- m_userManagement = new UsersRepositoryManagement();
+ m_userManagement = new UsersRepositoryManagement();
m_userManagement.setUsersRepository(m_mockUsersRepository);
}
-
-
public void testUserCount() throws Exception {
assertEquals("no user yet", 0, m_userManagement.countUsers());
m_mockUsersRepository.addUser("testCount1", "testCount");
@@ -56,8 +52,6 @@ public class UsersRepositoryManagementTe
assertEquals("1 user", 1, m_userManagement.countUsers());
}
-
-
public void testAddUserAndVerify() throws Exception {
m_mockUsersRepository.addUser("testCount1", "testCount");
assertFalse("user not there", m_userManagement.verifyExists("testNotAdded"));
@@ -76,7 +70,7 @@ public class UsersRepositoryManagementTe
public void testListUsers() throws Exception {
- String[] usersArray = new String[] {"ccc", "aaa", "dddd", "bbbbb"};
+ String[] usersArray = new String[] { "ccc", "aaa", "dddd", "bbbbb" };
List<String> users = Arrays.asList(usersArray);
for (int i = 0; i < users.size(); i++) {
@@ -89,11 +83,11 @@ public class UsersRepositoryManagementTe
for (int i = 0; i < userNames.length; i++) {
String user = userNames[i];
- if (!users.contains(user)) fail("user not listed");
+ if (!users.contains(user))
+ fail("user not listed");
}
}
-
public void testSetPassword() throws Exception {
m_userManagement.addUser("testPwdUser", "pwd1");
@@ -114,5 +108,5 @@ public class UsersRepositoryManagementTe
assertTrue("password changed to pWD2", m_mockUsersRepository.test("testPwdUser", "pWD2"));
}
-
+
}
Modified: james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java (original)
+++ james/server/trunk/data-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java Mon Apr 4 20:38:14 2011
@@ -33,13 +33,14 @@ import org.apache.james.user.lib.model.D
public class MockUsersRepository extends AbstractJamesUsersRepository {
- private final HashMap<String,User> m_users = new HashMap<String,User>();
+ private final HashMap<String, User> m_users = new HashMap<String, User>();
/**
- * force the repository to hold implementations of JamesUser interface, instead of User
- * JamesUser is _not_ required as of the UsersRepository interface, so the necessarity forcing it
- * is due to code using UsersRepository while at the same time expecting it to hold JamesUsers
- * (like in RemoteManagerHandler)
+ * force the repository to hold implementations of JamesUser interface,
+ * instead of User JamesUser is _not_ required as of the UsersRepository
+ * interface, so the necessarity forcing it is due to code using
+ * UsersRepository while at the same time expecting it to hold JamesUsers
+ * (like in RemoteManagerHandler)
*/
private boolean m_forceUseJamesUser = false;
@@ -47,10 +48,7 @@ public class MockUsersRepository extends
m_forceUseJamesUser = true;
}
-
-
-
- public User getUserByName(String name) throws UsersRepositoryException{
+ public User getUserByName(String name) throws UsersRepositoryException {
if (ignoreCase) {
return getUserByNameCaseInsensitive(name);
} else {
@@ -58,11 +56,11 @@ public class MockUsersRepository extends
}
}
- public User getUserByNameCaseInsensitive(String name)throws UsersRepositoryException {
+ public User getUserByNameCaseInsensitive(String name) throws UsersRepositoryException {
return (User) m_users.get(name.toLowerCase(Locale.US));
}
- public String getRealName(String name) throws UsersRepositoryException{
+ public String getRealName(String name) throws UsersRepositoryException {
if (ignoreCase) {
return m_users.get(name.toLowerCase(Locale.US)) != null ? ((User) m_users.get(name.toLowerCase(Locale.US))).getUserName() : null;
} else {
@@ -70,13 +68,12 @@ public class MockUsersRepository extends
}
}
-
- public void removeUser(String name) throws UsersRepositoryException{
- if ( m_users.containsKey(name) == false) {
- throw new UsersRepositoryException("No such user");
- } else {
- m_users.remove(name);
- }
+ public void removeUser(String name) throws UsersRepositoryException {
+ if (m_users.containsKey(name) == false) {
+ throw new UsersRepositoryException("No such user");
+ } else {
+ m_users.remove(name);
+ }
}
public boolean contains(String name) throws UsersRepositoryException {
@@ -91,44 +88,43 @@ public class MockUsersRepository extends
throw new UnsupportedOperationException("mock");
}
-
- public boolean test(String name, String password) throws UsersRepositoryException{
+ public boolean test(String name, String password) throws UsersRepositoryException {
User user = getUserByName(name);
- if (user == null) return false;
+ if (user == null)
+ return false;
return user.verifyPassword(password);
}
- public int countUsers() throws UsersRepositoryException{
+ public int countUsers() throws UsersRepositoryException {
return m_users.size();
}
protected List<String> listUserNames() {
Iterator<User> users = m_users.values().iterator();
List<String> userNames = new LinkedList<String>();
- while ( users.hasNext() ) {
+ while (users.hasNext()) {
User user = users.next();
userNames.add(user.getUserName());
}
return userNames;
}
- public Iterator<String> list() throws UsersRepositoryException{
- return listUserNames().iterator();
+
+ public Iterator<String> list() throws UsersRepositoryException {
+ return listUserNames().iterator();
}
- protected void doAddUser(User user) throws UsersRepositoryException{
- if (m_forceUseJamesUser && user instanceof DefaultUser ) {
- DefaultUser aUser = (DefaultUser)user;
- user = new DefaultJamesUser(aUser.getUserName(),
- aUser.getHashedPassword(),
- aUser.getHashAlgorithm());
+ protected void doAddUser(User user) throws UsersRepositoryException {
+ if (m_forceUseJamesUser && user instanceof DefaultUser) {
+ DefaultUser aUser = (DefaultUser) user;
+ user = new DefaultJamesUser(aUser.getUserName(), aUser.getHashedPassword(), aUser.getHashAlgorithm());
}
String key = user.getUserName();
m_users.put(key, user);
}
- protected void doUpdateUser(User user) throws UsersRepositoryException{
+ protected void doUpdateUser(User user) throws UsersRepositoryException {
if (m_users.containsKey(user.getUserName())) {
m_users.put(user.getUserName(), user);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org