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 do...@apache.org on 2013/09/12 05:35:55 UTC
svn commit: r1522221 - in /james/hupa/trunk:
mock/src/main/java/org/apache/hupa/server/guice/
server/src/main/java/org/apache/hupa/server/service/
server/src/test/java/org/apache/hupa/server/
server/src/test/java/org/apache/hupa/server/guice/ server/sr...
Author: dongxu
Date: Thu Sep 12 03:35:54 2013
New Revision: 1522221
URL: http://svn.apache.org/r1522221
Log:
re-add server unit tests
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.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/GuiceServerTestModule.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java Thu Sep 12 03:35:54 2013
@@ -28,6 +28,7 @@ import org.apache.hupa.shared.data.Setti
import org.apache.hupa.shared.data.UserImpl;
import com.google.inject.AbstractModule;
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -42,6 +43,8 @@ import org.apache.hupa.shared.data.UserI
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> re-add server unit tests
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -93,6 +96,7 @@ import com.google.inject.name.Named;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public abstract class AbstractGuiceTestModule extends AbstractModule{
protected static class TestUser extends UserImpl {
@@ -111,6 +115,12 @@ public abstract class AbstractGuiceTestM
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+public abstract class AbstractGuiceTestModule extends AbstractModule{
+
+ protected static class TestUser extends UserImpl {
+
+>>>>>>> re-add server unit tests
@Inject
public TestUser(@Named("Username") String username,
@Named("Password") String password,
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java Thu Sep 12 03:35:54 2013
@@ -35,6 +35,9 @@ import org.apache.hupa.server.IMAPStoreC
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> re-add server unit tests
import org.apache.hupa.shared.exception.HupaException;
import org.apache.hupa.shared.exception.InvalidSessionException;
@@ -71,7 +74,7 @@ public abstract class AbstractService {
>>>>>>> fix issue 5,6,8:
@Inject protected Log logger;
- protected User getUser() {
+ protected User getUser() throws HupaException{
<<<<<<< HEAD
protected HttpSession getHttpSession() {
@@ -79,6 +82,7 @@ public abstract class AbstractService {
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
=======
User user = (User) httpSessionProvider.get().getAttribute(SConsts.USER_SESS_ATTR);
+<<<<<<< HEAD
// if (user == null) { TODO exception
// throw new Exception("User not found in session with id " + httpSessionProvider.get().getId());
// } else {
@@ -86,5 +90,12 @@ public abstract class AbstractService {
// }
return user;
>>>>>>> fix issue 5,6,8:
+=======
+ if (user == null) {
+ throw new InvalidSessionException("User not found in session with id " + httpSessionProvider.get().getId());
+ } else {
+ return user;
+ }
+>>>>>>> re-add server unit tests
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java Thu Sep 12 03:35:54 2013
@@ -36,9 +36,15 @@ public interface CheckSessionService {
package org.apache.hupa.server.service;
import org.apache.hupa.shared.domain.User;
+import org.apache.hupa.shared.exception.HupaException;
public interface CheckSessionService {
+<<<<<<< HEAD
public User getUser();
public Boolean isValid();
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+=======
+ public User getUser() throws HupaException;
+ public Boolean isValid() throws HupaException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -42,15 +42,20 @@ public class CheckSessionServiceImpl ext
package org.apache.hupa.server.service;
import org.apache.hupa.shared.domain.User;
+import org.apache.hupa.shared.exception.HupaException;
public class CheckSessionServiceImpl extends AbstractService implements CheckSessionService {
- public User getUser(){
+ public User getUser() throws HupaException{
return super.getUser();
}
+<<<<<<< HEAD
public Boolean isValid() {
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+=======
+ public Boolean isValid() throws HupaException{
+>>>>>>> re-add server unit tests
return getUser() != null && getUser().getAuthenticated();
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java Thu Sep 12 03:35:54 2013
@@ -37,10 +37,17 @@ public interface DeleteFolderService {
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
package org.apache.hupa.server.service;
+import javax.mail.MessagingException;
+
import org.apache.hupa.shared.domain.DeleteFolderAction;
import org.apache.hupa.shared.domain.GenericResult;
+import org.apache.hupa.shared.exception.HupaException;
public interface DeleteFolderService {
+<<<<<<< HEAD
GenericResult delete(DeleteFolderAction action) throws Exception;
>>>>>>> delete and rename folder
+=======
+ GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -26,6 +26,7 @@ package org.apache.hupa.server.service;
import javax.mail.Folder;
import javax.mail.MessagingException;
+<<<<<<< HEAD
=======
=======
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
@@ -33,6 +34,8 @@ package org.apache.hupa.server.service;
import javax.mail.Folder;
>>>>>>> delete and rename folder
+=======
+>>>>>>> re-add server unit tests
import org.apache.hupa.shared.data.GenericResultImpl;
import org.apache.hupa.shared.domain.DeleteFolderAction;
@@ -40,9 +43,13 @@ import org.apache.hupa.shared.domain.Gen
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> delete and rename folder
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.sun.mail.imap.IMAPStore;
@@ -50,10 +57,14 @@ public class DeleteFolderServiceImpl ext
@Override
<<<<<<< HEAD
+<<<<<<< HEAD
public GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException {
=======
public GenericResult delete(DeleteFolderAction action) throws Exception {
>>>>>>> delete and rename folder
+=======
+ public GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException {
+>>>>>>> re-add server unit tests
User user = getUser();
ImapFolder folder = action.getFolder();
IMAPStore store = cache.get(user);
@@ -71,10 +82,14 @@ public class DeleteFolderServiceImpl ext
return new GenericResultImpl();
} else {
<<<<<<< HEAD
+<<<<<<< HEAD
throw new HupaException("Unable to delete folder " + folder + " for user " + user);
=======
throw new Exception("Unable to delete folder " + folder + " for user " + user);
>>>>>>> delete and rename folder
+=======
+ throw new HupaException("Unable to delete folder " + folder + " for user " + user);
+>>>>>>> re-add server unit tests
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -36,9 +36,13 @@ import org.apache.hupa.shared.domain.Del
import org.apache.hupa.shared.domain.DeleteMessageAllAction;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> delete messages, make WestActivity Singleton
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
@@ -47,10 +51,14 @@ public class DeleteMessageAllServiceImpl
@Override
<<<<<<< HEAD
+<<<<<<< HEAD
protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException {
=======
protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception {
>>>>>>> delete messages, make WestActivity Singleton
+=======
+ protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException {
+>>>>>>> re-add server unit tests
DeleteMessageAllAction action = (DeleteMessageAllAction) actionBase;
User user = getUser();
try {
@@ -65,10 +73,14 @@ public class DeleteMessageAllServiceImpl
String errorMsg = "Error while deleting all messages in folder " + action.getFolder() + " for user " + user;
logger.error(errorMsg, e);
<<<<<<< HEAD
+<<<<<<< HEAD
throw new HupaException(errorMsg);
=======
throw new Exception(errorMsg);
>>>>>>> delete messages, make WestActivity Singleton
+=======
+ throw new HupaException(errorMsg);
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -38,18 +38,26 @@ import org.apache.hupa.shared.domain.Del
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> delete messages, make WestActivity Singleton
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.sun.mail.imap.IMAPStore;
public abstract class DeleteMessageBaseServiceImpl extends AbstractService{
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException {
=======
public DeleteMessageResult delete(DeleteMessageAction action) throws Exception {
>>>>>>> delete messages, make WestActivity Singleton
+=======
+ public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException {
+>>>>>>> re-add server unit tests
ImapFolder folder = action.getFolder();
User user = getUser();
try {
@@ -102,10 +110,14 @@ public abstract class DeleteMessageBaseS
logger.error("Error while deleting messages for user " + user
+ " in folder" + action.getFolder(), e);
<<<<<<< HEAD
+<<<<<<< HEAD
throw new HupaException("Error while deleting messages");
=======
throw new Exception("Error while deleting messages");
>>>>>>> delete messages, make WestActivity Singleton
+=======
+ throw new HupaException("Error while deleting messages");
+>>>>>>> re-add server unit tests
}
}
@@ -117,8 +129,12 @@ public abstract class DeleteMessageBaseS
* @return messages
*/
<<<<<<< HEAD
+<<<<<<< HEAD
protected abstract Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException;
=======
protected abstract Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception;
>>>>>>> delete messages, make WestActivity Singleton
+=======
+ protected abstract Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java Thu Sep 12 03:35:54 2013
@@ -31,6 +31,7 @@ package org.apache.hupa.server.service;
import org.apache.hupa.shared.domain.DeleteMessageAction;
import org.apache.hupa.shared.domain.DeleteMessageResult;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
public interface DeleteMessageByUidService {
@@ -40,4 +41,10 @@ public interface DeleteMessageByUidServi
public interface DeleteMessageByUidService {
public DeleteMessageResult delete(DeleteMessageAction action) throws Exception;
>>>>>>> delete messages, make WestActivity Singleton
+=======
+import org.apache.hupa.shared.exception.HupaException;
+
+public interface DeleteMessageByUidService {
+ public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -39,9 +39,13 @@ import org.apache.hupa.shared.domain.Del
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> delete messages, make WestActivity Singleton
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.sun.mail.imap.IMAPStore;
@@ -49,10 +53,14 @@ public class DeleteMessageByUidServiceIm
@Override
<<<<<<< HEAD
+<<<<<<< HEAD
protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException {
=======
protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception {
>>>>>>> delete messages, make WestActivity Singleton
+=======
+ protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException {
+>>>>>>> re-add server unit tests
DeleteMessageByUidAction action = (DeleteMessageByUidAction)actionBase;
ImapFolder folder = action.getFolder();
List<Long> uids = action.getMessageUids();
@@ -80,10 +88,14 @@ public class DeleteMessageByUidServiceIm
+ action.getMessageUids() + " for user " + user
+ " in folder" + action.getFolder(), e);
<<<<<<< HEAD
+<<<<<<< HEAD
throw new HupaException("Error while deleting messages", e);
=======
throw new Exception("Error while deleting messages", e);
>>>>>>> delete messages, make WestActivity Singleton
+=======
+ throw new HupaException("Error while deleting messages", e);
+>>>>>>> re-add server unit tests
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java Thu Sep 12 03:35:54 2013
@@ -25,6 +25,7 @@ import javax.mail.MessagingException;
import org.apache.hupa.shared.domain.ImapFolder;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
public interface FetchFoldersService {
@@ -34,4 +35,10 @@ public interface FetchFoldersService {
public interface FetchFoldersService {
List<ImapFolder> fetch(ImapFolder folder) throws MessagingException;
>>>>>>> Fix issue #15.
+=======
+import org.apache.hupa.shared.exception.HupaException;
+
+public interface FetchFoldersService {
+ List<ImapFolder> fetch(ImapFolder folder) throws MessagingException, HupaException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -28,10 +28,14 @@ import javax.mail.MessagingException;
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.domain.ImapFolder;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> Fix issue #15.
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.sun.mail.imap.IMAPStore;
@@ -39,6 +43,7 @@ public class FetchFoldersServiceImpl ext
@Override
<<<<<<< HEAD
+<<<<<<< HEAD
public List<ImapFolder> fetch(ImapFolder imapFolder, Boolean recursive) throws MessagingException, HupaException {
if(recursive){
return this.pullAll();
@@ -46,6 +51,9 @@ public class FetchFoldersServiceImpl ext
=======
public List<ImapFolder> fetch(ImapFolder imapFolder) throws MessagingException {
>>>>>>> Fix issue #15.
+=======
+ public List<ImapFolder> fetch(ImapFolder imapFolder) throws MessagingException, HupaException{
+>>>>>>> re-add server unit tests
try {
Folder folder = null;
IMAPStore store = cache.get(getUser());
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -54,9 +54,13 @@ import org.apache.hupa.shared.domain.Ima
import org.apache.hupa.shared.domain.Tag;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.google.inject.Inject;
import com.sun.mail.imap.IMAPStore;
@@ -66,6 +70,7 @@ public abstract class FetchMessagesBaseS
@Inject protected UserPreferencesStorage userPreferences;
<<<<<<< HEAD
+<<<<<<< HEAD
public FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException{
User user = getUser();
ImapFolder folder = action.getFolder();
@@ -73,6 +78,9 @@ public abstract class FetchMessagesBaseS
folder = new ImapFolderImpl(user.getSettings().getInboxFolderName());
=======
public FetchMessagesResult fetch(FetchMessagesAction action){
+=======
+ public FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException{
+>>>>>>> re-add server unit tests
User user = getUser();
ImapFolder folder = action.getFolder();
if (folder == null) {
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java Thu Sep 12 03:35:54 2013
@@ -41,14 +41,25 @@ public interface FetchMessagesService {
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
package org.apache.hupa.server.service;
+import java.util.List;
+
+import javax.mail.Message;
+import javax.mail.MessagingException;
+
import org.apache.hupa.shared.domain.FetchMessagesAction;
import org.apache.hupa.shared.domain.FetchMessagesResult;
+import org.apache.hupa.shared.exception.HupaException;
public interface FetchMessagesService {
<<<<<<< HEAD
+<<<<<<< HEAD
public FetchMessagesResult fetch(FetchMessagesAction action);
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
=======
FetchMessagesResult fetch(FetchMessagesAction action);
>>>>>>> Succeed creating new folder
+=======
+ FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException;
+ List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -139,6 +139,7 @@ import org.apache.hupa.shared.domain.Fet
import org.apache.hupa.shared.domain.FetchMessagesResult;
import org.apache.hupa.shared.domain.Tag;
import org.apache.hupa.shared.domain.User;
+import org.apache.hupa.shared.exception.HupaException;
import com.google.inject.Inject;
import com.sun.mail.imap.IMAPFolder;
@@ -149,7 +150,7 @@ public class FetchMessagesServiceImpl ex
@Inject protected UserPreferencesStorage userPreferences;
- public FetchMessagesResult fetch(FetchMessagesAction action){
+ public FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException{
User user = getUser();
// ImapFolder folder = action.getFolder();
if (action.getFolder() == null) {
@@ -193,8 +194,12 @@ public class FetchMessagesServiceImpl ex
}
+<<<<<<< HEAD
protected MessageConvertArray getMessagesToConvert(IMAPFolder f, FetchMessagesAction action) throws MessagingException {
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
+=======
+ protected MessageConvertArray getMessagesToConvert(IMAPFolder f, FetchMessagesAction action) throws MessagingException, HupaException {
+>>>>>>> re-add server unit tests
String searchString = action.getSearchString();
int start = action.getStart();
@@ -250,10 +255,14 @@ public class FetchMessagesServiceImpl ex
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException {
=======
protected List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException {
>>>>>>> fix some bugs related to RF, and try to use new CellView to replace gwt-incubator
+=======
+ public List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException {
+>>>>>>> re-add server unit tests
List<org.apache.hupa.shared.domain.Message> mList = new ArrayList<org.apache.hupa.shared.domain.Message>();
// Setup fetchprofile to limit the stuff which is fetched
FetchProfile fp = new FetchProfile();
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -135,10 +135,13 @@ public class GetMessageDetailsServiceImp
boolean isHTML = handleParts(message, con, sbPlain, attachmentList);
<<<<<<< HEAD
+<<<<<<< HEAD
=======
System.out.println(isHTML);
>>>>>>> try to get message details, problem is:
+=======
+>>>>>>> re-add server unit tests
if (isHTML) {
mDetails.setText(filterHtmlDocument(sbPlain.toString(), folderName, uid));
} else {
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleService.java Thu Sep 12 03:35:54 2013
@@ -38,12 +38,19 @@ public interface IdleService {
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
package org.apache.hupa.server.service;
+import javax.mail.MessagingException;
+
import org.apache.hupa.shared.domain.IdleAction;
import org.apache.hupa.shared.domain.IdleResult;
+import org.apache.hupa.shared.exception.HupaException;
public interface IdleService {
+<<<<<<< HEAD
IdleResult idle(IdleAction action) throws Exception;
>>>>>>> other RFs
+=======
+ IdleResult idle(IdleAction action) throws HupaException, MessagingException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IdleServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -35,20 +35,30 @@ import org.apache.hupa.shared.exception.
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
package org.apache.hupa.server.service;
+import javax.mail.MessagingException;
+
import org.apache.hupa.shared.data.IdleResultImpl;
import org.apache.hupa.shared.domain.IdleAction;
import org.apache.hupa.shared.domain.IdleResult;
+<<<<<<< HEAD
>>>>>>> other RFs
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.sun.mail.imap.IMAPStore;
public class IdleServiceImpl extends AbstractService implements IdleService {
@Override
<<<<<<< HEAD
+<<<<<<< HEAD
public IdleResult idle(IdleAction action) throws HupaException, MessagingException {
=======
public IdleResult idle(IdleAction action) throws Exception {
>>>>>>> other RFs
+=======
+ public IdleResult idle(IdleAction action) throws HupaException, MessagingException {
+>>>>>>> re-add server unit tests
try {
IMAPStore store = cache.get(getUser());
@@ -63,12 +73,17 @@ public class IdleServiceImpl extends Abs
}
return new IdleResultImpl(true);
<<<<<<< HEAD
+<<<<<<< HEAD
} catch (HupaException e) {
throw new HupaException("Unable to send NOOP " + e.getMessage());
=======
} catch (Exception e) {
throw new Exception("Unable to send NOOP " + e.getMessage());
>>>>>>> other RFs
+=======
+ } catch (HupaException e) {
+ throw new HupaException("Unable to send NOOP " + e.getMessage());
+>>>>>>> re-add server unit tests
}
}
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java Thu Sep 12 03:35:54 2013
@@ -36,13 +36,20 @@ public interface LoginUserService {
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
package org.apache.hupa.server.service;
+import javax.mail.MessagingException;
+
import org.apache.hupa.shared.domain.User;
+import org.apache.hupa.shared.exception.HupaException;
public interface LoginUserService {
<<<<<<< HEAD
+<<<<<<< HEAD
public User login(String username, String password);
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
=======
public User login(String username, String password) throws Exception;
>>>>>>> alert people "invilid login" for the wrong username and/or password, which should be improved with a gentle way
+=======
+ public User login(String username, String password) throws HupaException, MessagingException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -26,6 +26,9 @@ package org.apache.hupa.server.service;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> re-add server unit tests
import javax.mail.MessagingException;
import javax.servlet.http.HttpSession;
=======
@@ -48,9 +51,13 @@ import org.apache.hupa.shared.data.UserI
import org.apache.hupa.shared.domain.Settings;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -61,6 +68,7 @@ public class LoginUserServiceImpl extend
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public User login(String username, String password) throws HupaException, MessagingException {
HttpSession httpSession = httpSessionProvider.get();
SessionUtils.cleanSessionAttributes(httpSession);
@@ -76,12 +84,16 @@ public class LoginUserServiceImpl extend
>>>>>>> alert people "invilid login" for the wrong username and/or password, which should be improved with a gentle way
SessionUtils.cleanSessionAttributes(httpSession);
=======
+=======
+ public User login(String username, String password) throws HupaException, MessagingException {
+>>>>>>> re-add server unit tests
HttpSession httpSession = httpSessionProvider.get();
SessionUtils.cleanSessionAttributes(httpSession);
>>>>>>> fix issue 5,6,8:
User user = new UserImpl();
user.setName(username);
user.setPassword(password);
+<<<<<<< HEAD
try {
cache.get(user);
} catch (Exception e) {
@@ -89,6 +101,9 @@ public class LoginUserServiceImpl extend
throw e;
}
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+=======
+ cache.get(user);
+>>>>>>> re-add server unit tests
user.setAuthenticated(true);
user.setSettings(settingsProvider.get());
httpSession.setAttribute(SConsts.USER_SESS_ATTR, user);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserService.java Thu Sep 12 03:35:54 2013
@@ -35,8 +35,13 @@ public interface LogoutUserService {
package org.apache.hupa.server.service;
import org.apache.hupa.shared.domain.LogoutUserResult;
+import org.apache.hupa.shared.exception.HupaException;
public interface LogoutUserService {
+<<<<<<< HEAD
LogoutUserResult logout();
>>>>>>> other RFs
+=======
+ LogoutUserResult logout() throws HupaException;
+>>>>>>> re-add server unit tests
}
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LogoutUserServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -33,6 +33,7 @@ import org.apache.hupa.shared.data.Logou
import org.apache.hupa.shared.domain.LogoutUserResult;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
public class LogoutUserServiceImpl extends AbstractService implements LogoutUserService {
@@ -44,6 +45,13 @@ public class LogoutUserServiceImpl exten
@Override
public LogoutUserResult logout() {
>>>>>>> other RFs
+=======
+import org.apache.hupa.shared.exception.HupaException;
+
+public class LogoutUserServiceImpl extends AbstractService implements LogoutUserService {
+ @Override
+ public LogoutUserResult logout() throws HupaException {
+>>>>>>> re-add server unit tests
User user = getUser();
user.setAuthenticated(false);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -42,9 +42,13 @@ import org.apache.hupa.server.utils.Mess
import org.apache.hupa.shared.domain.SendForwardMessageAction;
import org.apache.hupa.shared.domain.SendMessageAction;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> forward and reply message to use RF
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -62,10 +66,14 @@ public class SendForwardMessageServiceIm
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
<<<<<<< HEAD
+<<<<<<< HEAD
protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
=======
protected List getAttachments(SendMessageAction action) throws MessagingException {
>>>>>>> forward and reply message to use RF
+=======
+ protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
+>>>>>>> re-add server unit tests
SendForwardMessageAction forwardAction = (SendForwardMessageAction)action;
List<?> items = new ArrayList();
IMAPStore store = cache.get(getUser());
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendMessageBaseServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -76,9 +76,13 @@ import org.apache.hupa.shared.domain.Sen
import org.apache.hupa.shared.domain.SmtpMessage;
import org.apache.hupa.shared.domain.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> forward and reply message to use RF
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -214,9 +218,14 @@ public class SendMessageBaseServiceImpl
=======
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
* @throws IOException
+ * @throws HupaException
*/
+<<<<<<< HEAD
protected Message fillBody(Message message, SendMessageAction action) throws MessagingException, IOException {
>>>>>>> forward and reply message to use RF
+=======
+ protected Message fillBody(Message message, SendMessageAction action) throws MessagingException, IOException, HupaException {
+>>>>>>> re-add server unit tests
String html = restoreInlineLinks(action.getMessage().getText());
@@ -252,6 +261,7 @@ public class SendMessageBaseServiceImpl
* @param action
* @return A list of stored attachments
<<<<<<< HEAD
+<<<<<<< HEAD
* @throws HupaException
*/
@SuppressWarnings("rawtypes")
@@ -265,6 +275,12 @@ public class SendMessageBaseServiceImpl
FileItemRegistry registry = SessionUtils.getSessionRegistry(logger, httpSession);
>>>>>>> forward and reply message to use RF
=======
+=======
+ * @throws HupaException
+ */
+ @SuppressWarnings("rawtypes")
+ protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
+>>>>>>> re-add server unit tests
FileItemRegistry registry = SessionUtils.getSessionRegistry(logger, httpSessionProvider.get());
>>>>>>> fix issue 5,6,8:
List<MessageAttachment> attachments = action.getMessage().getMessageAttachments();
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java Thu Sep 12 03:35:54 2013
@@ -42,9 +42,13 @@ import org.apache.hupa.server.utils.Mess
import org.apache.hupa.shared.domain.SendMessageAction;
import org.apache.hupa.shared.domain.SendReplyMessageAction;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.exception.HupaException;
=======
>>>>>>> forward and reply message to use RF
+=======
+import org.apache.hupa.shared.exception.HupaException;
+>>>>>>> re-add server unit tests
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -62,10 +66,14 @@ public class SendReplyMessageServiceImpl
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
<<<<<<< HEAD
+<<<<<<< HEAD
protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
=======
protected List getAttachments(SendMessageAction action) throws MessagingException {
>>>>>>> forward and reply message to use RF
+=======
+ protected List getAttachments(SendMessageAction action) throws MessagingException, HupaException {
+>>>>>>> re-add server unit tests
SendReplyMessageAction replyAction = (SendReplyMessageAction)action;
List<?> items = new ArrayList();
IMAPStore store = cache.get(getUser());
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=1522221&r1=1522220&r2=1522221&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 Sep 12 03:35:54 2013
@@ -1,5 +1,8 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> re-add server unit tests
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -112,6 +115,7 @@ public class HupaGuiceTestCase{
}
}
}
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -235,3 +239,5 @@ public abstract class HupaGuiceTestCase
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> re-add server unit tests
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java Thu Sep 12 03:35:54 2013
@@ -30,10 +30,14 @@ import org.apache.hupa.server.IMAPStoreC
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> re-add server unit tests
import org.apache.hupa.server.InMemoryIMAPStoreCache;
import org.apache.hupa.server.guice.providers.DefaultUserSettingsProvider;
import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
import org.apache.hupa.server.ioc.demo.DemoGuiceServerModule.DemoIMAPStoreCache;
+<<<<<<< HEAD
=======
=======
import org.apache.hupa.server.InMemoryIMAPStoreCache;
@@ -64,14 +68,22 @@ import org.apache.hupa.server.handler.Se
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> re-add server unit tests
import org.apache.hupa.server.mock.MockConstants;
import org.apache.hupa.server.mock.MockHttpSessionProvider;
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.server.mock.MockLogProvider;
+<<<<<<< HEAD
import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
<<<<<<< HEAD
<<<<<<< HEAD
+=======
+import org.apache.hupa.server.preferences.InImapUserPreferencesStorage;
+import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
+import org.apache.hupa.server.preferences.UserPreferencesStorage;
+>>>>>>> re-add server unit tests
import org.apache.hupa.server.service.CheckSessionServiceImpl;
import org.apache.hupa.server.service.CreateFolderServiceImpl;
import org.apache.hupa.server.service.DeleteFolderServiceImpl;
@@ -128,6 +140,7 @@ import org.apache.hupa.shared.domain.Set
import org.apache.hupa.shared.domain.User;
import com.google.inject.Provider;
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -149,12 +162,17 @@ import com.google.inject.Provider;
=======
import com.google.inject.Provider;
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> re-add server unit tests
import com.google.inject.Singleton;
import com.google.inject.name.Names;
import com.sun.mail.imap.IMAPStore;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> re-add server unit tests
public class GuiceServerTestModule extends AbstractGuiceTestModule {
protected Class<? extends UserPreferencesStorage> userPreferencesStorageClass = InSessionUserPreferencesStorage.class;
@@ -247,6 +265,7 @@ public class GuiceServerTestModule exten
}
}
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -356,3 +375,5 @@ public class GuiceServerTestModule exten
}
>>>>>>> first commit
+=======
+>>>>>>> re-add server unit tests
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java Thu Sep 12 03:35:54 2013
@@ -40,7 +40,11 @@ public class FetchFolderServiceTest exte
@Test public void invalidSessionId() {
httpSession.removeAttribute(SConsts.USER_SESS_ATTR);
try {
+<<<<<<< HEAD
fetchFoldersService.fetch(new ImapFolderImpl(), false);
+=======
+ fetchFoldersService.fetch(new ImapFolderImpl());
+>>>>>>> re-add server unit tests
fail("Invalid session");
} catch (InvalidSessionException e) {
} catch (Exception e) {
@@ -52,7 +56,11 @@ public class FetchFolderServiceTest exte
@Test public void noFolders() {
httpSession.setAttribute(SConsts.USER_SESS_ATTR, testUser);
try {
+<<<<<<< HEAD
List<ImapFolder> folders = fetchFoldersService.fetch(null, false);
+=======
+ List<ImapFolder> folders = fetchFoldersService.fetch(null);
+>>>>>>> re-add server unit tests
assertTrue(folders.isEmpty());
} catch (Exception e) {
e.printStackTrace();
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java Thu Sep 12 03:35:54 2013
@@ -79,7 +79,11 @@ public class GetMessageDetailServiceTest
res = getMessageDetailsService.filterHtmlDocument(msg, "aFolder", 9999l);
assertNotSame(msg, res);
assertEquals("...\n...<img \n src='" +
+<<<<<<< HEAD
SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&"
+=======
+ SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?"
+>>>>>>> re-add server unit tests
+ SConsts.PARAM_FOLDER + "=aFolder&"
+ SConsts.PARAM_UID + "=9999&"
+ SConsts.PARAM_NAME + "=1.1934304663@web28309.mail.ukl.yahoo.com' name='cid:1.1934304663@web28309.mail.ukl.yahoo.com' width=200\n....", res);
@@ -193,7 +197,11 @@ public class GetMessageDetailServiceTest
// inline images have to be downloaded from the server
assertTrue(details.getText().contains("img src=\'" +
+<<<<<<< HEAD
SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" +
+=======
+ SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?" +
+>>>>>>> re-add server unit tests
SConsts.PARAM_FOLDER + "=WHATEVER&" +
SConsts.PARAM_UID + "=0&" +
SConsts.PARAM_NAME + "=1.1934304663@web28309.mail.ukl.yahoo.com'"));
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java Thu Sep 12 03:35:54 2013
@@ -20,6 +20,9 @@ package org.apache.hupa.server.utils;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> re-add server unit tests
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -35,6 +38,7 @@ import org.junit.Test;
public class MessageUtilsTest extends HupaGuiceTestCase {
@Test public void extractMessageAttachments() throws Exception {
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -60,6 +64,8 @@ public class MessageUtilsTest extends Hu
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> re-add server unit tests
Message message = TestUtils.createMockMimeMessage(session, 2);
List<BodyPart> parts = MessageUtils.extractMessageAttachments(logger, message.getContent());
assertEquals(2, parts.size());
@@ -67,6 +73,7 @@ public class MessageUtilsTest extends Hu
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@Test public void extractInlineAttachments() throws Exception {
=======
public void testExtractInlineAttachments() throws Exception {
@@ -74,6 +81,9 @@ public class MessageUtilsTest extends Hu
=======
public void testExtractInlineAttachments() throws Exception {
>>>>>>> first commit
+=======
+ @Test public void extractInlineAttachments() throws Exception {
+>>>>>>> re-add server unit tests
Message message = TestUtils.createMockMimeMessage(session, 1);
List<BodyPart> attachments = MessageUtils.extractMessageAttachments(logger, message.getContent());
@@ -99,6 +109,7 @@ public class MessageUtilsTest extends Hu
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@Test public void getRecipients () throws Exception {
=======
@@ -109,6 +120,10 @@ public class MessageUtilsTest extends Hu
public void testGetRecipients () throws Exception {
>>>>>>> constantly changed by manolo
+=======
+
+ @Test public void getRecipients () throws Exception {
+>>>>>>> re-add server unit tests
String encodedEmail = "=?ISO-8859-1?Q?Manolo_Pe=F1a?= <he...@hupa.org>";
String decodedEmail = MessageUtils.decodeText(encodedEmail);
assertFalse(encodedEmail.equals(decodedEmail));
@@ -118,6 +133,7 @@ public class MessageUtilsTest extends Hu
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> first commit
=======
@@ -126,4 +142,6 @@ public class MessageUtilsTest extends Hu
>>>>>>> first commit
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> re-add server unit tests
}
\ No newline at end of file
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java Thu Sep 12 03:35:54 2013
@@ -44,12 +44,16 @@ import org.apache.commons.fileupload.dis
import org.apache.hupa.server.FileItemRegistry;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> re-add server unit tests
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.service.SendMessageBaseServiceImpl;
import org.apache.hupa.shared.data.MessageAttachmentImpl;
import org.apache.hupa.shared.data.SmtpMessageImpl;
import org.apache.hupa.shared.domain.MessageAttachment;
import org.apache.hupa.shared.domain.SmtpMessage;
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -71,6 +75,8 @@ import org.apache.hupa.shared.data.SmtpM
import org.apache.hupa.shared.domain.MessageAttachment;
import org.apache.hupa.shared.domain.SmtpMessage;
>>>>>>> forward and reply message to use RF
+=======
+>>>>>>> re-add server unit tests
import com.sun.mail.imap.IMAPStore;
@@ -184,6 +190,7 @@ public class TestUtils extends TestCase
message.setSubject("Subject");
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
return SendMessageBaseServiceImpl.composeMessage(message, text, html, items);
=======
return AbstractSendMessageHandler.composeMessage(message, text, html, items);
@@ -191,6 +198,9 @@ public class TestUtils extends TestCase
=======
return AbstractSendMessageHandler.composeMessage(message, text, html, items);
>>>>>>> first commit
+=======
+ return SendMessageBaseServiceImpl.composeMessage(message, text, html, items);
+>>>>>>> re-add server unit tests
}
public static Message createMockMimeMessage(Session session, int nfiles) throws MessagingException, IOException {
@@ -211,6 +221,7 @@ public class TestUtils extends TestCase
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public static SmtpMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
=======
public static SMTPMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
@@ -221,6 +232,9 @@ public class TestUtils extends TestCase
=======
public static SmtpMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
>>>>>>> forward and reply message to use RF
+=======
+ public static SmtpMessage createMockSMTPMessage(FileItemRegistry registry, int nfiles) throws AddressException, MessagingException, IOException {
+>>>>>>> re-add server unit tests
ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
for (int i = 1; i <= nfiles; i++) {
@@ -231,6 +245,7 @@ public class TestUtils extends TestCase
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
MessageAttachment msgAttach = new MessageAttachmentImpl();
=======
MessageAttachment msgAttach = new MessageAttachment();
@@ -241,6 +256,9 @@ public class TestUtils extends TestCase
=======
MessageAttachment msgAttach = new MessageAttachmentImpl();
>>>>>>> try to get message details, problem is:
+=======
+ MessageAttachment msgAttach = new MessageAttachmentImpl();
+>>>>>>> re-add server unit tests
msgAttach.setName(fileItem.getFieldName());
msgAttach.setContentType(fileItem.getContentType());
msgAttach.setSize((int) fileItem.getSize());
@@ -251,6 +269,7 @@ public class TestUtils extends TestCase
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
SmtpMessage smtpMessage = new SmtpMessageImpl();
=======
SMTPMessage smtpMessage = new SMTPMessage();
@@ -261,6 +280,9 @@ public class TestUtils extends TestCase
=======
SmtpMessage smtpMessage = new SmtpMessageImpl();
>>>>>>> forward and reply message to use RF
+=======
+ SmtpMessage smtpMessage = new SmtpMessageImpl();
+>>>>>>> re-add server unit tests
smtpMessage.setFrom("Test user <fr...@dom.com>");
smtpMessage.setTo(new ArrayList<String>(Arrays.asList("to@dom.com")));
smtpMessage.setCc(new ArrayList<String>(Arrays.asList("cc@dom.com")));
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java?rev=1522221&r1=1522220&r2=1522221&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java Thu Sep 12 03:35:54 2013
@@ -1,5 +1,8 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> re-add server unit tests
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -29,6 +32,7 @@ public class InvalidSessionException ext
super(message);
}
}
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -73,3 +77,5 @@ public class InvalidSessionException ext
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> re-add server unit tests
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org