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 [4/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...
Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java Mon Apr 4 20:38:14 2011
@@ -72,7 +72,7 @@ public class POP3ServerTest extends Test
"Content-Transfer-Encoding: plain\r\n"+
"Subject: test\r\n\r\n"+
"Body Text POP3ServerTest.setupTestMails\r\n").getBytes();
-
+
public POP3ServerTest() {
super("AsyncPOP3ServerTest");
}
@@ -82,56 +82,51 @@ public class POP3ServerTest extends Test
protected POP3Server createPOP3Server() {
return new POP3Server();
}
-
+
protected void initPOP3Server(POP3TestConfiguration testConfiguration) throws Exception {
m_pop3Server.configure(testConfiguration);
m_pop3Server.init();
}
-
protected void setUpPOP3Server() throws Exception {
-
+
m_pop3Server = createPOP3Server();
m_pop3Server.setDNSService(dnsservice);
m_pop3Server.setFileSystem(fSystem);
m_pop3Server.setProtocolHandlerChain(chain);
-
-
+
Logger log = LoggerFactory.getLogger("Mock");
// slf4j can't set programmatically any log level. It's just a facade
// log.setLevel(SimpleLog.LOG_LEVEL_DEBUG);
m_pop3Server.setLog(log);
}
-
protected void setUp() throws Exception {
setUpServiceManager();
-
+
chain = new MockProtocolHandlerChain();
chain.setLoader(serviceManager);
chain.setLog(LoggerFactory.getLogger("ChainLog"));
-
+
setUpPOP3Server();
m_testConfiguration = new POP3TestConfiguration(m_pop3ListenerPort);
}
protected void finishSetUp(POP3TestConfiguration testConfiguration) throws Exception {
testConfiguration.init();
- chain.configure(testConfiguration);
+ chain.configure(testConfiguration);
chain.init();
initPOP3Server(testConfiguration);
}
-
protected void setUpServiceManager() throws Exception {
serviceManager = new MockJSR250Loader();
- serviceManager.put("usersrepository",
- m_usersRepository);
-
+ serviceManager.put("usersrepository", m_usersRepository);
+
InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory();
manager = new InMemoryMailboxManager(factory, new Authenticator() {
-
+
public boolean isAuthentic(String userid, CharSequence passwd) {
try {
return m_usersRepository.test(userid, passwd.toString());
@@ -142,14 +137,14 @@ public class POP3ServerTest extends Test
}
}
}, new InMemoryCachingUidProvider());
-
+
serviceManager.put("mailboxmanager", manager);
-
+
dnsservice = setUpDNSServer();
serviceManager.put("dnsservice", setUpDNSServer());
fSystem = new MockFileSystem();
- serviceManager.put("filesystem",fSystem);
-
+ serviceManager.put("filesystem", fSystem);
+
}
private DNSService setUpDNSServer() {
@@ -157,25 +152,26 @@ public class POP3ServerTest extends Test
public String getHostName(InetAddress addr) {
return "localhost";
}
-
+
public InetAddress getLocalHost() throws UnknownHostException {
return InetAddress.getLocalHost();
- }
-
+ }
+
};
return dns;
}
+
protected void tearDown() throws Exception {
-
+
if (m_pop3Protocol != null) {
- if ( m_pop3Protocol.isConnected()){
- m_pop3Protocol.sendCommand("quit");
- m_pop3Protocol.disconnect();
- }
+ if (m_pop3Protocol.isConnected()) {
+ m_pop3Protocol.sendCommand("quit");
+ m_pop3Protocol.disconnect();
+ }
}
-
+
manager.deleteEverything();
- //manager.deleteAll();
+ // manager.deleteAll();
m_pop3Server.destroy();
@@ -184,7 +180,7 @@ public class POP3ServerTest extends Test
public void testAuthenticationFail() throws Exception {
finishSetUp(m_testConfiguration);
-
+
m_pop3Protocol = new POP3Client();
m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
@@ -210,7 +206,7 @@ public class POP3ServerTest extends Test
finishSetUp(m_testConfiguration);
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_usersRepository.addUser("foo", "bar");
@@ -227,7 +223,7 @@ public class POP3ServerTest extends Test
assertNotNull(entries);
assertEquals(entries.length, 0);
-
+
POP3MessageInfo p3i = m_pop3Protocol.listMessage(1);
assertEquals(1, m_pop3Protocol.getState());
assertNull(p3i);
@@ -235,37 +231,34 @@ public class POP3ServerTest extends Test
}
// TODO: This currently fails with Async implementation because
- // it use Charset US-ASCII to decode / Encode the protocol
- // from the RFC I'm currently not understand if NON-ASCII chars
- // are allowed at all. So this needs to be checked
+ // it use Charset US-ASCII to decode / Encode the protocol
+ // from the RFC I'm currently not understand if NON-ASCII chars
+ // are allowed at all. So this needs to be checked
/*
- public void testNotAsciiCharsInPassword() throws Exception {
- finishSetUp(m_testConfiguration);
-
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
-
- String pass = "bar" + (new String(new char[] { 200, 210 })) + "foo";
- m_usersRepository.addUser("foo", pass);
- InMemorySpoolRepository mockMailRepository = new InMemorySpoolRepository();
- m_mailServer.setUserInbox("foo", mockMailRepository);
-
- m_pop3Protocol.login("foo", pass);
- assertEquals(1, m_pop3Protocol.getState());
- ContainerUtil.dispose(mockMailRepository);
- }
- */
-
+ * public void testNotAsciiCharsInPassword() throws Exception {
+ * finishSetUp(m_testConfiguration);
+ *
+ * m_pop3Protocol = new POP3Client();
+ * m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ *
+ * String pass = "bar" + (new String(new char[] { 200, 210 })) + "foo";
+ * m_usersRepository.addUser("foo", pass); InMemorySpoolRepository
+ * mockMailRepository = new InMemorySpoolRepository();
+ * m_mailServer.setUserInbox("foo", mockMailRepository);
+ *
+ * m_pop3Protocol.login("foo", pass); assertEquals(1,
+ * m_pop3Protocol.getState()); ContainerUtil.dispose(mockMailRepository); }
+ */
public void testUnknownCommand() throws Exception {
finishSetUp(m_testConfiguration);
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
-
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+
m_pop3Protocol.sendCommand("unkn");
assertEquals(0, m_pop3Protocol.getState());
- assertEquals("Expected -ERR as result for an unknown command", m_pop3Protocol.getReplyString().substring(0,4),"-ERR");
+ assertEquals("Expected -ERR as result for an unknown command", m_pop3Protocol.getReplyString().substring(0, 4), "-ERR");
}
public void testUidlCommand() throws Exception {
@@ -274,7 +267,7 @@ public class POP3ServerTest extends Test
m_usersRepository.addUser("foo", "bar");
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_pop3Protocol.sendCommand("uidl");
assertEquals(0, m_pop3Protocol.getState());
@@ -290,19 +283,18 @@ public class POP3ServerTest extends Test
if (manager.mailboxExists(mailboxPath, session) == false) {
manager.createMailbox(mailboxPath, session);
}
- setupTestMails(session,manager.getMailbox(mailboxPath, session));
-
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ setupTestMails(session, manager.getMailbox(mailboxPath, session));
+
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_pop3Protocol.login("foo", "bar");
list = m_pop3Protocol.listUniqueIdentifiers();
- assertEquals("Expected 2 messages, found: "+list.length, 2, list.length);
-
+ assertEquals("Expected 2 messages, found: " + list.length, 2, list.length);
+
POP3MessageInfo p3i = m_pop3Protocol.listUniqueIdentifier(1);
assertNotNull(p3i);
-
- manager.deleteMailbox(mailboxPath, session);
+ manager.deleteMailbox(mailboxPath, session);
}
@@ -310,30 +302,30 @@ public class POP3ServerTest extends Test
finishSetUp(m_testConfiguration);
m_usersRepository.addUser("foo", "bar");
-
+
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_pop3Protocol.sendCommand("noop");
assertEquals(0, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
m_pop3Protocol.sendCommand("stat");
assertEquals(0, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
m_pop3Protocol.sendCommand("pass");
assertEquals(0, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
m_pop3Protocol.sendCommand("auth");
assertEquals(0, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
m_pop3Protocol.sendCommand("rset");
assertEquals(0, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
-
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
+
m_pop3Protocol.login("foo", "bar");
POP3MessageInfo[] list = m_pop3Protocol.listUniqueIdentifiers();
@@ -344,41 +336,41 @@ public class POP3ServerTest extends Test
m_pop3Protocol.sendCommand("pass");
assertEquals(1, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
m_pop3Protocol.sendCommand("auth");
assertEquals(1, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
m_pop3Protocol.sendCommand("user");
assertEquals(1, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
m_pop3Protocol.sendCommand("rset");
assertEquals(1, m_pop3Protocol.getState());
-
+
}
public void testKnownUserInboxWithMessages() throws Exception {
finishSetUp(m_testConfiguration);
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_usersRepository.addUser("foo2", "bar2");
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
MailboxSession session = manager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
-
+
if (manager.mailboxExists(mailboxPath, session) == false) {
manager.createMailbox(mailboxPath, session);
}
-
- setupTestMails(session,manager.getMailbox(mailboxPath, session));
-
- m_pop3Protocol.sendCommand("retr","1");
+
+ setupTestMails(session, manager.getMailbox(mailboxPath, session));
+
+ m_pop3Protocol.sendCommand("retr", "1");
assertEquals(0, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
m_pop3Protocol.login("foo2", "bar2");
assertEquals(1, m_pop3Protocol.getState());
@@ -405,7 +397,7 @@ public class POP3ServerTest extends Test
// already deleted message
deleted = m_pop3Protocol.deleteMessage(entries[0].number);
-
+
// TODO: Understand why this fails...
assertFalse(deleted);
@@ -416,7 +408,7 @@ public class POP3ServerTest extends Test
m_pop3Protocol.sendCommand("quit");
m_pop3Protocol.disconnect();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_pop3Protocol.login("foo2", "bar2");
assertEquals(1, m_pop3Protocol.getState());
@@ -435,8 +427,8 @@ public class POP3ServerTest extends Test
// top without arguments
m_pop3Protocol.sendCommand("top");
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0,4));
-
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
+
Reader r3 = m_pop3Protocol.retrieveMessageTop(entries[0].number, 0);
assertNotNull(r3);
r3.close();
@@ -455,22 +447,22 @@ public class POP3ServerTest extends Test
finishSetUp(m_testConfiguration);
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_usersRepository.addUser("foo2", "bar2");
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
MailboxSession session = manager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
-
+
if (manager.mailboxExists(mailboxPath, session) == false) {
manager.createMailbox(mailboxPath, session);
}
-
+
int msgCount = 100;
- for (int i = 0; i < msgCount;i++) {
- manager.getMailbox(mailboxPath, session).appendMessage(new ByteArrayInputStream(("Subject: test\r\n\r\n" +i).getBytes()), new Date(), session, true, new Flags());
+ for (int i = 0; i < msgCount; i++) {
+ manager.getMailbox(mailboxPath, session).appendMessage(new ByteArrayInputStream(("Subject: test\r\n\r\n" + i).getBytes()), new Date(), session, true, new Flags());
}
-
+
m_pop3Protocol.login("foo2", "bar2");
assertEquals(1, m_pop3Protocol.getState());
@@ -484,36 +476,37 @@ public class POP3ServerTest extends Test
m_pop3Protocol.sendCommand("quit");
m_pop3Protocol.disconnect();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_pop3Protocol.login("foo2", "bar2");
assertEquals(1, m_pop3Protocol.getState());
manager.deleteMailbox(mailboxPath, session);
}
-
+
// Test for JAMES-1202
- // This was failing before as the more then one connection to the same mailbox was not handled the right way
+ // This was failing before as the more then one connection to the same
+ // mailbox was not handled the right way
public void testStatUidlListTwoConnections() throws Exception {
finishSetUp(m_testConfiguration);
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_usersRepository.addUser("foo2", "bar2");
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
MailboxSession session = manager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
-
+
if (manager.mailboxExists(mailboxPath, session) == false) {
manager.createMailbox(mailboxPath, session);
}
-
+
int msgCount = 100;
- for (int i = 0; i < msgCount;i++) {
- manager.getMailbox(mailboxPath, session).appendMessage(new ByteArrayInputStream(("Subject: test\r\n\r\n" +i).getBytes()), new Date(), session, true, new Flags());
+ for (int i = 0; i < msgCount; i++) {
+ manager.getMailbox(mailboxPath, session).appendMessage(new ByteArrayInputStream(("Subject: test\r\n\r\n" + i).getBytes()), new Date(), session, true, new Flags());
}
-
+
m_pop3Protocol.login("foo2", "bar2");
assertEquals(1, m_pop3Protocol.getState());
@@ -525,7 +518,7 @@ public class POP3ServerTest extends Test
assertEquals(msgCount, statInfo.number);
POP3Client m_pop3Protocol2 = new POP3Client();
- m_pop3Protocol2.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol2.connect("127.0.0.1", m_pop3ListenerPort);
m_pop3Protocol2.login("foo2", "bar2");
assertEquals(1, m_pop3Protocol2.getState());
@@ -543,9 +536,9 @@ public class POP3ServerTest extends Test
assertEquals(msgCount - 1, listEntries.length);
assertEquals(msgCount - 1, uidlEntries.length);
assertEquals(msgCount - 1, statInfo.number);
-
-
- // even after the message was deleted it should get displayed in the second connection
+
+ // even after the message was deleted it should get displayed in the
+ // second connection
listEntries2 = m_pop3Protocol2.listMessages();
uidlEntries2 = m_pop3Protocol2.listUniqueIdentifiers();
statInfo2 = m_pop3Protocol2.status();
@@ -555,8 +548,9 @@ public class POP3ServerTest extends Test
assertTrue(m_pop3Protocol.logout());
m_pop3Protocol.disconnect();
-
- // even after the message was deleted and the session was quit it should get displayed in the second connection
+
+ // even after the message was deleted and the session was quit it should
+ // get displayed in the second connection
listEntries2 = m_pop3Protocol2.listMessages();
uidlEntries2 = m_pop3Protocol2.listUniqueIdentifiers();
statInfo2 = m_pop3Protocol2.status();
@@ -570,62 +564,51 @@ public class POP3ServerTest extends Test
m_pop3Protocol2.sendCommand("quit");
m_pop3Protocol2.disconnect();
-
+
manager.deleteMailbox(mailboxPath, session);
}
/*
- public void testTwoSimultaneousMails() throws Exception {
- finishSetUp(m_testConfiguration);
-
- // make two user/repositories, open both
- m_usersRepository.addUser("foo1", "bar1");
- InMemorySpoolRepository mailRep1 = new InMemorySpoolRepository();
- setupTestMails(mailRep1);
- m_mailServer.setUserInbox("foo1", mailRep1);
+ * public void testTwoSimultaneousMails() throws Exception {
+ * finishSetUp(m_testConfiguration);
+ *
+ * // make two user/repositories, open both
+ * m_usersRepository.addUser("foo1", "bar1"); InMemorySpoolRepository
+ * mailRep1 = new InMemorySpoolRepository(); setupTestMails(mailRep1);
+ * m_mailServer.setUserInbox("foo1", mailRep1);
+ *
+ * m_usersRepository.addUser("foo2", "bar2"); InMemorySpoolRepository
+ * mailRep2 = new InMemorySpoolRepository(); //do not setupTestMails, this
+ * is done later m_mailServer.setUserInbox("foo2", mailRep2);
+ *
+ * POP3Client pop3Protocol2 = null; try { // open two connections
+ * m_pop3Protocol = new POP3Client(); m_pop3Protocol.connect("127.0.0.1",
+ * m_pop3ListenerPort); pop3Protocol2 = new POP3Client();
+ * pop3Protocol2.connect("127.0.0.1", m_pop3ListenerPort);
+ *
+ * assertEquals("first connection taken", 0, m_pop3Protocol.getState());
+ * assertEquals("second connection taken", 0, pop3Protocol2.getState());
+ *
+ * // open two accounts m_pop3Protocol.login("foo1", "bar1");
+ *
+ * pop3Protocol2.login("foo2", "bar2");
+ *
+ * POP3MessageInfo[] entries = m_pop3Protocol.listMessages();
+ * assertEquals("foo1 has mails", 2, entries.length);
+ *
+ * entries = pop3Protocol2.listMessages(); assertEquals("foo2 has no mails",
+ * 0, entries.length);
+ *
+ * } finally { // put both to rest, field var is handled by tearDown() if
+ * (pop3Protocol2 != null) { pop3Protocol2.sendCommand("quit");
+ * pop3Protocol2.disconnect(); } } }
+ */
- m_usersRepository.addUser("foo2", "bar2");
- InMemorySpoolRepository mailRep2 = new InMemorySpoolRepository();
- //do not setupTestMails, this is done later
- m_mailServer.setUserInbox("foo2", mailRep2);
-
- POP3Client pop3Protocol2 = null;
- try {
- // open two connections
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- pop3Protocol2 = new POP3Client();
- pop3Protocol2.connect("127.0.0.1", m_pop3ListenerPort);
-
- assertEquals("first connection taken", 0, m_pop3Protocol.getState());
- assertEquals("second connection taken", 0, pop3Protocol2.getState());
-
- // open two accounts
- m_pop3Protocol.login("foo1", "bar1");
-
- pop3Protocol2.login("foo2", "bar2");
-
- POP3MessageInfo[] entries = m_pop3Protocol.listMessages();
- assertEquals("foo1 has mails", 2, entries.length);
-
- entries = pop3Protocol2.listMessages();
- assertEquals("foo2 has no mails", 0, entries.length);
-
- } finally {
- // put both to rest, field var is handled by tearDown()
- if (pop3Protocol2 != null) {
- pop3Protocol2.sendCommand("quit");
- pop3Protocol2.disconnect();
- }
- }
- }
- */
-
public void testIpStored() throws Exception {
finishSetUp(m_testConfiguration);
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
String pass = "password";
m_usersRepository.addUser("foo", pass);
@@ -634,111 +617,98 @@ public class POP3ServerTest extends Test
assertEquals(1, m_pop3Protocol.getState());
assertTrue(POP3BeforeSMTPHelper.isAuthorized("127.0.0.1"));
}
-
- public void testCapa() throws Exception {
- finishSetUp(m_testConfiguration);
-
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
-
- String pass = "password";
- m_usersRepository.addUser("foo", pass);
-
- assertEquals(POP3Reply.OK, m_pop3Protocol.sendCommand("CAPA"));
-
- m_pop3Protocol.getAdditionalReply();
- m_pop3Protocol.getReplyString();
- List<String> replies = Arrays.asList(m_pop3Protocol.getReplyStrings());
-
- assertTrue("contains USER", replies.contains("USER"));
-
- m_pop3Protocol.login("foo", pass);
- assertEquals(POP3Reply.OK, m_pop3Protocol.sendCommand("CAPA"));
-
- m_pop3Protocol.getAdditionalReply();
- m_pop3Protocol.getReplyString();
- replies = Arrays.asList(m_pop3Protocol.getReplyStrings());
- assertTrue("contains USER", replies.contains("USER"));
- assertTrue("contains UIDL", replies.contains("UIDL"));
- assertTrue("contains TOP", replies.contains("TOP"));
-
- }
-
- /*
- * See JAMES-649
- * The same happens when using RETR
- *
- * Comment to not broke the builds!
- *
- public void testOOMTop() throws Exception {
+ public void testCapa() throws Exception {
finishSetUp(m_testConfiguration);
- int messageCount = 30000;
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- m_usersRepository.addUser("foo", "bar");
- InMemorySpoolRepository mockMailRepository = new InMemorySpoolRepository();
-
- Mail m = new MailImpl();
- m.setMessage(Util.createMimeMessage("X-TEST", "test"));
- for (int i = 1; i < messageCount+1; i++ ) {
- m.setName("test" + i);
- mockMailRepository.store(m);
- }
+ String pass = "password";
+ m_usersRepository.addUser("foo", pass);
- m_mailServer.setUserInbox("foo", mockMailRepository);
+ assertEquals(POP3Reply.OK, m_pop3Protocol.sendCommand("CAPA"));
- // not authenticated
- POP3MessageInfo[] entries = m_pop3Protocol.listMessages();
- assertNull(entries);
+ m_pop3Protocol.getAdditionalReply();
+ m_pop3Protocol.getReplyString();
+ List<String> replies = Arrays.asList(m_pop3Protocol.getReplyStrings());
- m_pop3Protocol.login("foo", "bar");
- System.err.println(m_pop3Protocol.getState());
- assertEquals(1, m_pop3Protocol.getState());
+ assertTrue("contains USER", replies.contains("USER"));
- entries = m_pop3Protocol.listMessages();
- assertEquals(1, m_pop3Protocol.getState());
+ m_pop3Protocol.login("foo", pass);
+ assertEquals(POP3Reply.OK, m_pop3Protocol.sendCommand("CAPA"));
+
+ m_pop3Protocol.getAdditionalReply();
+ m_pop3Protocol.getReplyString();
+ replies = Arrays.asList(m_pop3Protocol.getReplyStrings());
+ assertTrue("contains USER", replies.contains("USER"));
+ assertTrue("contains UIDL", replies.contains("UIDL"));
+ assertTrue("contains TOP", replies.contains("TOP"));
- assertNotNull(entries);
- assertEquals(entries.length, messageCount);
-
- for (int i = 1; i < messageCount+1; i++ ) {
- Reader r = m_pop3Protocol.retrieveMessageTop(i, 100);
- assertNotNull(r);
- r.close();
- }
-
- ContainerUtil.dispose(mockMailRepository);
}
- */
-
-
+
+ /*
+ * See JAMES-649 The same happens when using RETR
+ *
+ * Comment to not broke the builds!
+ *
+ * public void testOOMTop() throws Exception {
+ * finishSetUp(m_testConfiguration);
+ *
+ * int messageCount = 30000; m_pop3Protocol = new POP3Client();
+ * m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ *
+ * m_usersRepository.addUser("foo", "bar"); InMemorySpoolRepository
+ * mockMailRepository = new InMemorySpoolRepository();
+ *
+ * Mail m = new MailImpl(); m.setMessage(Util.createMimeMessage("X-TEST",
+ * "test")); for (int i = 1; i < messageCount+1; i++ ) { m.setName("test" +
+ * i); mockMailRepository.store(m); }
+ *
+ * m_mailServer.setUserInbox("foo", mockMailRepository);
+ *
+ * // not authenticated POP3MessageInfo[] entries =
+ * m_pop3Protocol.listMessages(); assertNull(entries);
+ *
+ * m_pop3Protocol.login("foo", "bar");
+ * System.err.println(m_pop3Protocol.getState()); assertEquals(1,
+ * m_pop3Protocol.getState());
+ *
+ * entries = m_pop3Protocol.listMessages(); assertEquals(1,
+ * m_pop3Protocol.getState());
+ *
+ * assertNotNull(entries); assertEquals(entries.length, messageCount);
+ *
+ * for (int i = 1; i < messageCount+1; i++ ) { Reader r =
+ * m_pop3Protocol.retrieveMessageTop(i, 100); assertNotNull(r); r.close(); }
+ *
+ * ContainerUtil.dispose(mockMailRepository); }
+ */
+
// See JAMES-1136
public void testDeadlockOnRetr() throws Exception {
finishSetUp(m_testConfiguration);
m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1",m_pop3ListenerPort);
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_usersRepository.addUser("foo6", "bar6");
MailboxPath mailboxPath = MailboxPath.inbox("foo6");
MailboxSession session = manager.login("foo6", "bar6", LoggerFactory.getLogger("Test"));
-
+
manager.startProcessingRequest(session);
if (manager.mailboxExists(mailboxPath, session) == false) {
manager.createMailbox(mailboxPath, session);
}
-
+
ByteArrayOutputStream out = new ByteArrayOutputStream();
out.write(content);
-
+
byte[] bigMail = new byte[1024 * 1024 * 10];
int c = 0;
for (int i = 0; i < bigMail.length; i++) {
-
+
bigMail[i] = 'X';
c++;
if (c == 1000 || i + 3 == bigMail.length) {
@@ -749,10 +719,10 @@ public class POP3ServerTest extends Test
}
out.write(bigMail);
bigMail = null;
-
+
manager.getMailbox(mailboxPath, session).appendMessage(new ByteArrayInputStream(out.toByteArray()), new Date(), session, false, new Flags());
manager.startProcessingRequest(session);
-
+
m_pop3Protocol.login("foo6", "bar6");
assertEquals(1, m_pop3Protocol.getState());
@@ -767,7 +737,7 @@ public class POP3ServerTest extends Test
assertNotNull(r);
r.close();
manager.deleteMailbox(mailboxPath, session);
-
+
}
-
+
}
Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java Mon Apr 4 20:38:14 2011
@@ -33,7 +33,7 @@ public class POP3TestConfiguration exten
public void init() {
addProperty("[@enabled]", true);
- addProperty("bind", "127.0.0.1:" +m_pop3ListenerPort);
+ addProperty("bind", "127.0.0.1:" + m_pop3ListenerPort);
addProperty("helloName", "myMailServer");
addProperty("connectiontimeout", "360000");
addProperty("handlerchain.[@coreHandlersPackage]", CoreCmdHandlerLoader.class.getName());
Modified: james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java (original)
+++ james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java Mon Apr 4 20:38:14 2011
@@ -19,39 +19,44 @@
package org.apache.james.protocols.lib;
-
-
import java.io.IOException;
import java.net.ServerSocket;
-
/**
* some utilities for James unit testing
*/
public class PortUtil {
- private static final int PORT_RANGE_START = 8000; // the lowest possible port number assigned for testing
- private static final int PORT_RANGE_END = 11000; // the highest possible port number assigned for testing
+ private static final int PORT_RANGE_START = 8000; // the lowest possible
+ // port number assigned
+ // for testing
+ private static final int PORT_RANGE_END = 11000; // the highest possible
+ // port number assigned for
+ // testing
private static int PORT_LAST_USED = PORT_RANGE_START;
/**
* assigns a port from the range of test ports
+ *
* @return port number
*/
public static int getNonPrivilegedPort() {
- return getNextNonPrivilegedPort(); // uses sequential assignment of ports
+ return getNextNonPrivilegedPort(); // uses sequential assignment of
+ // ports
}
/**
* assigns a random port from the range of test ports
+ *
* @return port number
*/
protected static int getRandomNonPrivilegedPortInt() {
- return ((int)( Math.random() * (PORT_RANGE_END - PORT_RANGE_START) + PORT_RANGE_START));
+ return ((int) (Math.random() * (PORT_RANGE_END - PORT_RANGE_START) + PORT_RANGE_START));
}
/**
* assigns ports sequentially from the range of test ports
+ *
* @return port number
*/
protected synchronized static int getNextNonPrivilegedPort() {
@@ -60,8 +65,10 @@ public class PortUtil {
while (true) {
try {
nextPortCandidate++;
- if (PORT_LAST_USED == nextPortCandidate) throw new RuntimeException("no free port found");
- if (nextPortCandidate > PORT_RANGE_END) nextPortCandidate = PORT_RANGE_START; // start over
+ if (PORT_LAST_USED == nextPortCandidate)
+ throw new RuntimeException("no free port found");
+ if (nextPortCandidate > PORT_RANGE_END)
+ nextPortCandidate = PORT_RANGE_START; // start over
// test, port is available
ServerSocket ss;
@@ -78,5 +85,4 @@ public class PortUtil {
return PORT_LAST_USED;
}
-
}
Modified: james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java (original)
+++ james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java Mon Apr 4 20:38:14 2011
@@ -36,7 +36,6 @@ import org.slf4j.Logger;
public class MockJSR250Loader {
private final Map<String, Object> servicesByName;
-
public MockJSR250Loader() {
@@ -44,16 +43,15 @@ public class MockJSR250Loader {
}
- public Object get(String name) {
+ public Object get(String name) {
Object service = servicesByName.get(name);
return service;
}
-
+
public void put(String role, Object service) {
servicesByName.put(role, service);
}
-
private List<Object> loaderRegistry = new ArrayList<Object>();
/*
@@ -65,19 +63,20 @@ public class MockJSR250Loader {
return newInstance(clazz, null, null);
}
- public final <T> T newInstance(Class<T> clazz, Logger log, HierarchicalConfiguration config) throws Exception{
- T obj = clazz.newInstance();
- injectResources(obj);
- postConstruct(obj);
- synchronized (this) {
- loaderRegistry.add(obj);
- }
- return obj;
+ public final <T> T newInstance(Class<T> clazz, Logger log, HierarchicalConfiguration config) throws Exception {
+ T obj = clazz.newInstance();
+ injectResources(obj);
+ postConstruct(obj);
+ synchronized (this) {
+ loaderRegistry.add(obj);
+ }
+ return obj;
}
protected Object create(String className) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
return Thread.currentThread().getContextClassLoader().loadClass(className).newInstance();
}
+
/**
* Dispose all loaded instances by calling the method of the instances which
* is annotated with @PreDestroy
@@ -150,8 +149,8 @@ public class MockJSR250Loader {
}
}
- public Object getObjectForName(String name) {
- return get(name);
- }
+ public Object getObjectForName(String name) {
+ return get(name);
+ }
}
Modified: james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java (original)
+++ james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java Mon Apr 4 20:38:14 2011
@@ -23,7 +23,6 @@ import java.util.LinkedList;
import java.util.List;
import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
@@ -36,47 +35,45 @@ import org.apache.james.protocols.api.Pr
import org.apache.james.protocols.api.WiringException;
import org.slf4j.Logger;
-
/**
- * ProtocolHandlerchain implementation which instance all the configured handlers
+ * ProtocolHandlerchain implementation which instance all the configured
+ * handlers
+ *
*
- *
* TODO: Move this to test package as it is the only place where it get used
*/
@SuppressWarnings("unchecked")
public class MockProtocolHandlerChain implements ProtocolHandlerChain, Configurable, LogEnabled {
-
+
private Logger log;
private String coreHandlersPackage;
private LinkedList handlers = new LinkedList();
private HierarchicalConfiguration config;
private MockJSR250Loader factory;
-
public void setCoreHandlersPackage(String coreHandlersPackage) {
this.coreHandlersPackage = coreHandlersPackage;
}
-
+
public void setLoader(MockJSR250Loader factory) {
this.factory = factory;
}
-
-
+
@PostConstruct
public void init() throws Exception {
HierarchicalConfiguration handlerchainConfig = config.configurationAt("handlerchain");
if (handlerchainConfig.getString("[@coreHandlersPackage]") == null)
handlerchainConfig.addProperty("[@coreHandlersPackage]", coreHandlersPackage);
-
- loadHandlers(handlerchainConfig);
-
+
+ loadHandlers(handlerchainConfig);
+
wireExtensibleHandlers();
}
-
+
/**
* ExtensibleHandler wiring
*
- * @throws WiringException
+ * @throws WiringException
*/
private void wireExtensibleHandlers() throws WiringException {
for (int a = 0; a < handlers.size(); a++) {
@@ -94,27 +91,30 @@ public class MockProtocolHandlerChain im
}
}
-
+
/**
* Load and add the classes to the handler map
*
- * @param classLoader The classLoader to use
- * @param className The class name
- * @param config The configuration
- * @throws ConfigurationException Get thrown on error
+ * @param classLoader
+ * The classLoader to use
+ * @param className
+ * The class name
+ * @param config
+ * The configuration
+ * @throws ConfigurationException
+ * Get thrown on error
*/
private void loadClass(String className, org.apache.commons.configuration.HierarchicalConfiguration config) throws Exception {
Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
Object obj = factory.newInstance(clazz, log, config);
-
// if it is a commands handler add it to the map with key as command
// name
if (obj instanceof HandlersPackage) {
List<String> c = ((HandlersPackage) obj).getHandlers();
- for (Iterator<String> i = c.iterator(); i.hasNext(); ) {
+ for (Iterator<String> i = c.iterator(); i.hasNext();) {
String cName = i.next();
HierarchicalConfiguration cmdConf = addHandler(cName);
@@ -124,7 +124,7 @@ public class MockProtocolHandlerChain im
} else {
handlers.add(obj);
-
+
if (log.isInfoEnabled()) {
log.info("Added Handler: " + className);
}
@@ -132,24 +132,30 @@ public class MockProtocolHandlerChain im
}
}
-
+
/**
- * Return a DefaultConfiguration build on the given command name and classname
+ * Return a DefaultConfiguration build on the given command name and
+ * classname
*
- * @param cmdName The command name
- * @param className The class name
+ * @param cmdName
+ * The command name
+ * @param className
+ * The class name
* @return DefaultConfiguration
- * @throws ConfigurationException
+ * @throws ConfigurationException
*/
private HierarchicalConfiguration addHandler(String className) throws ConfigurationException {
HierarchicalConfiguration hConf = new DefaultConfigurationBuilder();
hConf.addProperty("handler.[@class]", className);
return hConf;
}
-
-
- /* (non-Javadoc)
- * @see org.apache.james.socket.shared.ProtocolHandlerChain#getHandlers(java.lang.Class)
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.james.socket.shared.ProtocolHandlerChain#getHandlers(java.
+ * lang.Class)
*/
public <T> LinkedList<T> getHandlers(Class<T> type) {
LinkedList<T> classHandlers = new LinkedList<T>();
@@ -157,7 +163,7 @@ public class MockProtocolHandlerChain im
while (hList.hasNext()) {
Object obj = hList.next();
if (type.isInstance(obj)) {
- classHandlers.add((T)obj);
+ classHandlers.add((T) obj);
}
}
return classHandlers;
@@ -171,46 +177,47 @@ public class MockProtocolHandlerChain im
*/
private void loadHandlers(HierarchicalConfiguration commonsConf) throws Exception {
- List<org.apache.commons.configuration.HierarchicalConfiguration> children = ((HierarchicalConfiguration) commonsConf).configurationsAt("handler");
+ List<org.apache.commons.configuration.HierarchicalConfiguration> children = ((HierarchicalConfiguration) commonsConf).configurationsAt("handler");
+
+ String coreCmdName = commonsConf.getString("[@coreHandlersPackage]");
+ // load the core handlers
+ loadClass(coreCmdName, addHandler(coreCmdName));
+
+ // load the configured handlers
+ if (children != null && children.isEmpty() == false) {
+
+ for (int i = 0; i < children.size(); i++) {
+ org.apache.commons.configuration.HierarchicalConfiguration hConf = children.get(i);
+ String className = hConf.getString("[@class]");
+
+ if (className != null) {
+ // ignore base handlers.
+ if (!className.equals(coreCmdName)) {
- String coreCmdName = commonsConf.getString("[@coreHandlersPackage]");
- // load the core handlers
- loadClass(coreCmdName,
- addHandler(coreCmdName));
-
- // load the configured handlers
- if (children != null && children.isEmpty() == false) {
-
- for (int i = 0; i < children.size(); i++) {
- org.apache.commons.configuration.HierarchicalConfiguration hConf = children.get(i);
- String className = hConf.getString("[@class]");
-
- if (className != null) {
- // ignore base handlers.
- if (!className.equals(coreCmdName)) {
-
- // load the handler
- loadClass(className, hConf);
- }
+ // load the handler
+ loadClass(className, hConf);
}
}
-
}
-
+
+ }
+
}
-
-
/*
* (non-Javadoc)
- * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
+ *
+ * @see
+ * org.apache.james.lifecycle.Configurable#configure(org.apache.commons.
+ * configuration.HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
this.config = config;
}
-
+
/*
* (non-Javadoc)
+ *
* @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger)
*/
public void setLog(Logger log) {
Modified: james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java (original)
+++ james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java Mon Apr 4 20:38:14 2011
@@ -26,26 +26,26 @@ import java.io.InputStream;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.james.filesystem.api.FileSystem;
-public class ActiveMQMailQueueBlobTest extends ActiveMQMailQueueTest{
+public class ActiveMQMailQueueBlobTest extends ActiveMQMailQueueTest {
public final static String BASE_DIR = "file://target/james-test";
private MyFileSystem fs;
-
+
protected ActiveMQConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory factory = super.createConnectionFactory();
-
+ ActiveMQConnectionFactory factory = super.createConnectionFactory();
+
FileSystemBlobTransferPolicy policy = new FileSystemBlobTransferPolicy();
policy.setFileSystem(fs);
policy.setDefaultUploadUrl(BASE_DIR);
factory.setBlobTransferPolicy(policy);
-
+
return factory;
}
-
+
@Override
public void setUp() throws Exception {
fs = new MyFileSystem();
-
+
super.setUp();
}
@@ -64,7 +64,6 @@ public class ActiveMQMailQueueBlobTest e
private final class MyFileSystem implements FileSystem {
-
public InputStream getResource(String url) throws IOException {
return null;
}
@@ -83,7 +82,7 @@ public class ActiveMQMailQueueBlobTest e
public File getBasedir() throws FileNotFoundException {
throw new FileNotFoundException();
}
-
+
public void destroy() throws FileNotFoundException {
getFile(BASE_DIR).delete();
}
Modified: james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java (original)
+++ james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java Mon Apr 4 20:38:14 2011
@@ -23,23 +23,20 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.plugin.StatisticsBrokerPlugin;
-import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.queue.jms.JMSMailQueue;
import org.apache.james.queue.jms.JMSMailQueueTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ActiveMQMailQueueTest extends JMSMailQueueTest{
-
+public class ActiveMQMailQueueTest extends JMSMailQueueTest {
@Override
protected BrokerService createBroker() throws Exception {
- BrokerService broker = super.createBroker();
+ BrokerService broker = super.createBroker();
// Enable statistics
- broker.setPlugins(new BrokerPlugin[] {new StatisticsBrokerPlugin()});
+ broker.setPlugins(new BrokerPlugin[] { new StatisticsBrokerPlugin() });
broker.setEnableStatistics(true);
-
-
+
return broker;
}
@@ -48,13 +45,12 @@ public class ActiveMQMailQueueTest exten
Logger log = LoggerFactory.getLogger("MockLog");
// slf4j can't set programmatically any log level. It's just a facade
// log.setLevel(SimpleLog.LOG_LEVEL_DEBUG);
- ActiveMQMailQueue queue = new ActiveMQMailQueue(factory, queueName, useBlobMessages(),log);
+ ActiveMQMailQueue queue = new ActiveMQMailQueue(factory, queueName, useBlobMessages(), log);
return queue;
}
-
+
protected boolean useBlobMessages() {
return false;
}
-
}
Modified: james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java (original)
+++ james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java Mon Apr 4 20:38:14 2011
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.james.queue.api.mock;
import java.util.concurrent.Executors;
@@ -26,46 +25,45 @@ import java.util.concurrent.ScheduledExe
import java.util.concurrent.TimeUnit;
import org.apache.james.queue.api.MailQueue;
-import org.apache.james.queue.api.MailQueue.MailQueueException;
-import org.apache.james.queue.api.MailQueue.MailQueueItem;
import org.apache.mailet.Mail;
-public class MockMailQueue implements MailQueue{
+public class MockMailQueue implements MailQueue {
private final LinkedBlockingQueue<Mail> queue = new LinkedBlockingQueue<Mail>();
private boolean throwException;
private ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
private Mail lastMail;
-
+
/**
* Throw an {@link MailQueueException} on next operation
*/
public void throwExceptionOnNextOperation() {
this.throwException = true;
}
-
+
public MailQueueItem deQueue() throws MailQueueException {
if (throwException) {
throwException = false;
throw new MailQueueException("Mock");
}
try {
- final Mail mail = queue.take();
- if (queue.isEmpty()) lastMail = null;
+ final Mail mail = queue.take();
+ if (queue.isEmpty())
+ lastMail = null;
return new MailQueueItem() {
-
- public Mail getMail() {
- return mail;
- }
-
- public void done(boolean success) throws MailQueueException {
- // do nothing here
-
- }
- };
-
+
+ public Mail getMail() {
+ return mail;
+ }
+
+ public void done(boolean success) throws MailQueueException {
+ // do nothing here
+
+ }
+ };
+
} catch (InterruptedException e) {
- throw new MailQueueException("Mock",e);
+ throw new MailQueueException("Mock", e);
}
}
@@ -73,8 +71,8 @@ public class MockMailQueue implements Ma
if (throwException) {
throwException = false;
throw new MailQueueException("Mock");
- }
-
+ }
+
scheduler.schedule(new Runnable() {
public void run() {
@@ -83,9 +81,9 @@ public class MockMailQueue implements Ma
lastMail = mail;
} catch (InterruptedException e) {
e.printStackTrace();
- }
+ }
}
-
+
}, delay, unit);
}
@@ -98,14 +96,14 @@ public class MockMailQueue implements Ma
queue.put(mail);
lastMail = mail;
} catch (InterruptedException e) {
- throw new MailQueueException("Mock",e);
+ throw new MailQueueException("Mock", e);
}
}
public Mail getLastMail() {
return lastMail;
}
-
+
public void clear() {
queue.clear();
}
Modified: james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java (original)
+++ james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java Mon Apr 4 20:38:14 2011
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.james.queue.api.mock;
import java.util.HashMap;
@@ -26,7 +25,7 @@ import java.util.Map;
import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
-public class MockMailQueueFactory implements MailQueueFactory{
+public class MockMailQueueFactory implements MailQueueFactory {
private final Map<String, MailQueue> queues = new HashMap<String, MailQueue>();
public synchronized MailQueue getQueue(String name) {
Modified: james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java (original)
+++ james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java Mon Apr 4 20:38:14 2011
@@ -47,32 +47,32 @@ import org.slf4j.LoggerFactory;
import junit.framework.TestCase;
-public class JMSMailQueueTest extends TestCase{
+public class JMSMailQueueTest extends TestCase {
protected JMSMailQueue queue;
private BrokerService broker;
protected final static String QUEUE_NAME = "test";
-
- public void setUp() throws Exception{
+
+ public void setUp() throws Exception {
broker = createBroker();
broker.start();
-
+
ConnectionFactory connectionFactory = createConnectionFactory();
queue = createQueue(connectionFactory, QUEUE_NAME);
-
+
super.setUp();
-
+
}
protected ActiveMQConnectionFactory createConnectionFactory() {
return new ActiveMQConnectionFactory("vm://localhost?create=false");
}
+
protected BrokerService createBroker() throws Exception {
BrokerService broker = new BrokerService();
broker.setPersistent(false);
broker.setUseJmx(false);
broker.addConnector("tcp://127.0.0.1:61616");
-
-
+
// Enable priority support
PolicyMap pMap = new PolicyMap();
PolicyEntry entry = new PolicyEntry();
@@ -80,20 +80,18 @@ public class JMSMailQueueTest extends Te
entry.setQueue(QUEUE_NAME);
pMap.setPolicyEntries(Arrays.asList(entry));
broker.setDestinationPolicy(pMap);
-
+
return broker;
-
+
}
-
+
protected JMSMailQueue createQueue(ConnectionFactory factory, String queueName) {
Logger log = LoggerFactory.getLogger("MockLog");
// slf4j can't set programmatically any log level. It's just a facade
// log.setLevel(SimpleLog.LOG_LEVEL_DEBUG);
- JMSMailQueue queue = new JMSMailQueue(factory, queueName, log );
+ JMSMailQueue queue = new JMSMailQueue(factory, queueName, log);
return queue;
}
-
-
@Override
protected void tearDown() throws Exception {
@@ -105,24 +103,23 @@ public class JMSMailQueueTest extends Te
public void testFIFO() throws MessagingException, InterruptedException, IOException {
// should be empty
assertEquals(0, queue.getSize());
-
+
Mail mail = createMail();
- Mail mail2 =createMail();
+ Mail mail2 = createMail();
queue.enQueue(mail);
queue.enQueue(mail2);
-
+
Thread.sleep(200);
-
+
assertEquals(2, queue.getSize());
-
+
MailQueueItem item = queue.deQueue();
checkMail(mail, item.getMail());
item.done(false);
-
+
Thread.sleep(200);
-
// ok we should get the same email again
assertEquals(2, queue.getSize());
MailQueueItem item2 = queue.deQueue();
@@ -131,35 +128,32 @@ public class JMSMailQueueTest extends Te
Thread.sleep(200);
-
-
assertEquals(1, queue.getSize());
MailQueueItem item3 = queue.deQueue();
checkMail(mail2, item3.getMail());
item3.done(true);
-
+
Thread.sleep(200);
// should be empty
assertEquals(0, queue.getSize());
}
-
+
public void testDelayedDeQueue() throws MessagingException, InterruptedException, IOException {
// should be empty
assertEquals(0, queue.getSize());
-
+
Mail mail = createMail();
Mail mail2 = createMail();
long enqueueTime = System.currentTimeMillis();
queue.enQueue(mail, 3, TimeUnit.SECONDS);
queue.enQueue(mail2);
-
+
Thread.sleep(200);
-
+
assertEquals(2, queue.getSize());
-
-
+
// as we enqueued the mail with delay we should get mail2 first
MailQueueItem item = queue.deQueue();
checkMail(mail2, item.getMail());
@@ -167,8 +161,6 @@ public class JMSMailQueueTest extends Te
Thread.sleep(200);
-
-
assertEquals(1, queue.getSize());
MailQueueItem item2 = queue.deQueue();
long dequeueTime = System.currentTimeMillis() - enqueueTime;
@@ -180,23 +172,22 @@ public class JMSMailQueueTest extends Te
// should be empty
assertEquals(0, queue.getSize());
}
-
+
public void testFlush() throws MessagingException, InterruptedException, IOException {
// should be empty
assertEquals(0, queue.getSize());
-
+
final Mail mail = createMail();
-
long enqueueTime = System.currentTimeMillis();
queue.enQueue(mail, 30, TimeUnit.SECONDS);
-
+
Thread.sleep(200);
-
+
assertEquals(1, queue.getSize());
-
+
Thread flushThread = new Thread(new Runnable() {
-
+
public void run() {
try {
// wait for 2 seconds then flush the queue
@@ -205,7 +196,7 @@ public class JMSMailQueueTest extends Te
} catch (Exception e) {
throw new RuntimeException(e);
}
-
+
}
});
flushThread.start();
@@ -214,96 +205,90 @@ public class JMSMailQueueTest extends Te
MailQueueItem item = queue.deQueue();
checkMail(mail, item.getMail());
item.done(true);
-
+
long dequeueTime = System.currentTimeMillis() - enqueueTime;
-
assertEquals(0, queue.getSize());
-
+
// check if the flush kicked in
assertTrue(dequeueTime < 30 * 1000);
}
-
+
public void testRemoveWithRecipient() throws MessagingException, InterruptedException {
assertEquals(0, queue.getSize());
Mail mail = createMail();
mail.setRecipients(Arrays.asList(new MailAddress("remove@me1")));
- Mail mail2 =createMail();
+ Mail mail2 = createMail();
mail2.setRecipients(Arrays.asList(new MailAddress("remove@me2")));
-
queue.enQueue(mail);
queue.enQueue(mail2);
-
+
Thread.sleep(200);
-
+
assertEquals(2, queue.getSize());
- assertEquals(1,queue.remove(ManageableMailQueue.Type.Recipient, "remove@me1"));
-
+ assertEquals(1, queue.remove(ManageableMailQueue.Type.Recipient, "remove@me1"));
+
Thread.sleep(200);
assertEquals(1, queue.getSize());
-
- assertEquals(1,queue.remove(ManageableMailQueue.Type.Recipient, "remove@me2"));
- assertEquals(0, queue.getSize());
+ assertEquals(1, queue.remove(ManageableMailQueue.Type.Recipient, "remove@me2"));
+ assertEquals(0, queue.getSize());
}
+
public void testRemoveWithSender() throws MessagingException, InterruptedException {
assertEquals(0, queue.getSize());
MailImpl mail = createMail();
mail.setSender(new MailAddress("remove@me1"));
- MailImpl mail2 =createMail();
+ MailImpl mail2 = createMail();
mail2.setSender(new MailAddress("remove@me2"));
-
queue.enQueue(mail);
queue.enQueue(mail2);
-
+
Thread.sleep(200);
-
+
assertEquals(2, queue.getSize());
- assertEquals(1,queue.remove(ManageableMailQueue.Type.Sender, "remove@me1"));
-
+ assertEquals(1, queue.remove(ManageableMailQueue.Type.Sender, "remove@me1"));
+
Thread.sleep(200);
assertEquals(1, queue.getSize());
-
- assertEquals(1,queue.remove(ManageableMailQueue.Type.Sender, "remove@me2"));
- assertEquals(0, queue.getSize());
+ assertEquals(1, queue.remove(ManageableMailQueue.Type.Sender, "remove@me2"));
+ assertEquals(0, queue.getSize());
}
-
+
public void testRemoveWithName() throws MessagingException, InterruptedException {
assertEquals(0, queue.getSize());
MailImpl mail = createMail();
mail.setName("remove@me1");
- MailImpl mail2 =createMail();
+ MailImpl mail2 = createMail();
mail2.setName("remove@me2");
-
queue.enQueue(mail);
queue.enQueue(mail2);
-
+
Thread.sleep(200);
-
+
assertEquals(2, queue.getSize());
- assertEquals(1,queue.remove(ManageableMailQueue.Type.Name, "remove@me1"));
-
+ assertEquals(1, queue.remove(ManageableMailQueue.Type.Name, "remove@me1"));
+
Thread.sleep(200);
assertEquals(1, queue.getSize());
-
- assertEquals(1,queue.remove(ManageableMailQueue.Type.Name, "remove@me2"));
- assertEquals(0, queue.getSize());
+ assertEquals(1, queue.remove(ManageableMailQueue.Type.Name, "remove@me2"));
+ assertEquals(0, queue.getSize());
}
-
+
protected MailImpl createMail() throws MessagingException {
MailImpl mail = new MailImpl();
mail.setName("" + System.currentTimeMillis());
@@ -312,7 +297,7 @@ public class JMSMailQueueTest extends Te
mail.setLastUpdated(new Date());
mail.setRecipients(Arrays.asList(new MailAddress("test@test"), new MailAddress("test@test2")));
mail.setSender(new MailAddress("sender@senderdomain"));
-
+
MimeMessage message = new MimeMessage(Session.getInstance(new Properties()));
message.setText("test");
message.setHeader("testheader", "testvalie");
@@ -321,6 +306,7 @@ public class JMSMailQueueTest extends Te
return mail;
}
+
@SuppressWarnings("unchecked")
protected void checkMail(Mail enqueuedMail, Mail dequeuedMail) throws MessagingException, IOException {
assertEquals(enqueuedMail.getErrorMessage(), dequeuedMail.getErrorMessage());
@@ -331,46 +317,43 @@ public class JMSMailQueueTest extends Te
assertEquals(enqueuedMail.getLastUpdated(), dequeuedMail.getLastUpdated());
assertEquals(enqueuedMail.getRemoteHost(), dequeuedMail.getRemoteHost());
assertEquals(enqueuedMail.getSender(), dequeuedMail.getSender());
-
+
assertEquals(enqueuedMail.getRecipients().size(), dequeuedMail.getRecipients().size());
Iterator<String> attributes = enqueuedMail.getAttributeNames();
- while(attributes.hasNext()) {
+ while (attributes.hasNext()) {
String name = attributes.next();
assertNotNull(dequeuedMail.getAttribute(name));
}
-
MimeMessage enqueuedMsg = enqueuedMail.getMessage();
MimeMessage dequeuedMsg = dequeuedMail.getMessage();
Enumeration<String> enQueuedHeaders = enqueuedMsg.getAllHeaderLines();
Enumeration<String> deQueuedHeaders = dequeuedMsg.getAllHeaderLines();
- while(enQueuedHeaders.hasMoreElements()) {
+ while (enQueuedHeaders.hasMoreElements()) {
assertEquals(enQueuedHeaders.nextElement(), deQueuedHeaders.nextElement());
-
+
}
assertFalse(deQueuedHeaders.hasMoreElements());
-
- assertEquals(enqueuedMsg.getContent(), dequeuedMsg.getContent());
+ assertEquals(enqueuedMsg.getContent(), dequeuedMsg.getContent());
}
-
+
public void testPrioritySupport() throws InterruptedException, MessagingException, IOException {
// should be empty
assertEquals(0, queue.getSize());
-
+
Mail mail = createMail();
- Mail mail2 =createMail();
+ Mail mail2 = createMail();
mail2.setAttribute(JMSMailQueue.MAIL_PRIORITY, JMSMailQueue.HIGH_PRIORITY);
queue.enQueue(mail);
queue.enQueue(mail2);
-
+
Thread.sleep(200);
-
+
assertEquals(2, queue.getSize());
-
// we should get mail2 first as it has a higher priority set
assertEquals(2, queue.getSize());
MailQueueItem item2 = queue.deQueue();
@@ -379,33 +362,31 @@ public class JMSMailQueueTest extends Te
Thread.sleep(200);
-
-
assertEquals(1, queue.getSize());
MailQueueItem item3 = queue.deQueue();
checkMail(mail, item3.getMail());
item3.done(true);
-
+
Thread.sleep(200);
// should be empty
assertEquals(0, queue.getSize());
}
-
+
public void testBrowse() throws MessagingException, InterruptedException, IOException {
// should be empty
assertEquals(0, queue.getSize());
-
+
Mail mail = createMail();
- Mail mail2 =createMail();
+ Mail mail2 = createMail();
queue.enQueue(mail);
queue.enQueue(mail2);
-
+
Thread.sleep(200);
-
+
assertEquals(2, queue.getSize());
-
+
MailQueueIterator it = queue.browse();
checkMail(mail, it.next().getMail());
checkMail(mail2, it.next().getMail());
@@ -424,6 +405,5 @@ public class JMSMailQueueTest extends Te
assertFalse(it.hasNext());
it.close();
}
-
}
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/Base64.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/Base64.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/Base64.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/Base64.java Mon Apr 4 20:38:14 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.smtpserver;
import javax.mail.MessagingException;
@@ -29,35 +27,37 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-
/**
- * Performs simple Base64 encoding and decode suitable for authentication.
- * Note that this is not a general purpose codec.
- *
- * @version This is $Revision$
+ * Performs simple Base64 encoding and decode suitable for authentication. Note
+ * that this is not a general purpose codec.
*/
-
public class Base64 {
/**
* Decode base64 encoded String
*
- * @param b64string base64 String
+ * @param b64string
+ * base64 String
* @return reader the BufferedReader which holds the decoded base64 text
- * @throws MessagingException get thrown when an error was detected while trying to decode the String
+ * @throws MessagingException
+ * get thrown when an error was detected while trying to decode
+ * the String
*/
public static BufferedReader decode(String b64string) throws MessagingException {
- return new BufferedReader(new InputStreamReader(MimeUtility.decode(
- new ByteArrayInputStream(b64string.getBytes()), "base64")));
+ return new BufferedReader(new InputStreamReader(MimeUtility.decode(new ByteArrayInputStream(b64string.getBytes()), "base64")));
}
/**
* Decode base64 encoded String
*
- * @param b64string base64 Sting
+ * @param b64string
+ * base64 Sting
* @return returnString the String which holds the docoded base64 text
- * @throws MessagingException get thrown when an error was detected while trying to decode the String
- * @throws IOException get thrown when I/O error was detected
+ * @throws MessagingException
+ * get thrown when an error was detected while trying to decode
+ * the String
+ * @throws IOException
+ * get thrown when I/O error was detected
*/
public static String decodeAsString(String b64string) throws IOException, MessagingException {
if (b64string == null) {
@@ -73,10 +73,14 @@ public class Base64 {
/**
* Encode String to base64
*
- * @param plaintext the plaintext to encode
+ * @param plaintext
+ * the plaintext to encode
* @return out the ByteArrayOutputStream holding the encoded given text
- * @throws IOException get thrown when I/O error was detected
- * @throws MessagingException get thrown when an error was detected while trying to encode the String
+ * @throws IOException
+ * get thrown when I/O error was detected
+ * @throws MessagingException
+ * get thrown when an error was detected while trying to encode
+ * the String
*/
public static ByteArrayOutputStream encode(String plaintext) throws IOException, MessagingException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -84,27 +88,30 @@ public class Base64 {
ByteArrayOutputStream inStream = new ByteArrayOutputStream();
inStream.write(in, 0, in.length);
// pad
- if ((in.length % 3 ) == 1){
+ if ((in.length % 3) == 1) {
inStream.write(0);
inStream.write(0);
- } else if((in.length % 3 ) == 2){
+ } else if ((in.length % 3) == 2) {
inStream.write(0);
}
- inStream.writeTo( MimeUtility.encode(out, "base64") );
+ inStream.writeTo(MimeUtility.encode(out, "base64"));
return out;
}
/**
* Encode String to base64
*
- * @param plaintext the plaintext to decode
- * @return base64String the encoded String
- * @throws IOException get thrown when I/O error was detected
- * @throws MessagingException get thrown when an error was detected while trying to encode the String
+ * @param plaintext
+ * the plaintext to decode
+ * @return base64String the encoded String
+ * @throws IOException
+ * get thrown when I/O error was detected
+ * @throws MessagingException
+ * get thrown when an error was detected while trying to encode
+ * the String
*/
public static String encodeAsString(String plaintext) throws IOException, MessagingException {
- return encode(plaintext).toString();
+ return encode(plaintext).toString();
}
-
}
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java Mon Apr 4 20:38:14 2011
@@ -21,17 +21,18 @@ package org.apache.james.smtpserver;
import org.apache.james.smtpserver.netty.OioSMTPServer;
import org.apache.james.smtpserver.netty.SMTPServer;
-public class OioSMTPServerTest extends SMTPServerTest{
+public class OioSMTPServerTest extends SMTPServerTest {
@Override
protected SMTPServer createSMTPServer() {
return new OioSMTPServer();
}
-
+
/**
* TODO: This should not be needed
*/
public void testConnectionLimit() throws Exception {
- // TODO: Check why the connection limit is not working with IO implementation
+ // TODO: Check why the connection limit is not working with IO
+ // implementation
}
}
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java?rev=1088781&r1=1088780&r2=1088781&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java Mon Apr 4 20:38:14 2011
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.james.smtpserver;
import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
@@ -77,15 +76,15 @@ public class POP3BeforeSMTPHandlerTest e
assertFalse(mockedSession.isRelayingAllowed());
} catch (InterruptedException e) {
- //ignore
+ // ignore
}
}
-
+
public void testThrowExceptionOnIllegalExpireTime() {
boolean exception = false;
POP3BeforeSMTPHandler handler = new POP3BeforeSMTPHandler();
- setupMockedSMTPSession();
+ setupMockedSMTPSession();
try {
handler.setExpireTime("1 unit");
@@ -94,12 +93,12 @@ public class POP3BeforeSMTPHandlerTest e
}
assertTrue(exception);
}
-
+
public void testValidExpireTime() {
boolean exception = false;
POP3BeforeSMTPHandler handler = new POP3BeforeSMTPHandler();
- setupMockedSMTPSession();
+ setupMockedSMTPSession();
try {
handler.setExpireTime("1 hour");
@@ -108,5 +107,5 @@ public class POP3BeforeSMTPHandlerTest e
}
assertFalse(exception);
}
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org