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/11 22:36:21 UTC
svn commit: r909158 - in
/james/hupa/trunk/server/src/test/java/org/apache/hupa/server: ./ handler/
utils/
Author: manolo
Date: Thu Feb 11 21:36:17 2010
New Revision: 909158
URL: http://svn.apache.org/viewvc?rev=909158&view=rev
Log:
Tests re-factoring to use HupaGuiceTestCase
Removed:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaTestCase.java
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java?rev=909158&r1=909157&r2=909158&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/AbtractSendMessageHandlerTest.java Thu Feb 11 21:36:17 2010
@@ -22,24 +22,19 @@
import com.sun.mail.imap.IMAPStore;
-import org.apache.hupa.server.HupaTestCase;
-import org.apache.hupa.server.IMAPStoreCache;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.guice.DemoModeConstants;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.utils.MessageUtils;
import org.apache.hupa.server.utils.SessionUtils;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.data.SMTPMessage;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.SendMessage;
import javax.mail.Message;
import javax.mail.Part;
-import javax.servlet.http.HttpSession;
-public class AbtractSendMessageHandlerTest extends HupaTestCase {
-
- User demouser = DemoModeConstants.demoUser;
+public class AbtractSendMessageHandlerTest extends HupaGuiceTestCase {
String contentTwoAttach = "multipart/mixed\n"
+ " multipart/alternative\n"
@@ -49,7 +44,6 @@
+ " mock/attachment => uploadedFile_2.bin\n";
public void testComposeMessage() throws Exception{
-
Message msg = TestUtils.createMockMimeMessage(session, "body", null, -1);
String exp = "text/plain\n";
assertEquals(exp, TestUtils.summaryzeContent(msg).toString());
@@ -102,13 +96,7 @@
}
public void testSendEmailWithAttachments() throws Exception {
-
- HttpSession httpSession = injector.getInstance(HttpSession.class);
- httpSession.setAttribute("user", demouser);
-
- IMAPStoreCache storeCache = injector.getInstance(IMAPStoreCache.class);
- IMAPStore store = storeCache.get(demouser);
-
+ IMAPStore store = storeCache.get(testUser);
MockIMAPFolder sentbox = (MockIMAPFolder) store.getFolder(DemoModeConstants.DEMO_MODE_SENT_FOLDER);
SMTPMessage smtpmsg = TestUtils.createMockSMTPMessage(SessionUtils.getSessionRegistry(logger, httpSession), 2);
@@ -119,15 +107,14 @@
assertEquals(contentTwoAttach, TestUtils.summaryzeContent(message).toString());
- abstSendMsgHndl.sendMessage(session, demouser, message);
-
+ abstSendMsgHndl.sendMessage(session, testUser, message);
// The reported size is wrong before the message has been saved
Part part = MessageUtils.handleMultiPart(logger, message.getContent(), "uploadedFile_1.bin");
assertTrue(part.getSize() < 0);
assertTrue(sentbox.getMessages().length == 0);
- abstSendMsgHndl.saveSentMessage(session, demouser, message);
+ abstSendMsgHndl.saveSentMessage(session, testUser, message);
assertTrue(sentbox.getMessages().length == 1);
message = sentbox.getMessage(0);
@@ -137,17 +124,10 @@
// After saving the message, the reported size has to be OK
part = MessageUtils.handleMultiPart(logger, message.getContent(), "uploadedFile_1.bin");
assertTrue(part.getSize() > 0);
-
}
public void testExecute() throws Exception {
-
- HttpSession httpSession = injector.getInstance(HttpSession.class);
- httpSession.setAttribute("user", demouser);
-
- IMAPStoreCache storeCache = injector.getInstance(IMAPStoreCache.class);
- IMAPStore store = storeCache.get(demouser);
-
+ IMAPStore store = storeCache.get(testUser);
MockIMAPFolder sentbox = (MockIMAPFolder) store.getFolder(DemoModeConstants.DEMO_MODE_SENT_FOLDER);
SMTPMessage smtpmsg = TestUtils.createMockSMTPMessage(SessionUtils.getSessionRegistry(logger, httpSession), 2);
@@ -161,6 +141,5 @@
Part part = MessageUtils.handleMultiPart(logger, message.getContent(), "uploadedFile_1.bin");
assertTrue(part.getSize() > 0);
-
}
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java?rev=909158&r1=909157&r2=909158&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java Thu Feb 11 21:36:17 2010
@@ -2,21 +2,12 @@
import junit.framework.Assert;
-import org.apache.hupa.server.HupaTestCase;
-import org.apache.hupa.server.guice.DemoModeConstants;
-import org.apache.hupa.shared.data.User;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.shared.rpc.Contacts;
-import javax.servlet.http.HttpSession;
-
-
-public class ContactsHandlerTest extends HupaTestCase {
+public class ContactsHandlerTest extends HupaGuiceTestCase {
public void testContactsHandler() throws Exception {
- User demouser = DemoModeConstants.demoUser;
- HttpSession httpSession = injector.getInstance(HttpSession.class);
- httpSession.setAttribute("user", demouser);
-
Assert.assertEquals(0, contactsHandler.execute(new Contacts(), null).getContacts().length);
userPreferences.addContact("Somebody <so...@foo.com>");
userPreferences.addContact(" Some.body <so...@foo.com> ");
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java?rev=909158&r1=909157&r2=909158&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java Thu Feb 11 21:36:17 2010
@@ -22,30 +22,20 @@
import com.sun.mail.imap.IMAPStore;
import org.apache.hupa.server.FileItemRegistry;
-import org.apache.hupa.server.HupaTestCase;
-import org.apache.hupa.server.IMAPStoreCache;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.guice.DemoModeConstants;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.SMTPMessage;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.ForwardMessage;
import javax.mail.Message;
-import javax.servlet.http.HttpSession;
-public class FowardMessageHandlerTest extends HupaTestCase {
+public class FowardMessageHandlerTest extends HupaGuiceTestCase {
public void testForwardMessage() throws Exception {
-
- User demouser = DemoModeConstants.demoUser;
-
- HttpSession httpSession = injector.getInstance(HttpSession.class);
- httpSession.setAttribute("user", demouser);
-
- IMAPStoreCache storeCache = injector.getInstance(IMAPStoreCache.class);
- IMAPStore store = storeCache.get(demouser);
+ IMAPStore store = storeCache.get(testUser);
FileItemRegistry registry = injector.getInstance(FileItemRegistry.class);
@@ -76,7 +66,6 @@
+ " mock/attachment => file_2.bin\n";
assertEquals(expected, TestUtils.summaryzeContent(message).toString());
-
}
}
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java?rev=909158&r1=909157&r2=909158&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java Thu Feb 11 21:36:17 2010
@@ -22,22 +22,18 @@
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
-import org.apache.hupa.server.HupaTestCase;
-import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.server.guice.DemoModeConstants;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.MessageDetails;
-import org.apache.hupa.shared.data.User;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.internet.MimeMessage;
-public class GetMessageDetailsHandlerTest extends HupaTestCase {
+public class GetMessageDetailsHandlerTest extends HupaGuiceTestCase {
public void testTextDocumentToHtml() throws Exception {
-
String msg = "...\nhttp://www.example.com/path/action.do;s=1;a=2?p=abcd\n...";
String res = getDetailsMsgHndl.txtDocumentToHtml(msg, "aFolder", 9999l);
assertNotSame(msg, res);
@@ -58,7 +54,6 @@
}
public void testFilterHtmlDocument() throws Exception {
-
String msg = "<div>...\nhttp://whatever\n...</div>";
String res = getDetailsMsgHndl.txtDocumentToHtml(msg, "aFolder", 9999l);
assertNotSame(msg, res);
@@ -97,7 +92,6 @@
res = getDetailsMsgHndl.filterHtmlDocument("", "aFolder", 9999l);
assertTrue(res.length()==0);
-
}
public void testRegexEmailsInsideTagAttributes() {
@@ -166,11 +160,7 @@
}
public void testMessageDetails_html_with_inline_images() throws Exception {
-
- User demouser = DemoModeConstants.demoUser;
-
- IMAPStoreCache storeCache = injector.getInstance(IMAPStoreCache.class);
- IMAPStore store = storeCache.get(demouser);
+ IMAPStore store = storeCache.get(testUser);
IMAPFolder serverfolder = (IMAPFolder)store.getFolder("WHATEVER");
serverfolder.create(Folder.HOLDS_MESSAGES);
@@ -179,7 +169,7 @@
serverfolder.addMessages(new Message[]{msg});
org.apache.hupa.shared.data.IMAPFolder clientfolder = new org.apache.hupa.shared.data.IMAPFolder("WHATEVER");
- MessageDetails details = getDetailsMsgHndl.exposeMessage(demouser, clientfolder, 0);
+ MessageDetails details = getDetailsMsgHndl.exposeMessage(testUser, clientfolder, 0);
// inline images have to be downloaded from the server
assertTrue(details.getText().contains("img src=\'" +
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java?rev=909158&r1=909157&r2=909158&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java Thu Feb 11 21:36:17 2010
@@ -16,37 +16,26 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.hupa.server.handler;
-
import com.sun.mail.imap.IMAPStore;
import org.apache.hupa.server.FileItemRegistry;
-import org.apache.hupa.server.HupaTestCase;
-import org.apache.hupa.server.IMAPStoreCache;
+import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.guice.DemoModeConstants;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.utils.SessionUtils;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.SMTPMessage;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.ReplyMessage;
import javax.mail.Message;
-import javax.servlet.http.HttpSession;
-public class ReplyMessageHandlerTest extends HupaTestCase {
+public class ReplyMessageHandlerTest extends HupaGuiceTestCase {
public void testForwardMessage() throws Exception {
- User demouser = DemoModeConstants.demoUser;
-
- HttpSession httpSession = injector.getInstance(HttpSession.class);
- httpSession.setAttribute("user", demouser);
-
- IMAPStoreCache storeCache = injector.getInstance(IMAPStoreCache.class);
- IMAPStore store = storeCache.get(demouser);
+ IMAPStore store = storeCache.get(testUser);
FileItemRegistry registry = SessionUtils.getSessionRegistry(logger, httpSession);
@@ -90,6 +79,5 @@
+ " mock/attachment => uploadedFile_1.bin\n";
assertEquals(expected, TestUtils.summaryzeContent(message).toString());
-
}
}
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=909158&r1=909157&r2=909158&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 Feb 11 21:36:17 2010
@@ -1,28 +1,39 @@
+/****************************************************************
+ * 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.utils;
+import org.apache.hupa.server.HupaGuiceTestCase;
+
import java.util.List;
import javax.mail.BodyPart;
import javax.mail.Message;
-import javax.mail.Session;
-
-import org.apache.commons.logging.Log;
-import org.apache.hupa.server.HupaTestCase;
-public class MessageUtilsTest extends HupaTestCase {
+public class MessageUtilsTest extends HupaGuiceTestCase {
public void testExtractMessageAttachments() throws Exception {
- Session session = injector.getInstance(Session.class);
- Log logger = injector.getInstance(Log.class);
Message message = TestUtils.createMockMimeMessage(session, 2);
List<BodyPart> parts = MessageUtils.extractMessageAttachments(logger, message.getContent());
assertEquals(2, parts.size());
}
public void testExtractInlineAttachments() throws Exception {
- Session session = injector.getInstance(Session.class);
- Log logger = injector.getInstance(Log.class);
-
Message message = TestUtils.createMockMimeMessage(session, 1);
List<BodyPart> attachments = MessageUtils.extractMessageAttachments(logger, message.getContent());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org