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 ma...@apache.org on 2010/02/12 00:32:14 UTC
svn commit: r909175 - in /james/hupa/trunk/server/src:
main/java/org/apache/hupa/server/handler/
main/java/org/apache/hupa/server/mock/ test/java/org/apache/hupa/server/
test/java/org/apache/hupa/server/guice/
test/java/org/apache/hupa/server/handler/ ...
Author: manolo
Date: Thu Feb 11 23:32:10 2010
New Revision: 909175
URL: http://svn.apache.org/viewvc?rev=909175&view=rev
Log:
More test re-factoring to use HupaGuiceTestCase
Added:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java
- copied, changed from r908044, james/hupa/trunk/server/src/test/java/org/apache/hupa/server/DemoModeTest.java
Removed:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/DemoModeTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceTestModule.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/IdleHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java Thu Feb 11 23:32:10 2010
@@ -34,6 +34,7 @@
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
+import java.util.ArrayList;
import java.util.Enumeration;
import javax.servlet.http.HttpSession;
@@ -117,8 +118,12 @@
public static void cleanSessionAttributes(HttpSession session) {
@SuppressWarnings("unchecked")
Enumeration en = session.getAttributeNames();
+ ArrayList<String> toRemove = new ArrayList<String>();
while (en.hasMoreElements()) {
- session.removeAttribute(en.nextElement().toString());
+ toRemove.add(en.nextElement().toString());
+ }
+ for (String attr: toRemove) {
+ session.removeAttribute(attr);
}
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java Thu Feb 11 23:32:10 2010
@@ -143,10 +143,7 @@
}
public void clear() {
- validLogins.clear();
- validServers.clear();
folders.clear();
- connected = false;
}
@Override
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java Thu Feb 11 23:32:10 2010
@@ -34,14 +34,18 @@
import org.apache.hupa.server.handler.ContactsHandler;
import org.apache.hupa.server.handler.CreateFolderHandler;
import org.apache.hupa.server.handler.DeleteFolderHandler;
+import org.apache.hupa.server.handler.DeleteMessageByUidHandler;
import org.apache.hupa.server.handler.FetchFoldersHandler;
import org.apache.hupa.server.handler.FetchMessagesHandler;
import org.apache.hupa.server.handler.ForwardMessageHandler;
import org.apache.hupa.server.handler.GetMessageDetailsHandler;
+import org.apache.hupa.server.handler.IdleHandler;
import org.apache.hupa.server.handler.LoginUserHandler;
+import org.apache.hupa.server.handler.LogoutUserHandler;
import org.apache.hupa.server.handler.ReplyMessageHandler;
import org.apache.hupa.server.handler.SendMessageHandler;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
+import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.SendMessage;
@@ -54,10 +58,10 @@
protected HttpSession httpSession = injector.getInstance(HttpSession.class);
- protected AbstractSendMessageHandler<SendMessage> abstSendMsgHndl = injector.getInstance(SendMessageHandler.class);
-
protected ContactsHandler contactsHandler = injector.getInstance(ContactsHandler.class);
+ protected IdleHandler idleHandler = injector.getInstance(IdleHandler.class);
+
protected CreateFolderHandler createFHandler = injector.getInstance(CreateFolderHandler.class);
protected DeleteFolderHandler deleteFHandler = injector.getInstance(DeleteFolderHandler.class);
@@ -66,6 +70,10 @@
protected FetchMessagesHandler fetchMessagesHandler = injector.getInstance(FetchMessagesHandler.class);
+ protected DeleteMessageByUidHandler deleteMByUid = injector.getInstance(DeleteMessageByUidHandler.class);
+
+ protected AbstractSendMessageHandler<SendMessage> abstSendMsgHndl = injector.getInstance(SendMessageHandler.class);
+
protected ForwardMessageHandler fwdMsgHndl = injector.getInstance(ForwardMessageHandler.class);
protected GetMessageDetailsHandler getDetailsMsgHndl = injector.getInstance(GetMessageDetailsHandler.class);
@@ -74,13 +82,15 @@
protected LoginUserHandler loginUser = injector.getInstance(LoginUserHandler.class);
+ protected LogoutUserHandler logoutUser = injector.getInstance(LogoutUserHandler.class);
+
protected ReplyMessageHandler reMsgHndl = injector.getInstance(ReplyMessageHandler.class);
protected Session session = injector.getInstance(Session.class);
protected IMAPStoreCache storeCache = injector.getInstance(IMAPStoreCache.class);
- protected User testUser;
+ protected User testUser;
protected UserPreferencesStorage userPreferences = injector.getInstance(UserPreferencesStorage.class);
@@ -90,7 +100,7 @@
try {
testUser = injector.getInstance(User.class);
store = storeCache.get(testUser);
- httpSession.setAttribute("user", testUser);
+ httpSession.setAttribute(SConsts.USER_SESS_ATTR, testUser);
} catch (Exception e) {
}
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceTestModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceTestModule.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceTestModule.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceTestModule.java Thu Feb 11 23:32:10 2010
@@ -35,11 +35,14 @@
import org.apache.hupa.server.handler.ContactsHandler;
import org.apache.hupa.server.handler.CreateFolderHandler;
import org.apache.hupa.server.handler.DeleteFolderHandler;
+import org.apache.hupa.server.handler.DeleteMessageByUidHandler;
import org.apache.hupa.server.handler.FetchFoldersHandler;
import org.apache.hupa.server.handler.FetchMessagesHandler;
import org.apache.hupa.server.handler.ForwardMessageHandler;
import org.apache.hupa.server.handler.GetMessageDetailsHandler;
+import org.apache.hupa.server.handler.IdleHandler;
import org.apache.hupa.server.handler.LoginUserHandler;
+import org.apache.hupa.server.handler.LogoutUserHandler;
import org.apache.hupa.server.handler.ReplyMessageHandler;
import org.apache.hupa.server.handler.SendMessageHandler;
import org.apache.hupa.server.mock.MockHttpSession;
@@ -88,10 +91,14 @@
bind(IMAPStoreCache.class).to(imapStoreCacheClass).in(Singleton.class);
bind(LoginUserHandler.class);
+ bind(LogoutUserHandler.class);
+ bind(IdleHandler.class);
+
bind(FetchFoldersHandler.class);
bind(CreateFolderHandler.class);
bind(DeleteFolderHandler.class);
bind(FetchMessagesHandler.class);
+ bind(DeleteMessageByUidHandler.class);
bind(GetMessageDetailsHandler.class);
bind(AbstractSendMessageHandler.class).to(SendMessageHandler.class);
bind(SendMessageHandler.class);
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java Thu Feb 11 23:32:10 2010
@@ -16,79 +16,58 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
-
package org.apache.hupa.server.handler;
-import javax.mail.Folder;
-import javax.mail.MessagingException;
-
import net.customware.gwt.dispatch.shared.ActionException;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.mock.MockIMAPStore;
+import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.exception.InvalidSessionException;
import org.apache.hupa.shared.rpc.CreateFolder;
-public class CreateFolderHandlerTest extends AbstractHandlerTest{
+import javax.mail.Folder;
+import javax.mail.MessagingException;
+
+public class CreateFolderHandlerTest extends HupaGuiceTestCase {
public void testCreate() throws MessagingException {
- User user = createUser();
-
- httpSession.setAttribute("user", user);
- storeCache.addValidUser(user.getName(),user.getPassword());
IMAPFolder folder = createFolder();
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
Folder f1 = store.getFolder(folder.getFullName());
assertFalse("not exists",f1.exists());
- CreateFolderHandler handler = new CreateFolderHandler(storeCache, logger,httpSessionProvider);
try {
- handler.execute(new CreateFolder(folder), null);
+ createFHandler.execute(new CreateFolder(folder), null);
Folder f = store.getFolder(folder.getFullName());
assertTrue("exists",f.exists());
-
} catch (ActionException e) {
e.printStackTrace();
fail();
}
-
}
-
public void testDuplicateFolder() throws MessagingException {
- User user = createUser();
-
- httpSession.setAttribute("user", user);
- storeCache.addValidUser(user.getName(),user.getPassword());
IMAPFolder folder = createFolder();
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
Folder f1 = store.getFolder(folder.getFullName());
-
f1.create(Folder.HOLDS_FOLDERS);
-
- CreateFolderHandler handler = new CreateFolderHandler(storeCache, logger, httpSessionProvider);
try {
- handler.execute(new CreateFolder(folder), null);
+ createFHandler.execute(new CreateFolder(folder), null);
fail("Folder already exists");
} catch (ActionException e) {
- // folder already exists
- // e.printStackTrace();
}
-
}
public void testInvalidSessionId() {
+ httpSession.removeAttribute(SConsts.USER_SESS_ATTR);
IMAPFolder folder = createFolder();
- CreateFolderHandler handler = new CreateFolderHandler(storeCache, logger, httpSessionProvider);
try {
- handler.execute(new CreateFolder(folder), null);
+ createFHandler.execute(new CreateFolder(folder), null);
fail("Invalid session");
-
} catch (InvalidSessionException e) {
- // e.printStackTrace();
} catch (ActionException e) {
e.printStackTrace();
fail();
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java Thu Feb 11 23:32:10 2010
@@ -16,72 +16,54 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.hupa.server.handler;
-import javax.mail.Folder;
-import javax.mail.MessagingException;
-
import net.customware.gwt.dispatch.shared.ActionException;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.mock.MockIMAPStore;
+import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.exception.InvalidSessionException;
import org.apache.hupa.shared.rpc.DeleteFolder;
-public class DeleteFolderHandlerTest extends AbstractHandlerTest{
+import javax.mail.Folder;
+import javax.mail.MessagingException;
- public void testDelete() throws MessagingException {
- User user = createUser();
+public class DeleteFolderHandlerTest extends HupaGuiceTestCase {
- httpSession.setAttribute("user", user);
- storeCache.addValidUser(user.getName(),user.getPassword());
+ public void testDelete() throws MessagingException {
IMAPFolder folder = createFolder();
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
Folder f1 = store.getFolder(folder.getFullName());
f1.create(Folder.HOLDS_FOLDERS);
-
- DeleteFolderHandler handler = new DeleteFolderHandler(storeCache, logger, httpSessionProvider);
-
try {
- handler.execute(new DeleteFolder(folder), null);
+ deleteFHandler.execute(new DeleteFolder(folder), null);
Folder f = store.getFolder(folder.getFullName());
assertFalse("not exists",f.exists());
-
} catch (ActionException e) {
e.printStackTrace();
fail();
}
-
}
public void testDeleteNonExistFolder() throws MessagingException {
- User user = createUser();
-
- httpSession.setAttribute("user", user);
- storeCache.addValidUser(user.getName(),user.getPassword());
IMAPFolder folder = createFolder();
- DeleteFolderHandler handler = new DeleteFolderHandler(storeCache, logger, httpSessionProvider);
-
try {
- handler.execute(new DeleteFolder(folder), null);
+ deleteFHandler.execute(new DeleteFolder(folder), null);
fail("Folder should not exist");
} catch (ActionException e) {
- //e.printStackTrace();
}
}
public void testInvalidSessionId() {
+ httpSession.removeAttribute(SConsts.USER_SESS_ATTR);
IMAPFolder folder = createFolder();
- DeleteFolderHandler handler = new DeleteFolderHandler(storeCache, logger, httpSessionProvider);
try {
- handler.execute(new DeleteFolder(folder), null);
+ deleteFHandler.execute(new DeleteFolder(folder), null);
fail("Invalid session");
-
} catch (InvalidSessionException e) {
- //e.printStackTrace();
} catch (ActionException e) {
e.printStackTrace();
fail();
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java Thu Feb 11 23:32:10 2010
@@ -19,71 +19,55 @@
package org.apache.hupa.server.handler;
-import java.util.ArrayList;
-import java.util.Properties;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
-
import net.customware.gwt.dispatch.shared.ActionException;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
-public class DeleteMessageByUidHandlerTest extends AbstractHandlerTest{
+import java.util.ArrayList;
+
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
+public class DeleteMessageByUidHandlerTest extends HupaGuiceTestCase {
public void testDeleteFolderNotExists() throws MessagingException {
- DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache, logger, httpSessionProvider);
-
- User user = createUser();
- storeCache.addValidUser(user.getName(), user.getPassword());
- httpSession.setAttribute("user", user);
IMAPFolder folder = new IMAPFolder();
folder.setFullName("NOT_EXISTS");
DeleteMessageByUid action = new DeleteMessageByUid(folder,new ArrayList<Long>());
-
try {
- handler.execute(action, null);
+ deleteMByUid.execute(action, null);
fail("Folder should not exists!");
} catch (ActionException e) {
- //e.printStackTrace();
}
}
public void testDeleteFolderExistsAndNotTrash() throws MessagingException {
- Session s = Session.getInstance(new Properties());
- DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache, logger, httpSessionProvider);
-
- User user = createUser();
- storeCache.addValidUser(user.getName(), user.getPassword());
- httpSession.setAttribute("user", user);
IMAPFolder folder = new IMAPFolder();
folder.setFullName("EXISTS");
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
store.clear();
MockIMAPFolder f = (MockIMAPFolder)store.getFolder(folder.getFullName());
f.create(Folder.HOLDS_FOLDERS);
- f.addMessages(new Message[] { new MimeMessage(s), new MimeMessage(s), new MimeMessage(s)});
+ f.addMessages(new Message[] { new MimeMessage(session), new MimeMessage(session), new MimeMessage(session)});
ArrayList<Long> uids = new ArrayList<Long>();
uids.add(0l);
uids.add(2l);
DeleteMessageByUid action = new DeleteMessageByUid(folder, uids);
- MockIMAPFolder f3 = (MockIMAPFolder) store.getFolder(user.getSettings().getTrashFolderName());
- assertFalse("Trash folder not exists yet",f3.exists());
-
+ MockIMAPFolder f3 = (MockIMAPFolder) store.getFolder(testUser.getSettings().getTrashFolderName());
+ assertFalse("Trash folder already exists", f3.exists());
try {
- handler.execute(action, null);
+ deleteMByUid.execute(action, null);
assertEquals("Only 1 message left", 1, f.getMessageCount());
- MockIMAPFolder f2 = (MockIMAPFolder) store.getFolder(user.getSettings().getTrashFolderName());
+ MockIMAPFolder f2 = (MockIMAPFolder) store.getFolder(testUser.getSettings().getTrashFolderName());
assertTrue("Trash folder created",f2.exists());
assertEquals("2 messages moved", 2, f2.getMessageCount());
} catch (ActionException e) {
@@ -93,28 +77,18 @@
}
public void testDeleteFolderExistsAndIsTrash() throws MessagingException {
- Session s = Session.getInstance(new Properties());
- DeleteMessageByUidHandler handler = new DeleteMessageByUidHandler(storeCache, logger, httpSessionProvider);
-
- User user = createUser();
- storeCache.addValidUser(user.getName(), user.getPassword());
- httpSession.setAttribute("user", user);
IMAPFolder folder = new IMAPFolder();
- folder.setFullName(user.getSettings().getTrashFolderName());
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
- store.clear();
+ folder.setFullName(testUser.getSettings().getTrashFolderName());
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
MockIMAPFolder f = (MockIMAPFolder)store.getFolder(folder.getFullName());
- f.create(Folder.HOLDS_FOLDERS);
- f.addMessages(new Message[] { new MimeMessage(s), new MimeMessage(s), new MimeMessage(s)});
+ f.addMessages(new Message[] { new MimeMessage(session), new MimeMessage(session), new MimeMessage(session)});
ArrayList<Long> uids = new ArrayList<Long>();
uids.add(0l);
uids.add(2l);
DeleteMessageByUid action = new DeleteMessageByUid(folder, uids);
-
try {
- handler.execute(action, null);
-
+ deleteMByUid.execute(action, null);
assertEquals("Only 1 message left", 1, f.getMessageCount());
} catch (ActionException e) {
e.printStackTrace();
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java Thu Feb 11 23:32:10 2010
@@ -19,30 +19,36 @@
package org.apache.hupa.server.handler;
-import java.util.ArrayList;
-
-import javax.mail.Folder;
-import javax.mail.MessagingException;
-
import net.customware.gwt.dispatch.shared.ActionException;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.mock.MockIMAPStore;
+import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.exception.InvalidSessionException;
import org.apache.hupa.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
-public class FetchFoldersHandlerTest extends AbstractHandlerTest{
+import java.util.ArrayList;
+
+import javax.mail.Folder;
+import javax.mail.MessagingException;
+
+public class FetchFoldersHandlerTest extends HupaGuiceTestCase {
+
+ public void setUp() throws Exception {
+ MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
+ store.clear();
+ }
+
public void testInvalidSessionId() {
- FetchFoldersHandler handler = new FetchFoldersHandler(storeCache, logger, httpSessionProvider);
+ httpSession.removeAttribute(SConsts.USER_SESS_ATTR);
try {
- handler.execute(new FetchFolders(), null);
+ fetchFHandler.execute(new FetchFolders(), null);
fail("Invalid session");
} catch (InvalidSessionException e) {
- //e.printStackTrace();
} catch (ActionException e) {
e.printStackTrace();
fail();
@@ -50,12 +56,9 @@
}
public void testNoFolders() {
- User user = createUser();
- httpSession.setAttribute("user", user);
- storeCache.addValidUser(user.getName(), user.getPassword());
- FetchFoldersHandler handler = new FetchFoldersHandler(storeCache, logger, httpSessionProvider);
+ httpSession.setAttribute(SConsts.USER_SESS_ATTR, testUser);
try {
- FetchFoldersResult result = handler.execute(new FetchFolders(), null);
+ FetchFoldersResult result = fetchFHandler.execute(new FetchFolders(), null);
assertTrue(result.getFolders().isEmpty());
} catch (ActionException e) {
e.printStackTrace();
@@ -64,18 +67,12 @@
}
public void testFoundFolders() throws MessagingException {
- User user = createUser();
- httpSession.setAttribute("user", user);
- storeCache.addValidUser(user.getName(), user.getPassword());
-
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
+ httpSession.setAttribute(SConsts.USER_SESS_ATTR, testUser);
store.getFolder("WHATEVER").create(Folder.HOLDS_FOLDERS);
store.getFolder("WHATEVER1").create(Folder.HOLDS_FOLDERS);
store.getFolder("WHATEVER.XXX").create(Folder.HOLDS_FOLDERS);
-
- FetchFoldersHandler handler = new FetchFoldersHandler(storeCache, logger, httpSessionProvider);
try {
- FetchFoldersResult result = handler.execute(new FetchFolders(), null);
+ FetchFoldersResult result = fetchFHandler.execute(new FetchFolders(), null);
ArrayList<IMAPFolder> folders = result.getFolders();
assertFalse(folders.isEmpty());
assertEquals(3, folders.size());
@@ -83,9 +80,7 @@
assertEquals("WHATEVER1",folders.get(1).getFullName());
assertEquals("WHATEVER" + MockIMAPFolder.SEPARATOR + "XXX",folders.get(2).getFullName());
assertEquals("XXX",folders.get(2).getName());
-
assertEquals("WHATEVER" + MockIMAPFolder.SEPARATOR + "XXX",folders.get(0).getChildIMAPFolders().get(0).getFullName());
-
} catch (ActionException e) {
e.printStackTrace();
fail();
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java Thu Feb 11 23:32:10 2010
@@ -19,6 +19,12 @@
package org.apache.hupa.server.handler;
+import org.apache.hupa.server.HupaGuiceTestCase;
+import org.apache.hupa.server.mock.MockIMAPFolder;
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.rpc.FetchMessages;
+import org.apache.hupa.shared.rpc.FetchMessagesResult;
+
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
@@ -28,24 +34,9 @@
import javax.mail.Flags.Flag;
import javax.mail.internet.MimeMessage;
-import org.apache.hupa.server.mock.MockIMAPFolder;
-import org.apache.hupa.server.mock.MockIMAPStore;
-import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.rpc.FetchMessages;
-import org.apache.hupa.shared.rpc.FetchMessagesResult;
-
-public class FetchMessagesHandlerTest extends AbstractHandlerTest{
+public class FetchMessagesHandlerTest extends HupaGuiceTestCase {
- FetchMessagesHandler handler = new FetchMessagesHandler(storeCache, logger, httpSessionProvider, preferences);
-
- public void setUp() {
- super.setUp();
- httpSession.setAttribute("user", user);
- }
-
public void testConvert() throws Exception {
-
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
MockIMAPFolder f = (MockIMAPFolder)store.getFolder("WHATEVER");
f.create(Folder.HOLDS_MESSAGES);
@@ -56,38 +47,36 @@
is = new ByteArrayInputStream("From: a@foo.com\nTo: b@foo.com\nSubject: =?ISO-8859-1?Q?Monta=F1a?=\n\ndata".getBytes());
MimeMessage m3 = new MimeMessage(session, is);
- ArrayList<org.apache.hupa.shared.data.Message> msgs = handler.convert(2, f, new Message[]{m1, m2, m3});
+ ArrayList<org.apache.hupa.shared.data.Message> msgs = fetchMessagesHandler.convert(2, f, new Message[]{m1, m2, m3});
assertEquals(2, msgs.size());
- msgs = handler.convert(10, f, new Message[]{m1, m2, m3});
+ msgs = fetchMessagesHandler.convert(10, f, new Message[]{m1, m2, m3});
assertEquals(3, msgs.size());
- msgs = handler.convert(10, f, new Message[]{m2});
+ msgs = fetchMessagesHandler.convert(10, f, new Message[]{m2});
assertEquals("Manolo Pe\u00F1a <pe...@foo.com>", msgs.get(0).getFrom());
- msgs = handler.convert(10, f, new Message[]{m3});
+ msgs = fetchMessagesHandler.convert(10, f, new Message[]{m3});
assertEquals("Monta\u00F1a", msgs.get(0).getSubject());
}
public void testFetchMessages() throws Exception {
- MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
MockIMAPFolder serverfolder = (MockIMAPFolder)store.getFolder("WHATEVER");
serverfolder.create(Folder.HOLDS_MESSAGES);
IMAPFolder clientfolder = new IMAPFolder("WHATEVER");
- FetchMessagesResult result = handler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
+ FetchMessagesResult result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
assertEquals(0, result.getRealCount());
ByteArrayInputStream is = new ByteArrayInputStream("From: a@foo.com\nTo: b@foo.com\nSubject: something\n\ndata".getBytes());
MimeMessage msg = new MimeMessage(session, is);
serverfolder.addMessages(new Message[]{msg});
- result = handler.execute(new FetchMessages(clientfolder, 0, 10, "something"), null);
+ result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "something"), null);
assertEquals(1, result.getRealCount());
assertEquals(1, result.getMessages().size());
-
- result = handler.execute(new FetchMessages(clientfolder, 0, 10, null), null);
+ result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, null), null);
assertEquals(1, result.getRealCount());
assertEquals(1, result.getMessages().size());
@@ -95,11 +84,11 @@
msg = new MimeMessage(session, is);
serverfolder.appendMessages(new Message[]{msg});
- result = handler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
+ result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
assertEquals(2, result.getRealCount());
assertEquals(2, result.getMessages().size());
- result = handler.execute(new FetchMessages(clientfolder, 0, 10, null), null);
+ result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, null), null);
assertEquals(2, serverfolder.getMessageCount());
assertEquals(2, serverfolder.getUnreadMessageCount());
assertEquals(2, result.getRealCount());
@@ -110,10 +99,8 @@
assertEquals(1, serverfolder.getUnreadMessageCount());
serverfolder.appendMessages(new Message[]{msg});
- result = handler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
+ result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
assertEquals(3, result.getRealCount());
assertEquals(1, result.getRealUnreadCount());
-
}
-
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java Thu Feb 11 23:32:10 2010
@@ -1,3 +1,21 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
package org.apache.hupa.server.handler;
import com.google.inject.Module;
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/IdleHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/IdleHandlerTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/IdleHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/IdleHandlerTest.java Thu Feb 11 23:32:10 2010
@@ -16,31 +16,24 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.hupa.server.handler;
import net.customware.gwt.dispatch.shared.ActionException;
-import org.apache.hupa.shared.data.User;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.shared.rpc.Idle;
import org.apache.hupa.shared.rpc.IdleResult;
-public class IdleHandlerTest extends AbstractHandlerTest{
+public class IdleHandlerTest extends HupaGuiceTestCase {
- public void testNoop() {
- IdleHandler handler = new IdleHandler(storeCache, logger, httpSessionProvider);
- User user = createUser();
+ public void testIdle() {
Idle action = new Idle();
- storeCache.addValidUser(user.getName(), user.getPassword());
- httpSession.setAttribute("user", user);
try {
- IdleResult result = handler.execute(action, null);
+ IdleResult result = idleHandler.execute(action, null);
assertNotNull(result);
} catch (ActionException e) {
e.printStackTrace();
fail();
-
}
-
}
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java Thu Feb 11 23:32:10 2010
@@ -16,53 +16,40 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.hupa.server.handler;
import net.customware.gwt.dispatch.shared.ActionException;
-import org.apache.hupa.shared.data.Settings;
+import org.apache.hupa.server.HupaGuiceTestCase;
+import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
-import com.google.inject.Provider;
-
-public class LoginUserHandlerTest extends AbstractHandlerTest {
-
- private LoginUserHandler handler = new LoginUserHandler(storeCache, logger, httpSessionProvider, new Provider<Settings>() {
- public Settings get() {
- return new Settings();
- }
- });
+public class LoginUserHandlerTest extends HupaGuiceTestCase {
public void testInvalidLogin() {
+ httpSession.setAttribute("Attribute", "Value");
try {
- handler.execute(new LoginUser("invalid","invalid"), null);
+ loginUser.execute(new LoginUser("invalid","invalid"), null);
fail("Should throw an exception");
} catch (ActionException e) {
- //e.printStackTrace();
}
- assertNull("no user stored in session", httpSession.getAttribute("user"));
+ assertNull("No user should be stored in session", httpSession.getAttribute(SConsts.USER_SESS_ATTR));
+ assertNull("Attributes should be removed", httpSession.getAttribute("Attribute"));
}
public void testValidLogin() {
- String username = "valid";
- String password = "valid";
- storeCache.addValidUser(username, password);
-
try {
- LoginUserResult result = handler.execute(new LoginUser(username,password), null);
+ LoginUserResult result = loginUser.execute(new LoginUser(testUser.getName(), testUser.getPassword()), null);
User u = result.getUser();
-
assertEquals("Authenticated", true, u.getAuthenticated());
- assertEquals("Authenticated", username, u.getName());
- assertEquals("Authenticated", password, u.getPassword());
- assertEquals("User stored in session", u, httpSession.getAttribute("user"));
+ assertEquals("Authenticated", testUser.getName(), u.getName());
+ assertEquals("Authenticated", testUser.getPassword(), u.getPassword());
+ assertEquals("User stored in session", u, httpSession.getAttribute(SConsts.USER_SESS_ATTR));
} catch (ActionException e) {
e.printStackTrace();
fail("Should throw an exception");
}
}
-
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/LogoutUserHandlerTest.java Thu Feb 11 23:32:10 2010
@@ -16,32 +16,24 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
-
package org.apache.hupa.server.handler;
import net.customware.gwt.dispatch.shared.ActionException;
-import org.apache.hupa.shared.data.User;
+import org.apache.hupa.server.HupaGuiceTestCase;
+import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.rpc.LogoutUser;
import org.apache.hupa.shared.rpc.LogoutUserResult;
-public class LogoutUserHandlerTest extends AbstractHandlerTest{
+public class LogoutUserHandlerTest extends HupaGuiceTestCase {
public void testLogout() {
- String username = "test";
- String password = "pass";
- User user = new User();
- user.setName(username);
- user.setPassword(password);
- user.setAuthenticated(true);
- httpSession.setAttribute("user", user);
- LogoutUserHandler handler = new LogoutUserHandler(storeCache, logger, httpSessionProvider);
try {
- LogoutUserResult result = handler.execute(new LogoutUser(), null);
+ httpSession.setAttribute("Attribute", "Value");
+ LogoutUserResult result = logoutUser.execute(new LogoutUser(), null);
assertFalse("Not authenticated anymore", result.getUser().getAuthenticated());
- assertNull("User removed", httpSession.getAttribute("user"));
-
+ assertNull("User should be removed", httpSession.getAttribute(SConsts.USER_SESS_ATTR));
+ assertNull("Attributes should be removed", httpSession.getAttribute("Attribute"));
} catch (ActionException e) {
e.printStackTrace();
fail();
Copied: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java (from r908044, james/hupa/trunk/server/src/test/java/org/apache/hupa/server/DemoModeTest.java)
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java?p2=james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java&p1=james/hupa/trunk/server/src/test/java/org/apache/hupa/server/DemoModeTest.java&r1=908044&r2=909175&rev=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/DemoModeTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java Thu Feb 11 23:32:10 2010
@@ -1,65 +1,32 @@
-package org.apache.hupa.server;
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.hupa.server.mock;
+
+import org.apache.hupa.server.HupaGuiceTestCase;
+import org.apache.hupa.server.guice.DemoModeConstants;
import java.net.URL;
import javax.mail.Folder;
import javax.mail.Message;
-import net.customware.gwt.dispatch.shared.ActionException;
-
-import org.apache.hupa.server.guice.DemoModeConstants;
-import org.apache.hupa.server.handler.AbstractHandlerTest;
-import org.apache.hupa.server.handler.FetchFoldersHandler;
-import org.apache.hupa.server.handler.FetchMessagesHandler;
-import org.apache.hupa.server.handler.LoginUserHandler;
-import org.apache.hupa.server.mock.MockIMAPFolder;
-import org.apache.hupa.server.mock.MockIMAPStore;
-import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.User;
-import org.apache.hupa.shared.rpc.FetchFolders;
-import org.apache.hupa.shared.rpc.FetchFoldersResult;
-import org.apache.hupa.shared.rpc.FetchMessages;
-import org.apache.hupa.shared.rpc.FetchMessagesResult;
-import org.apache.hupa.shared.rpc.LoginUser;
-
-
-public class DemoModeTest extends AbstractHandlerTest {
-
- private LoginUser demoUser = new LoginUser("demo", "demo");
-
- private InMemoryIMAPStoreCache memoryStore = new InMemoryIMAPStoreCache(logger, DemoModeConstants.DEMO_MODE, 143, false, 1, 300000, false, provider);
-
- private LoginUserHandler loginUserHandler = new LoginUserHandler(memoryStore, logger, httpSessionProvider, settingsProvider);
-
- private FetchFoldersHandler fetchFoldersHandler = new FetchFoldersHandler(memoryStore, logger, httpSessionProvider);
-
- private FetchMessagesHandler fetchMessagesHandler = new FetchMessagesHandler(memoryStore, logger, httpSessionProvider, preferences);
-
- public void testDemoLoginUser() {
- LoginUser badUser = new LoginUser("baduser", "whatever");
- try {
- loginUserHandler.execute(demoUser, null);
- } catch (ActionException e) {
- fail("Shouldn't throw an exception");
- e.printStackTrace();
- }
- try {
- loginUserHandler.execute(badUser, null);
- fail("Should throw an exception");
- } catch (ActionException e) {
- }
- }
-
- public void testDemoFetchFolders() {
- try {
- loginUserHandler.execute(demoUser, null);
- FetchFoldersResult result = fetchFoldersHandler.execute(new FetchFolders(), null);
- assertEquals("In demo mode should be 4 folders predefined", 4, result.getFolders().size());
- } catch (ActionException e) {
- e.printStackTrace();
- fail("Shouldn't throw an exception");
- }
- }
+public class MockImapFolderTest extends HupaGuiceTestCase {
public void testReadMessageFile() throws Exception {
URL url = Thread.currentThread().getContextClassLoader().getResource(DemoModeConstants.DEMO_MODE_MESSAGES_LOCATION + "0.msg");
@@ -72,26 +39,9 @@
folder.create(Folder.HOLDS_MESSAGES);
folder.loadDemoMessages(session);
assertTrue(folder.getMessages().length > 0);
-
for (Message m: folder.getMessages()) {
assertEquals(m, folder.getMessageByUID(folder.getUID(m)));
}
-
}
- public void testDemoFetchMessages() throws Exception {
- try {
- User user = loginUserHandler.execute(demoUser, null).getUser();
- fetchFoldersHandler.execute(new FetchFolders(), null);
- IMAPFolder folder = new IMAPFolder(user.getSettings().getInboxFolderName());
- FetchMessagesResult result = fetchMessagesHandler.execute(new FetchMessages(folder, 0, 10, null), null);
- assertEquals(8, result.getRealCount());
- assertEquals(8, result.getMessages().size());
- assertEquals(8, result.getRealUnreadCount());
- } catch (ActionException e) {
- e.printStackTrace();
- fail("Shouldn't throw an exception");
- }
- }
-
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java?rev=909175&r1=909174&r2=909175&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/servlet/DownloadAttachmentServletTest.java Thu Feb 11 23:32:10 2010
@@ -1,13 +1,14 @@
package org.apache.hupa.server.servlet;
+import org.apache.hupa.server.HupaGuiceTestCase;
+import org.apache.hupa.server.utils.MessageUtils;
+import org.apache.hupa.server.utils.TestUtils;
+
import javax.mail.Part;
import javax.mail.internet.MimeMessage;
-import org.apache.hupa.server.handler.AbstractHandlerTest;
-import org.apache.hupa.server.utils.MessageUtils;
-import org.apache.hupa.server.utils.TestUtils;
-public class DownloadAttachmentServletTest extends AbstractHandlerTest {
+public class DownloadAttachmentServletTest extends HupaGuiceTestCase {
public void testDownloadAttachmentByName() throws Exception {
MimeMessage message = TestUtils.loadMessageFromFile(session, "7.msg");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org