Author: ieugen
Date: Mon Mar 12 01:00:03 2012
New Revision: 1299513
URL: http://svn.apache.org/viewvc?rev=1299513&view=rev
Log:
JAMES-1393
- updated tests to juni 4.x style
- added @Override and reformated code
Issue #JAMES-1393 - Upgrate all test suites to junit 4.10
Modified:
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Modified:
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1299513&r1=1299512&r2=1299513&view=diff
==============================================================================
---
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Mon Mar 12 01:00:03 2012
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.pop3server;
import java.io.ByteArrayInputStream;
@@ -25,11 +24,7 @@ import java.io.Reader;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-
import javax.mail.Flags;
-
-import junit.framework.TestCase;
-
import org.apache.commons.net.pop3.POP3Client;
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3Reply;
@@ -52,10 +47,14 @@ import org.apache.james.protocols.lib.Po
import org.apache.james.protocols.lib.mock.MockProtocolHandlerLoader;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.mock.MockUsersRepository;
+import org.junit.After;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class POP3ServerTest extends TestCase {
+public class POP3ServerTest {
private int m_pop3ListenerPort = PortUtil.getNonPrivilegedPort();
private POP3TestConfiguration m_testConfiguration;
@@ -64,148 +63,144 @@ public class POP3ServerTest extends Test
protected MockFileSystem fSystem;
protected MockProtocolHandlerLoader chain;
private StoreMailboxManager<Long> manager;
- private byte[] content = ("Return-path: [email protected]\r\n"+
- "Content-Transfer-Encoding: plain\r\n"+
- "Subject: test\r\n\r\n"+
- "Body Text POP3ServerTest.setupTestMails\r\n").getBytes();
-
- public POP3ServerTest() {
- super("AsyncPOP3ServerTest");
- }
-
+ private byte[] content = ("Return-path: [email protected]\r\n"
+ + "Content-Transfer-Encoding: plain\r\n"
+ + "Subject: test\r\n\r\n"
+ + "Body Text POP3ServerTest.setupTestMails\r\n").getBytes();
private POP3Server m_pop3Server;
protected POP3Server createPOP3Server() {
- return new POP3Server();
+ return new POP3Server();
}
protected void initPOP3Server(POP3TestConfiguration testConfiguration)
throws Exception {
- m_pop3Server.configure(testConfiguration);
- m_pop3Server.init();
+ m_pop3Server.configure(testConfiguration);
+ m_pop3Server.init();
}
protected void setUpPOP3Server() throws Exception {
- m_pop3Server = createPOP3Server();
- m_pop3Server.setFileSystem(fSystem);
- m_pop3Server.setProtocolHandlerLoader(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();
+ m_pop3Server = createPOP3Server();
+ m_pop3Server.setFileSystem(fSystem);
+ m_pop3Server.setProtocolHandlerLoader(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);
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ setUpServiceManager();
- setUpPOP3Server();
- m_testConfiguration = new POP3TestConfiguration(m_pop3ListenerPort);
+ setUpPOP3Server();
+ m_testConfiguration = new POP3TestConfiguration(m_pop3ListenerPort);
}
protected void finishSetUp(POP3TestConfiguration testConfiguration) throws
Exception {
- testConfiguration.init();
- initPOP3Server(testConfiguration);
-
+ testConfiguration.init();
+ initPOP3Server(testConfiguration);
}
protected void setUpServiceManager() throws Exception {
- chain = new MockProtocolHandlerLoader();
- chain.put("usersrepository", m_usersRepository);
+ chain = new MockProtocolHandlerLoader();
+ chain.put("usersrepository", m_usersRepository);
- InMemoryMailboxSessionMapperFactory factory = new
InMemoryMailboxSessionMapperFactory();
- MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
- GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
- manager = new StoreMailboxManager<Long>(factory, new Authenticator() {
-
- public boolean isAuthentic(String userid, CharSequence passwd) {
- try {
- return m_usersRepository.test(userid, passwd.toString());
- } catch (UsersRepositoryException e) {
-
- e.printStackTrace();
- return false;
- }
- }
- }, aclResolver, groupMembershipResolver);
- manager.init();
- chain.put("mailboxmanager", manager);
-
- fSystem = new MockFileSystem();
- chain.put("filesystem", fSystem);
+ InMemoryMailboxSessionMapperFactory factory = new
InMemoryMailboxSessionMapperFactory();
+ MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+ GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
+ manager = new StoreMailboxManager<Long>(factory, new Authenticator() {
+
+ @Override
+ public boolean isAuthentic(String userid, CharSequence passwd) {
+ try {
+ return m_usersRepository.test(userid, passwd.toString());
+ } catch (UsersRepositoryException e) {
+
+ e.printStackTrace();
+ return false;
+ }
+ }
+ }, aclResolver, groupMembershipResolver);
+ manager.init();
+ chain.put("mailboxmanager", manager);
+
+ fSystem = new MockFileSystem();
+ chain.put("filesystem", fSystem);
}
- protected void tearDown() throws Exception {
- try {
- if (m_pop3Protocol != null) {
- if (m_pop3Protocol.isConnected()) {
- m_pop3Protocol.sendCommand("quit");
- m_pop3Protocol.disconnect();
- }
- }
- } catch (Exception e){
- e.printStackTrace();
- }
+ @After
+ public void tearDown() throws Exception {
+ try {
+ if (m_pop3Protocol != null) {
+ if (m_pop3Protocol.isConnected()) {
+ m_pop3Protocol.sendCommand("quit");
+ m_pop3Protocol.disconnect();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
- chain.dispose();
-
- m_pop3Server.destroy();
-
- super.tearDown();
+ chain.dispose();
+ m_pop3Server.destroy();
}
+ @Test
public void testAuthenticationFail() throws Exception {
- finishSetUp(m_testConfiguration);
-
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
-
- m_usersRepository.addUser("known", "test2");
-
- m_pop3Protocol.login("known", "test");
- assertEquals(0, m_pop3Protocol.getState());
- assertTrue(m_pop3Protocol.getReplyString().startsWith("-ERR"));
+ finishSetUp(m_testConfiguration);
+
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+
+ m_usersRepository.addUser("known", "test2");
+
+ m_pop3Protocol.login("known", "test");
+ assertEquals(0, m_pop3Protocol.getState());
+ assertTrue(m_pop3Protocol.getReplyString().startsWith("-ERR"));
}
+ @Test
public void testUnknownUser() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- m_pop3Protocol.login("unknown", "test");
- assertEquals(0, m_pop3Protocol.getState());
- assertTrue(m_pop3Protocol.getReplyString().startsWith("-ERR"));
+ m_pop3Protocol.login("unknown", "test");
+ assertEquals(0, m_pop3Protocol.getState());
+ assertTrue(m_pop3Protocol.getReplyString().startsWith("-ERR"));
}
+ @Test
public void testKnownUserEmptyInbox() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- m_usersRepository.addUser("foo", "bar");
+ m_usersRepository.addUser("foo", "bar");
- // not authenticated
- POP3MessageInfo[] entries = m_pop3Protocol.listMessages();
- assertNull(entries);
+ // 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());
+ 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());
+ entries = m_pop3Protocol.listMessages();
+ assertEquals(1, m_pop3Protocol.getState());
- assertNotNull(entries);
- assertEquals(entries.length, 0);
-
- POP3MessageInfo p3i = m_pop3Protocol.listMessage(1);
- assertEquals(1, m_pop3Protocol.getState());
- assertNull(p3i);
+ assertNotNull(entries);
+ assertEquals(entries.length, 0);
+ POP3MessageInfo p3i = m_pop3Protocol.listMessage(1);
+ assertEquals(1, m_pop3Protocol.getState());
+ assertNull(p3i);
}
// TODO: This currently fails with Async implementation because
@@ -227,323 +222,331 @@ public class POP3ServerTest extends Test
* m_pop3Protocol.login("foo", pass); assertEquals(1,
* m_pop3Protocol.getState()); ContainerUtil.dispose(mockMailRepository); }
*/
-
+ @Test
public void testUnknownCommand() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ 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");
+ 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");
}
+ @Test
public void testUidlCommand() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_usersRepository.addUser("foo", "bar");
+ m_usersRepository.addUser("foo", "bar");
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- m_pop3Protocol.sendCommand("uidl");
- assertEquals(0, m_pop3Protocol.getState());
+ m_pop3Protocol.sendCommand("uidl");
+ assertEquals(0, m_pop3Protocol.getState());
- m_pop3Protocol.login("foo", "bar");
+ m_pop3Protocol.login("foo", "bar");
- POP3MessageInfo[] list = m_pop3Protocol.listUniqueIdentifiers();
- assertEquals("Found unexpected messages", 0, list.length);
+ POP3MessageInfo[] list = m_pop3Protocol.listUniqueIdentifiers();
+ assertEquals("Found unexpected messages", 0, list.length);
- m_pop3Protocol.disconnect();
- MailboxPath mailboxPath = new
MailboxPath(MailboxConstants.USER_NAMESPACE, "foo", "INBOX");
- MailboxSession session = manager.login("foo", "bar",
LoggerFactory.getLogger("Test"));
- if (manager.mailboxExists(mailboxPath, session) == false) {
- manager.createMailbox(mailboxPath, session);
- }
- setupTestMails(session, manager.getMailbox(mailboxPath, session));
+ m_pop3Protocol.disconnect();
+ MailboxPath mailboxPath = new
MailboxPath(MailboxConstants.USER_NAMESPACE, "foo", "INBOX");
+ MailboxSession session = manager.login("foo", "bar",
LoggerFactory.getLogger("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);
- m_pop3Protocol.login("foo", "bar");
+ 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);
+ list = m_pop3Protocol.listUniqueIdentifiers();
+ assertEquals("Expected 2 messages, found: " + list.length, 2,
list.length);
- POP3MessageInfo p3i = m_pop3Protocol.listUniqueIdentifier(1);
- assertNotNull(p3i);
+ POP3MessageInfo p3i = m_pop3Protocol.listUniqueIdentifier(1);
+ assertNotNull(p3i);
- manager.deleteMailbox(mailboxPath, session);
+ manager.deleteMailbox(mailboxPath, session);
}
+ @Test
public void testMiscCommandsWithWithoutAuth() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_usersRepository.addUser("foo", "bar");
+ m_usersRepository.addUser("foo", "bar");
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ 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));
+ m_pop3Protocol.sendCommand("noop");
+ assertEquals(0, m_pop3Protocol.getState());
+ 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));
+ m_pop3Protocol.sendCommand("stat");
+ assertEquals(0, m_pop3Protocol.getState());
+ 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));
+ m_pop3Protocol.sendCommand("pass");
+ assertEquals(0, m_pop3Protocol.getState());
+ 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));
+ m_pop3Protocol.sendCommand("auth");
+ assertEquals(0, m_pop3Protocol.getState());
+ 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));
+ m_pop3Protocol.sendCommand("rset");
+ assertEquals(0, m_pop3Protocol.getState());
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
- m_pop3Protocol.login("foo", "bar");
+ m_pop3Protocol.login("foo", "bar");
- POP3MessageInfo[] list = m_pop3Protocol.listUniqueIdentifiers();
- assertEquals("Found unexpected messages", 0, list.length);
+ POP3MessageInfo[] list = m_pop3Protocol.listUniqueIdentifiers();
+ assertEquals("Found unexpected messages", 0, list.length);
- m_pop3Protocol.sendCommand("noop");
- assertEquals(1, m_pop3Protocol.getState());
+ m_pop3Protocol.sendCommand("noop");
+ assertEquals(1, m_pop3Protocol.getState());
- m_pop3Protocol.sendCommand("pass");
- assertEquals(1, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
+ m_pop3Protocol.sendCommand("pass");
+ assertEquals(1, m_pop3Protocol.getState());
+ 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));
+ m_pop3Protocol.sendCommand("auth");
+ assertEquals(1, m_pop3Protocol.getState());
+ 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));
+ m_pop3Protocol.sendCommand("user");
+ assertEquals(1, m_pop3Protocol.getState());
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
- m_pop3Protocol.sendCommand("rset");
- assertEquals(1, m_pop3Protocol.getState());
+ m_pop3Protocol.sendCommand("rset");
+ assertEquals(1, m_pop3Protocol.getState());
}
+ @Test
public void testKnownUserInboxWithMessages() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- m_usersRepository.addUser("foo2", "bar2");
+ m_usersRepository.addUser("foo2", "bar2");
- MailboxPath mailboxPath = new
MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
- MailboxSession session = manager.login("foo2", "bar2",
LoggerFactory.getLogger("Test"));
+ 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);
- }
+ if (manager.mailboxExists(mailboxPath, session) == false) {
+ manager.createMailbox(mailboxPath, session);
+ }
- setupTestMails(session, manager.getMailbox(mailboxPath, session));
+ setupTestMails(session, manager.getMailbox(mailboxPath, session));
- m_pop3Protocol.sendCommand("retr", "1");
- assertEquals(0, m_pop3Protocol.getState());
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
+ m_pop3Protocol.sendCommand("retr", "1");
+ assertEquals(0, m_pop3Protocol.getState());
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
- m_pop3Protocol.login("foo2", "bar2");
- assertEquals(1, m_pop3Protocol.getState());
+ m_pop3Protocol.login("foo2", "bar2");
+ assertEquals(1, m_pop3Protocol.getState());
- POP3MessageInfo[] entries = m_pop3Protocol.listMessages();
+ POP3MessageInfo[] entries = m_pop3Protocol.listMessages();
- assertNotNull(entries);
- assertEquals(2, entries.length);
- assertEquals(1, m_pop3Protocol.getState());
+ assertNotNull(entries);
+ assertEquals(2, entries.length);
+ assertEquals(1, m_pop3Protocol.getState());
- Reader r = m_pop3Protocol.retrieveMessageTop(entries[0].number, 0);
+ Reader r = m_pop3Protocol.retrieveMessageTop(entries[0].number, 0);
- assertNotNull(r);
+ assertNotNull(r);
- r.close();
+ r.close();
- Reader r2 = m_pop3Protocol.retrieveMessage(entries[0].number);
- assertNotNull(r2);
- r2.close();
+ Reader r2 = m_pop3Protocol.retrieveMessage(entries[0].number);
+ assertNotNull(r2);
+ r2.close();
- // existing message
- boolean deleted = m_pop3Protocol.deleteMessage(entries[0].number);
- assertTrue(deleted);
+ // existing message
+ boolean deleted = m_pop3Protocol.deleteMessage(entries[0].number);
+ assertTrue(deleted);
- // already deleted message
- deleted = m_pop3Protocol.deleteMessage(entries[0].number);
+ // already deleted message
+ deleted = m_pop3Protocol.deleteMessage(entries[0].number);
- // TODO: Understand why this fails...
- assertFalse(deleted);
+ // TODO: Understand why this fails...
+ assertFalse(deleted);
- // unexisting message
- deleted = m_pop3Protocol.deleteMessage(10);
- assertFalse(deleted);
+ // unexisting message
+ deleted = m_pop3Protocol.deleteMessage(10);
+ assertFalse(deleted);
- m_pop3Protocol.logout();
- //m_pop3Protocol.disconnect();
+ m_pop3Protocol.logout();
+ //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());
+ m_pop3Protocol.login("foo2", "bar2");
+ assertEquals(1, m_pop3Protocol.getState());
- entries = null;
+ entries = null;
- POP3MessageInfo stats = m_pop3Protocol.status();
- assertEquals(1, stats.number);
- assertEquals(5, stats.size);
+ POP3MessageInfo stats = m_pop3Protocol.status();
+ assertEquals(1, stats.number);
+ assertEquals(5, stats.size);
- entries = m_pop3Protocol.listMessages();
+ entries = m_pop3Protocol.listMessages();
- assertNotNull(entries);
- assertEquals(1, entries.length);
- assertEquals(1, m_pop3Protocol.getState());
+ assertNotNull(entries);
+ assertEquals(1, entries.length);
+ assertEquals(1, m_pop3Protocol.getState());
- // top without arguments
- m_pop3Protocol.sendCommand("top");
- assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
+ // top without arguments
+ m_pop3Protocol.sendCommand("top");
+ assertEquals("-ERR", m_pop3Protocol.getReplyString().substring(0, 4));
- Reader r3 = m_pop3Protocol.retrieveMessageTop(entries[0].number, 0);
- assertNotNull(r3);
- r3.close();
- manager.deleteMailbox(mailboxPath, session);
+ Reader r3 = m_pop3Protocol.retrieveMessageTop(entries[0].number, 0);
+ assertNotNull(r3);
+ r3.close();
+ manager.deleteMailbox(mailboxPath, session);
}
private void setupTestMails(MailboxSession session, MessageManager
mailbox) throws MailboxException {
- mailbox.appendMessage(new ByteArrayInputStream(content), new Date(),
session, true, new Flags());
- byte[] content2 = ("EMPTY").getBytes();
- mailbox.appendMessage(new ByteArrayInputStream(content2), new Date(),
session, true, new Flags());
+ mailbox.appendMessage(new ByteArrayInputStream(content), new Date(),
session, true, new Flags());
+ byte[] content2 = ("EMPTY").getBytes();
+ mailbox.appendMessage(new ByteArrayInputStream(content2), new Date(),
session, true, new Flags());
}
// Test for JAMES-1202
// Which shows that UIDL,STAT and LIST all show the same message numbers
+ @Test
public void testStatUidlList() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- m_usersRepository.addUser("foo2", "bar2");
+ m_usersRepository.addUser("foo2", "bar2");
- MailboxPath mailboxPath = new
MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
- MailboxSession session = manager.login("foo2", "bar2",
LoggerFactory.getLogger("Test"));
+ 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);
- }
+ 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());
- }
+ 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());
+ }
- m_pop3Protocol.login("foo2", "bar2");
- assertEquals(1, m_pop3Protocol.getState());
+ m_pop3Protocol.login("foo2", "bar2");
+ assertEquals(1, m_pop3Protocol.getState());
- POP3MessageInfo[] listEntries = m_pop3Protocol.listMessages();
- POP3MessageInfo[] uidlEntries = m_pop3Protocol.listUniqueIdentifiers();
- POP3MessageInfo statInfo = m_pop3Protocol.status();
- assertEquals(msgCount, listEntries.length);
- assertEquals(msgCount, uidlEntries.length);
- assertEquals(msgCount, statInfo.number);
+ POP3MessageInfo[] listEntries = m_pop3Protocol.listMessages();
+ POP3MessageInfo[] uidlEntries = m_pop3Protocol.listUniqueIdentifiers();
+ POP3MessageInfo statInfo = m_pop3Protocol.status();
+ assertEquals(msgCount, listEntries.length);
+ assertEquals(msgCount, uidlEntries.length);
+ assertEquals(msgCount, statInfo.number);
- m_pop3Protocol.sendCommand("quit");
- m_pop3Protocol.disconnect();
+ 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());
+ m_pop3Protocol.login("foo2", "bar2");
+ assertEquals(1, m_pop3Protocol.getState());
- manager.deleteMailbox(mailboxPath, session);
+ 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
+ @Test
public void testStatUidlListTwoConnections() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- m_usersRepository.addUser("foo2", "bar2");
+ 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());
- }
-
- m_pop3Protocol.login("foo2", "bar2");
- assertEquals(1, m_pop3Protocol.getState());
-
- POP3MessageInfo[] listEntries = m_pop3Protocol.listMessages();
- POP3MessageInfo[] uidlEntries = m_pop3Protocol.listUniqueIdentifiers();
- POP3MessageInfo statInfo = m_pop3Protocol.status();
- assertEquals(msgCount, listEntries.length);
- assertEquals(msgCount, uidlEntries.length);
- assertEquals(msgCount, statInfo.number);
-
- POP3Client m_pop3Protocol2 = new POP3Client();
- m_pop3Protocol2.connect("127.0.0.1", m_pop3ListenerPort);
- m_pop3Protocol2.login("foo2", "bar2");
- assertEquals(1, m_pop3Protocol2.getState());
-
- POP3MessageInfo[] listEntries2 = m_pop3Protocol2.listMessages();
- POP3MessageInfo[] uidlEntries2 =
m_pop3Protocol2.listUniqueIdentifiers();
- POP3MessageInfo statInfo2 = m_pop3Protocol2.status();
- assertEquals(msgCount, listEntries2.length);
- assertEquals(msgCount, uidlEntries2.length);
- assertEquals(msgCount, statInfo2.number);
-
- m_pop3Protocol.deleteMessage(1);
- listEntries = m_pop3Protocol.listMessages();
- uidlEntries = m_pop3Protocol.listUniqueIdentifiers();
- statInfo = m_pop3Protocol.status();
- 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
- listEntries2 = m_pop3Protocol2.listMessages();
- uidlEntries2 = m_pop3Protocol2.listUniqueIdentifiers();
- statInfo2 = m_pop3Protocol2.status();
- assertEquals(msgCount, listEntries2.length);
- assertEquals(msgCount, uidlEntries2.length);
- assertEquals(msgCount, statInfo2.number);
-
- 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
- listEntries2 = m_pop3Protocol2.listMessages();
- uidlEntries2 = m_pop3Protocol2.listUniqueIdentifiers();
- statInfo2 = m_pop3Protocol2.status();
- assertEquals(msgCount, listEntries2.length);
- assertEquals(msgCount, uidlEntries2.length);
- assertEquals(msgCount, statInfo2.number);
-
- // This both should error and so return null
- assertNull(m_pop3Protocol2.retrieveMessageTop(1, 100));
- assertNull(m_pop3Protocol2.retrieveMessage(1));
+ 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());
+ }
+
+ m_pop3Protocol.login("foo2", "bar2");
+ assertEquals(1, m_pop3Protocol.getState());
+
+ POP3MessageInfo[] listEntries = m_pop3Protocol.listMessages();
+ POP3MessageInfo[] uidlEntries = m_pop3Protocol.listUniqueIdentifiers();
+ POP3MessageInfo statInfo = m_pop3Protocol.status();
+ assertEquals(msgCount, listEntries.length);
+ assertEquals(msgCount, uidlEntries.length);
+ assertEquals(msgCount, statInfo.number);
+
+ POP3Client m_pop3Protocol2 = new POP3Client();
+ m_pop3Protocol2.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol2.login("foo2", "bar2");
+ assertEquals(1, m_pop3Protocol2.getState());
+
+ POP3MessageInfo[] listEntries2 = m_pop3Protocol2.listMessages();
+ POP3MessageInfo[] uidlEntries2 =
m_pop3Protocol2.listUniqueIdentifiers();
+ POP3MessageInfo statInfo2 = m_pop3Protocol2.status();
+ assertEquals(msgCount, listEntries2.length);
+ assertEquals(msgCount, uidlEntries2.length);
+ assertEquals(msgCount, statInfo2.number);
+
+ m_pop3Protocol.deleteMessage(1);
+ listEntries = m_pop3Protocol.listMessages();
+ uidlEntries = m_pop3Protocol.listUniqueIdentifiers();
+ statInfo = m_pop3Protocol.status();
+ 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
+ listEntries2 = m_pop3Protocol2.listMessages();
+ uidlEntries2 = m_pop3Protocol2.listUniqueIdentifiers();
+ statInfo2 = m_pop3Protocol2.status();
+ assertEquals(msgCount, listEntries2.length);
+ assertEquals(msgCount, uidlEntries2.length);
+ assertEquals(msgCount, statInfo2.number);
+
+ 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
+ listEntries2 = m_pop3Protocol2.listMessages();
+ uidlEntries2 = m_pop3Protocol2.listUniqueIdentifiers();
+ statInfo2 = m_pop3Protocol2.status();
+ assertEquals(msgCount, listEntries2.length);
+ assertEquals(msgCount, uidlEntries2.length);
+ assertEquals(msgCount, statInfo2.number);
+
+ // This both should error and so return null
+ assertNull(m_pop3Protocol2.retrieveMessageTop(1, 100));
+ assertNull(m_pop3Protocol2.retrieveMessage(1));
- m_pop3Protocol2.sendCommand("quit");
- m_pop3Protocol2.disconnect();
+ m_pop3Protocol2.sendCommand("quit");
+ m_pop3Protocol2.disconnect();
- manager.deleteMailbox(mailboxPath, session);
+ manager.deleteMailbox(mailboxPath, session);
}
/*
@@ -581,47 +584,48 @@ public class POP3ServerTest extends Test
* (pop3Protocol2 != null) { pop3Protocol2.sendCommand("quit");
* pop3Protocol2.disconnect(); } } }
*/
-
+ @Test
public void testIpStored() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- String pass = "password";
- m_usersRepository.addUser("foo", pass);
+ String pass = "password";
+ m_usersRepository.addUser("foo", pass);
- m_pop3Protocol.login("foo", pass);
- assertEquals(1, m_pop3Protocol.getState());
- assertTrue(POP3BeforeSMTPHelper.isAuthorized("127.0.0.1"));
+ m_pop3Protocol.login("foo", pass);
+ assertEquals(1, m_pop3Protocol.getState());
+ assertTrue(POP3BeforeSMTPHelper.isAuthorized("127.0.0.1"));
}
+ @Test
public void testCapa() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- String pass = "password";
- m_usersRepository.addUser("foo", pass);
+ String pass = "password";
+ m_usersRepository.addUser("foo", pass);
- assertEquals(POP3Reply.OK, m_pop3Protocol.sendCommand("CAPA"));
+ assertEquals(POP3Reply.OK, m_pop3Protocol.sendCommand("CAPA"));
- m_pop3Protocol.getAdditionalReply();
- m_pop3Protocol.getReplyString();
- List<String> replies = Arrays.asList(m_pop3Protocol.getReplyStrings());
+ m_pop3Protocol.getAdditionalReply();
+ m_pop3Protocol.getReplyString();
+ List<String> replies = Arrays.asList(m_pop3Protocol.getReplyStrings());
- assertTrue("contains USER", replies.contains("USER"));
+ assertTrue("contains USER", replies.contains("USER"));
- m_pop3Protocol.login("foo", pass);
- assertEquals(POP3Reply.OK, m_pop3Protocol.sendCommand("CAPA"));
+ 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"));
+ 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"));
}
@@ -662,60 +666,60 @@ public class POP3ServerTest extends Test
*
* ContainerUtil.dispose(mockMailRepository); }
*/
-
// See JAMES-1136
+ @Test
public void testDeadlockOnRetr() throws Exception {
- finishSetUp(m_testConfiguration);
+ finishSetUp(m_testConfiguration);
- m_pop3Protocol = new POP3Client();
- m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
+ m_pop3Protocol = new POP3Client();
+ m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
- m_usersRepository.addUser("foo6", "bar6");
- MailboxSession session = manager.login("foo6", "bar6",
LoggerFactory.getLogger("Test"));
+ m_usersRepository.addUser("foo6", "bar6");
+ MailboxSession session = manager.login("foo6", "bar6",
LoggerFactory.getLogger("Test"));
- MailboxPath mailboxPath = MailboxPath.inbox(session);
+ MailboxPath mailboxPath = MailboxPath.inbox(session);
- manager.startProcessingRequest(session);
- if (manager.mailboxExists(mailboxPath, session) == false) {
- manager.createMailbox(mailboxPath, session);
- }
+ manager.startProcessingRequest(session);
+ if (manager.mailboxExists(mailboxPath, session) == false) {
+ manager.createMailbox(mailboxPath, session);
+ }
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- out.write(content);
+ 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++) {
+ 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) {
- c = 0;
- bigMail[++i] = '\r';
- bigMail[++i] = '\n';
- }
- }
- out.write(bigMail);
- bigMail = null;
+ bigMail[i] = 'X';
+ c++;
+ if (c == 1000 || i + 3 == bigMail.length) {
+ c = 0;
+ bigMail[++i] = '\r';
+ bigMail[++i] = '\n';
+ }
+ }
+ out.write(bigMail);
+ bigMail = null;
- manager.getMailbox(mailboxPath, session).appendMessage(new
ByteArrayInputStream(out.toByteArray()), new Date(), session, false, new
Flags());
- manager.startProcessingRequest(session);
+ 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());
+ m_pop3Protocol.login("foo6", "bar6");
+ assertEquals(1, m_pop3Protocol.getState());
- POP3MessageInfo[] entries = m_pop3Protocol.listMessages();
+ POP3MessageInfo[] entries = m_pop3Protocol.listMessages();
- assertNotNull(entries);
- assertEquals(1, entries.length);
- assertEquals(1, m_pop3Protocol.getState());
+ assertNotNull(entries);
+ assertEquals(1, entries.length);
+ assertEquals(1, m_pop3Protocol.getState());
- Reader r = m_pop3Protocol.retrieveMessage(entries[0].number);
+ Reader r = m_pop3Protocol.retrieveMessage(entries[0].number);
- assertNotNull(r);
- r.close();
- manager.deleteMailbox(mailboxPath, session);
+ assertNotNull(r);
+ r.close();
+ manager.deleteMailbox(mailboxPath, session);
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
