Author: felixk
Date: Mon Sep 26 10:06:09 2011
New Revision: 1175763
URL: http://svn.apache.org/viewvc?rev=1175763&view=rev
Log:
Refactor mock objects to own module (HUPA-79)
Added:
james/hupa/trunk/mock/ (with props)
james/hupa/trunk/mock/pom.xml (with props)
james/hupa/trunk/mock/src/
james/hupa/trunk/mock/src/main/
james/hupa/trunk/mock/src/main/java/
james/hupa/trunk/mock/src/main/java/org/
james/hupa/trunk/mock/src/main/java/org/apache/
james/hupa/trunk/mock/src/main/java/org/apache/hupa/
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java
- copied, changed from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
- copied unchanged from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java
- copied unchanged from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
- copied, changed from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
- copied, changed from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockLog.java
- copied unchanged from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockLog.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockLogProvider.java
- copied unchanged from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockLogProvider.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java
- copied, changed from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java
james/hupa/trunk/mock/src/main/resources/
- copied from r1175182, james/hupa/trunk/server/src/main/resources/
Removed:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/
james/hupa/trunk/server/src/main/resources/
Modified:
james/hupa/trunk/pom.xml
james/hupa/trunk/server/pom.xml
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/IdleHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/PrepareNewMessageHandler.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java
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/FowardMessageHandlerTest.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/integration/StoreBugTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java
Propchange: james/hupa/trunk/mock/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 26 10:06:09 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Added: james/hupa/trunk/mock/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1175763&view=auto
==============================================================================
--- james/hupa/trunk/mock/pom.xml (added)
+++ james/hupa/trunk/mock/pom.xml Mon Sep 26 10:06:09 2011
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-mock</artifactId>
+ <name>hupa-mock</name>
+ <description>Mock objects for hupa</description>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <build>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-shared</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.customware.gwt.dispatch
+ </groupId>
+ <artifactId>gwt-dispatch</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>gwtupload</groupId>
+ <artifactId>gwtupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: james/hupa/trunk/mock/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/hupa/trunk/mock/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java
(from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java?p2=james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java&p1=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java&r1=1175182&r2=1175763&rev=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/DemoModeConstants.java
Mon Sep 26 10:06:09 2011
@@ -19,53 +19,42 @@
package org.apache.hupa.server.guice;
+import org.apache.hupa.server.mock.MockIMAPStore;
+import org.apache.hupa.server.mock.MockSMTPTransport;
import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
import java.util.Properties;
/**
- * Constants and properties used for demo mode
+ * Constants and properties used for mock mode
*/
public class DemoModeConstants {
-
- private static final long serialVersionUID = 1L;
-
- public static final String DEMO_MODE = "demo-mode";
- public static final String DEMO_LOGIN = "demo";
-
- public static final String DEMO_MODE_SENT_FOLDER = "Demo-Sent";
- public static final String DEMO_MODE_TRASH_FOLDER = "Demo-Trash";
- public static final String DEMO_MODE_INBOX_FOLDER = "Demo-Inbox";
- public static final String DEMO_MODE_DRAFTS_FOLDER = "Demo-Drafts";
- public static final String DEMO_MODE_DEFAULT_FOLDER = "";
-
- public static final String DEMO_MODE_MESSAGES_LOCATION = "mime/";
-
+
public final static Settings mockSettings = new Settings() {
private static final long serialVersionUID = 1L;
{
- setInboxFolderName(DEMO_MODE_INBOX_FOLDER);
- setSentFolderName(DEMO_MODE_SENT_FOLDER);
- setTrashFolderName(DEMO_MODE_TRASH_FOLDER);
- setDraftsFolderName(DEMO_MODE_DRAFTS_FOLDER);
+ setInboxFolderName(MockIMAPStore.MOCK_INBOX_FOLDER);
+ setSentFolderName(MockIMAPStore.MOCK_SENT_FOLDER);
+ setTrashFolderName(MockIMAPStore.MOCK_TRASH_FOLDER);
+ setDraftsFolderName(MockIMAPStore.MOCK_DRAFTS_FOLDER);
}
};
public final static Properties demoProperties = new Properties() {
private static final long serialVersionUID = 1L;
{
- put("Username",DEMO_LOGIN);
- put("Password",DEMO_LOGIN);
+ put("Username",MockIMAPStore.MOCK_LOGIN);
+ put("Password",MockIMAPStore.MOCK_LOGIN);
- put("IMAPServerAddress", DEMO_MODE);
- put("IMAPServerPort", "143");
+ put("IMAPServerAddress", MockSMTPTransport.MOCK_HOST);
+ put("IMAPServerPort", MockSMTPTransport.MOCK_PORT.toString());
put("IMAPS", "false");
put("TrustStore", "my-truststore");
put("TrustStorePassword", "my-truststore-password");
- put("SMTPServerAddress", DEMO_MODE);
+ put("SMTPServerAddress", MockSMTPTransport.MOCK_HOST);
put("SMTPServerPort", "25");
put("SMTPS", "false");
put("SMTPAuth", "false");
@@ -75,10 +64,10 @@ public class DemoModeConstants {
put("IMAPConnectionPoolSize", "4");
put("IMAPConnectionPoolTimeout", "300000");
- put("DefaultInboxFolder", DEMO_MODE_INBOX_FOLDER);
- put("DefaultTrashFolder", DEMO_MODE_TRASH_FOLDER);
- put("DefaultSentFolder", DEMO_MODE_SENT_FOLDER);
- put("DefaultDraftsFolder", DEMO_MODE_DRAFTS_FOLDER);
+ put("DefaultInboxFolder", MockIMAPStore.MOCK_INBOX_FOLDER);
+ put("DefaultTrashFolder", MockIMAPStore.MOCK_TRASH_FOLDER);
+ put("DefaultSentFolder", MockIMAPStore.MOCK_SENT_FOLDER);
+ put("DefaultDraftsFolder", MockIMAPStore.MOCK_DRAFTS_FOLDER);
put("PostFetchMessageCount", "0");
@@ -89,18 +78,18 @@ public class DemoModeConstants {
public final static Settings demoUserSettings = new Settings() {
private static final long serialVersionUID = 1L;
{
- setInboxFolderName(DEMO_MODE_INBOX_FOLDER);
- setSentFolderName(DEMO_MODE_SENT_FOLDER);
- setTrashFolderName(DEMO_MODE_TRASH_FOLDER);
- setDraftsFolderName(DEMO_MODE_DRAFTS_FOLDER);
+ setInboxFolderName(MockIMAPStore.MOCK_INBOX_FOLDER);
+ setSentFolderName(MockIMAPStore.MOCK_SENT_FOLDER);
+ setTrashFolderName(MockIMAPStore.MOCK_TRASH_FOLDER);
+ setDraftsFolderName(MockIMAPStore.MOCK_DRAFTS_FOLDER);
}
};
public final static User demoUser = new User() {
private static final long serialVersionUID = 1L;
{
- setName(DEMO_LOGIN);
- setPassword(DEMO_LOGIN);
+ setName(MockIMAPStore.MOCK_LOGIN);
+ setPassword(MockIMAPStore.MOCK_LOGIN);
setSettings(demoUserSettings);
}
};
Copied:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
(from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java?p2=james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java&p1=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java&r1=1175182&r2=1175763&rev=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
Mon Sep 26 10:06:09 2011
@@ -22,8 +22,6 @@ package org.apache.hupa.server.mock;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
-import org.apache.hupa.server.guice.DemoModeConstants;
-
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
@@ -43,12 +41,15 @@ import javax.mail.search.SearchTerm;
public class MockIMAPFolder extends IMAPFolder {
public static final char SEPARATOR = '.';
+ public static final String MOCK_DEFAULT_FOLDER = "";
+ public static final String MOCK_MESSAGES_LOCATION = "mime/";
+
public List<Message> messages = new ArrayList<Message>();
private boolean closed = true;
private boolean exists;
public MockIMAPFolder(String fullName, IMAPStore store) {
- super(fullName,
(DemoModeConstants.DEMO_MODE_DEFAULT_FOLDER.equals(fullName) ? '\0' :
SEPARATOR), store, false);
+ super(fullName, (MOCK_DEFAULT_FOLDER.equals(fullName) ? '\0' :
SEPARATOR), store, false);
}
@Override
@@ -87,13 +88,13 @@ public class MockIMAPFolder extends IMAP
}
- public void loadDemoMessages(Session session) throws MessagingException {
+ public synchronized void loadDemoMessages(Session session) throws
MessagingException {
if (!exists()) {
create(IMAPFolder.HOLDS_MESSAGES);
open(Folder.READ_WRITE);
}
for(int i=0;;i++) {
- String name = DemoModeConstants.DEMO_MODE_MESSAGES_LOCATION + i +
".msg";
+ String name = MOCK_MESSAGES_LOCATION + i + ".msg";
InputStream is =
Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
if (is == null) break;
addMessages(new Message[]{new MimeMessage(session, is)});
Copied:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
(from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java?p2=james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java&p1=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java&r1=1175182&r2=1175763&rev=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPStore.java
Mon Sep 26 10:06:09 2011
@@ -30,19 +30,22 @@ import javax.mail.Provider;
import javax.mail.Session;
import javax.mail.URLName;
-import org.apache.hupa.server.guice.DemoModeConstants;
-
import com.google.inject.Inject;
import com.sun.mail.imap.IMAPStore;
public class MockIMAPStore extends IMAPStore{
+ public final static String MOCK_INBOX_FOLDER = "Mock-Inbox";
+ public final static String MOCK_SENT_FOLDER = "Mock-Sent";
+ public final static String MOCK_TRASH_FOLDER = "Mock-Trash";
+ public final static String MOCK_DRAFTS_FOLDER = "Mock-Drafts";
+ public final static String MOCK_LOGIN = "mock-login";
private Map<String, String> validLogins = new HashMap<String, String>();
private Map<String, Integer> validServers = new HashMap<String, Integer>();
private boolean connected = false;
private List<MockIMAPFolder> folders = new ArrayList<MockIMAPFolder>();
private List<String> capList;
- static final URLName demoUrl = new URLName(null,
DemoModeConstants.DEMO_MODE, 143, null, null, null);
+ static final URLName demoUrl = new URLName(null,
MockSMTPTransport.MOCK_HOST, MockSMTPTransport.MOCK_PORT, null, null, null);
/**
* Default constructor, it creates the folder structure and loads messages
for demo
@@ -57,15 +60,15 @@ public class MockIMAPStore extends IMAPS
*/
public MockIMAPStore(Session session, URLName url) {
super(session, url);
- if (url != null && DemoModeConstants.DEMO_MODE.equals(url.getHost())) {
- validServers.put(DemoModeConstants.DEMO_MODE, 143);
- validLogins.put(DemoModeConstants.DEMO_LOGIN,
DemoModeConstants.DEMO_LOGIN);
+ if (url != null && MockSMTPTransport.MOCK_HOST.equals(url.getHost())) {
+ validServers.put(MockSMTPTransport.MOCK_HOST,
MockSMTPTransport.MOCK_PORT);
+ validLogins.put(MOCK_LOGIN, MOCK_LOGIN);
try {
- new MockIMAPFolder(DemoModeConstants.DEMO_MODE_INBOX_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
- new MockIMAPFolder(DemoModeConstants.DEMO_MODE_SENT_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
- new MockIMAPFolder(DemoModeConstants.DEMO_MODE_TRASH_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
- new MockIMAPFolder(DemoModeConstants.DEMO_MODE_DRAFTS_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
-
((MockIMAPFolder)getFolder(DemoModeConstants.DEMO_MODE_INBOX_FOLDER)).loadDemoMessages(session);
+ new MockIMAPFolder(MOCK_INBOX_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
+ new MockIMAPFolder(MOCK_SENT_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
+ new MockIMAPFolder(MOCK_TRASH_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
+ new MockIMAPFolder(MOCK_DRAFTS_FOLDER,
this).create(Folder.HOLDS_FOLDERS | Folder.HOLDS_MESSAGES);
+
((MockIMAPFolder)getFolder(MOCK_INBOX_FOLDER)).loadDemoMessages(session);
} catch (Exception e) {
e.printStackTrace();
}
@@ -114,9 +117,9 @@ public class MockIMAPStore extends IMAPS
public List<MockIMAPFolder> getChilds(MockIMAPFolder folder) {
List<MockIMAPFolder> childs = new ArrayList<MockIMAPFolder>();
- if
(DemoModeConstants.DEMO_MODE_DEFAULT_FOLDER.equals(folder.getFullName())) {
+ if (MockIMAPFolder.MOCK_DEFAULT_FOLDER.equals(folder.getFullName())) {
for(MockIMAPFolder f: folders) {
- if (!
DemoModeConstants.DEMO_MODE_DEFAULT_FOLDER.equals(f.getFullName()))
+ if (!
MockIMAPFolder.MOCK_DEFAULT_FOLDER.equals(f.getFullName()))
childs.add(f);
}
return folders;
@@ -151,7 +154,7 @@ public class MockIMAPStore extends IMAPS
@Override
public synchronized Folder getDefaultFolder() throws MessagingException {
- return getFolder(DemoModeConstants.DEMO_MODE_DEFAULT_FOLDER);
+ return getFolder(MockIMAPFolder.MOCK_DEFAULT_FOLDER);
}
@Override
Copied:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java
(from r1175182,
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java?p2=james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java&p1=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java&r1=1175182&r2=1175763&rev=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockSMTPTransport.java
Mon Sep 26 10:06:09 2011
@@ -29,14 +29,15 @@ import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.URLName;
-import org.apache.hupa.server.guice.DemoModeConstants;
-
public class MockSMTPTransport extends Transport {
- static final URLName demoUrl = new URLName(null,
DemoModeConstants.DEMO_MODE, 143, null, null, null);
+ public static final String MOCK_HOST = "mock-host";
+ public static final Integer MOCK_PORT = 143;
+
+ static final URLName mockUrl = new URLName(null, MOCK_HOST, MOCK_PORT,
null, null, null);
public MockSMTPTransport(Session session) {
- super(session, demoUrl);
+ super(session, mockUrl);
}
@Override
Modified: james/hupa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Mon Sep 26 10:06:09 2011
@@ -37,6 +37,7 @@
</prerequisites>
<modules>
+ <module>mock</module>
<module>shared</module>
<module>client</module>
<module>server</module>
@@ -453,6 +454,11 @@
<dependencies>
<dependency>
<groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-mock</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
<artifactId>hupa-server</artifactId>
<version>${project.version}</version>
</dependency>
Modified: james/hupa/trunk/server/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Mon Sep 26 10:06:09 2011
@@ -55,6 +55,10 @@
<dependencies>
<dependency>
<groupId>org.apache.hupa</groupId>
+ <artifactId>hupa-mock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hupa</groupId>
<artifactId>hupa-shared</artifactId>
</dependency>
<dependency>
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
Mon Sep 26 10:06:09 2011
@@ -19,18 +19,6 @@
package org.apache.hupa.server;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-import com.google.inject.name.Named;
-
-import com.sun.mail.imap.IMAPStore;
-
-import org.apache.commons.logging.Log;
-import org.apache.hupa.server.guice.DemoModeConstants;
-import org.apache.hupa.server.mock.MockIMAPStore;
-import org.apache.hupa.shared.data.User;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -39,6 +27,17 @@ import javax.mail.MessagingException;
import javax.mail.NoSuchProviderException;
import javax.mail.Session;
+import org.apache.commons.logging.Log;
+import org.apache.hupa.server.mock.MockIMAPStore;
+import org.apache.hupa.server.mock.MockSMTPTransport;
+import org.apache.hupa.shared.data.User;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import com.sun.mail.imap.IMAPStore;
+
@Singleton
public class InMemoryIMAPStoreCache implements IMAPStoreCache{
@@ -134,7 +133,7 @@ public class InMemoryIMAPStoreCache impl
private CachedIMAPStore createCachedIMAPStore() throws
NoSuchProviderException {
CachedIMAPStore cstore;
- if (DemoModeConstants.DEMO_MODE.equals(this.address)) {
+ if (MockSMTPTransport.MOCK_HOST.equals(this.address)) {
cstore = new CachedIMAPStore(new MockIMAPStore(session), 300);
} else if (useSSL) {
cstore = new
CachedIMAPStore((IMAPStore)session.getStore("imaps"),300);
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerModule.java?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerModule.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerModule.java
Mon Sep 26 10:06:09 2011
@@ -102,8 +102,6 @@ public class GuiceServerModule extends A
private String configDir;
- private boolean demoMode = false;
-
public GuiceServerModule(String rootPath) {
configDir = rootPath + "/" + CONF_DIR;
}
@@ -174,12 +172,6 @@ public class GuiceServerModule extends A
properties = loadProperties(configDir + CONFIG_FILE_NAME);
}
- // Put Hupa in demo mode
- demoMode =
DemoModeConstants.DEMO_MODE.equals(properties.get("IMAPServerAddress"));
- if (demoMode) {
- properties = DemoModeConstants.demoProperties;
- }
-
// Validate for mandatory and complete properties with default values
return validateProperties(properties);
}
@@ -206,7 +198,7 @@ public class GuiceServerModule extends A
errors.add("The Property '" + key + "' has no configuration
impacts, it's unknown");
}
}
- if (!demoMode && !errors.isEmpty()) {
+ if (!errors.isEmpty()) {
throw new IllegalArgumentException(errors.toString());
}
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
Mon Sep 26 10:06:09 2011
@@ -31,19 +31,19 @@ import javax.activation.DataSource;
import javax.mail.Address;
import javax.mail.AuthenticationFailedException;
import javax.mail.BodyPart;
+import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Session;
import javax.mail.Transport;
-import javax.mail.Flags.Flag;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimeMessage.RecipientType;
+import javax.mail.internet.MimeMultipart;
import javax.servlet.http.HttpSession;
import net.customware.gwt.dispatch.server.ExecutionContext;
@@ -53,7 +53,6 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.logging.Log;
import org.apache.hupa.server.FileItemRegistry;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.server.guice.DemoModeConstants;
import org.apache.hupa.server.mock.MockSMTPTransport;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
import org.apache.hupa.server.utils.MessageUtils;
@@ -247,7 +246,7 @@ public abstract class AbstractSendMessag
protected void sendMessage(Session session, User user, Message message)
throws MessagingException {
Transport transport;
- if (DemoModeConstants.DEMO_MODE.equals(address)) {
+ if (MockSMTPTransport.MOCK_HOST.equals(address)) {
transport = new MockSMTPTransport(session);
} else if (useSSL) {
transport = session.getTransport("smtps");
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/IdleHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/IdleHandler.java?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/IdleHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/IdleHandler.java
Mon Sep 26 10:06:09 2011
@@ -26,7 +26,7 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.server.guice.DemoModeConstants;
+import org.apache.hupa.server.mock.MockSMTPTransport;
import org.apache.hupa.shared.rpc.Idle;
import org.apache.hupa.shared.rpc.IdleResult;
@@ -57,7 +57,7 @@ public class IdleHandler extends Abstrac
IMAPStore store = cache.get(getUser());
if (store.getURLName() != null &&
-
!DemoModeConstants.DEMO_MODE.equals(store.getURLName().getHost()) ) {
+
!MockSMTPTransport.MOCK_HOST.equals(store.getURLName().getHost()) ) {
// check if the store supports the IDLE command
if (store.hasCapability("IDLE")) {
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/PrepareNewMessageHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/PrepareNewMessageHandler.java?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/PrepareNewMessageHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/PrepareNewMessageHandler.java
Mon Sep 26 10:06:09 2011
@@ -26,7 +26,7 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.server.guice.DemoModeConstants;
+import org.apache.hupa.server.mock.MockSMTPTransport;
import org.apache.hupa.shared.rpc.Idle;
import org.apache.hupa.shared.rpc.IdleResult;
@@ -56,7 +56,7 @@ public class PrepareNewMessageHandler ex
try {
IMAPStore store = cache.get(getUser());
if (store.getURLName() != null &&
-
!DemoModeConstants.DEMO_MODE.equals(store.getURLName().getHost()) ) {
+
!MockSMTPTransport.MOCK_HOST.equals(store.getURLName().getHost()) ) {
// just send a noop to keep the connection alive
store.idle();
}
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java
Mon Sep 26 10:06:09 2011
@@ -19,11 +19,15 @@
package org.apache.hupa.server.guice;
import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Properties;
import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
+import org.apache.hupa.server.mock.MockIMAPStore;
+import org.apache.hupa.server.mock.MockSMTPTransport;
import org.junit.Before;
import org.junit.Test;
@@ -90,9 +94,18 @@ public class ServerModulTest {
public void testLoadDemoProperties() throws Exception {
File tmp = File.createTempFile("foo", ".properties");
tmp.deleteOnExit();
- FileUtils.writeStringToFile(tmp, "IMAPServerAddress=" +
DemoModeConstants.DEMO_MODE);
+ Collection<String> lines = new ArrayList<String>();
+ lines.add("IMAPServerAddress = " + MockSMTPTransport.MOCK_HOST);
+ lines.add("IMAPServerPort = " + MockSMTPTransport.MOCK_PORT);
+ lines.add("SMTPServerAddress = " + MockSMTPTransport.MOCK_HOST);
+ lines.add("SMTPServerPort = " + MockSMTPTransport.MOCK_PORT);
+ lines.add("DefaultInboxFolder = " + MockIMAPStore.MOCK_INBOX_FOLDER);
+ lines.add("DefaultTrashFolder = " + MockIMAPStore.MOCK_TRASH_FOLDER);
+ lines.add("DefaultSentFolder = " + MockIMAPStore.MOCK_SENT_FOLDER);
+ lines.add("DefaultDraftsFolder = " + MockIMAPStore.MOCK_DRAFTS_FOLDER);
+ FileUtils.writeLines(tmp, lines);
- System.setProperty(GuiceServerModule.SYS_PROP_CONFIG_FILE,
tmp.toString());
+ System.setProperty(GuiceServerModule.SYS_PROP_CONFIG_FILE,
tmp.getAbsolutePath());
Properties p = module.loadProperties();
Assert.assertNotNull(p);
Assert.assertEquals(DemoModeConstants.mockSettings.getInboxFolderName(),
p.get("DefaultInboxFolder"));
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=1175763&r1=1175762&r2=1175763&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
Mon Sep 26 10:06:09 2011
@@ -20,19 +20,19 @@
package org.apache.hupa.server.handler;
-import com.sun.mail.imap.IMAPStore;
+import javax.mail.Message;
+import javax.mail.Part;
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.mock.MockIMAPStore;
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.rpc.SendMessage;
-import javax.mail.Message;
-import javax.mail.Part;
+import com.sun.mail.imap.IMAPStore;
public class AbtractSendMessageHandlerTest extends HupaGuiceTestCase {
@@ -97,7 +97,7 @@ public class AbtractSendMessageHandlerTe
public void testSendEmailWithAttachments() throws Exception {
IMAPStore store = storeCache.get(testUser);
- MockIMAPFolder sentbox = (MockIMAPFolder)
store.getFolder(DemoModeConstants.DEMO_MODE_SENT_FOLDER);
+ MockIMAPFolder sentbox = (MockIMAPFolder)
store.getFolder(MockIMAPStore.MOCK_SENT_FOLDER);
SMTPMessage smtpmsg =
TestUtils.createMockSMTPMessage(SessionUtils.getSessionRegistry(logger,
httpSession), 2);
SendMessage action = new SendMessage(smtpmsg);
@@ -128,7 +128,7 @@ public class AbtractSendMessageHandlerTe
public void testExecute() throws Exception {
IMAPStore store = storeCache.get(testUser);
- MockIMAPFolder sentbox = (MockIMAPFolder)
store.getFolder(DemoModeConstants.DEMO_MODE_SENT_FOLDER);
+ MockIMAPFolder sentbox = (MockIMAPFolder)
store.getFolder(MockIMAPStore.MOCK_SENT_FOLDER);
SMTPMessage smtpmsg =
TestUtils.createMockSMTPMessage(SessionUtils.getSessionRegistry(logger,
httpSession), 2);
SendMessage action = new SendMessage(smtpmsg);
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=1175763&r1=1175762&r2=1175763&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
Mon Sep 26 10:06:09 2011
@@ -19,18 +19,18 @@
package org.apache.hupa.server.handler;
-import com.sun.mail.imap.IMAPStore;
+import javax.mail.Message;
import org.apache.hupa.server.FileItemRegistry;
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.mock.MockIMAPStore;
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.rpc.ForwardMessage;
-import javax.mail.Message;
+import com.sun.mail.imap.IMAPStore;
public class FowardMessageHandlerTest extends HupaGuiceTestCase {
@@ -39,10 +39,10 @@ public class FowardMessageHandlerTest ex
FileItemRegistry registry =
injector.getInstance(FileItemRegistry.class);
- MockIMAPFolder sentbox = (MockIMAPFolder)
store.getFolder(DemoModeConstants.DEMO_MODE_SENT_FOLDER);
+ MockIMAPFolder sentbox = (MockIMAPFolder)
store.getFolder(MockIMAPStore.MOCK_SENT_FOLDER);
assertTrue(sentbox.getMessages().length == 0);
- MockIMAPFolder inbox = (MockIMAPFolder)
store.getFolder(DemoModeConstants.DEMO_MODE_INBOX_FOLDER);
+ MockIMAPFolder inbox = (MockIMAPFolder)
store.getFolder(MockIMAPStore.MOCK_INBOX_FOLDER);
assertTrue(inbox.getMessages().length >= 0);
Message message = TestUtils.createMockMimeMessage(session, 2);
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=1175763&r1=1175762&r2=1175763&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
Mon Sep 26 10:06:09 2011
@@ -18,19 +18,19 @@
****************************************************************/
package org.apache.hupa.server.handler;
-import com.sun.mail.imap.IMAPStore;
+import javax.mail.Message;
import org.apache.hupa.server.FileItemRegistry;
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.mock.MockIMAPStore;
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.rpc.ReplyMessage;
-import javax.mail.Message;
+import com.sun.mail.imap.IMAPStore;
public class ReplyMessageHandlerTest extends HupaGuiceTestCase {
@@ -39,10 +39,10 @@ public class ReplyMessageHandlerTest ext
FileItemRegistry registry = SessionUtils.getSessionRegistry(logger,
httpSession);
- MockIMAPFolder sentbox = (MockIMAPFolder)
store.getFolder(DemoModeConstants.DEMO_MODE_SENT_FOLDER);
+ MockIMAPFolder sentbox = (MockIMAPFolder)
store.getFolder(MockIMAPStore.MOCK_SENT_FOLDER);
assertTrue(sentbox.getMessages().length == 0);
- MockIMAPFolder inbox = (MockIMAPFolder)
store.getFolder(DemoModeConstants.DEMO_MODE_INBOX_FOLDER);
+ MockIMAPFolder inbox = (MockIMAPFolder)
store.getFolder(MockIMAPStore.MOCK_INBOX_FOLDER);
assertTrue(inbox.getMessages().length >= 0);
// Create a mime message with 2 attachments and 1 inline image, and
put it in the inbox
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
Mon Sep 26 10:06:09 2011
@@ -63,7 +63,7 @@ public class StoreBugTest {
@Test
public void testMockIMAPStore() throws Exception {
- TestThread[] threads = testIMAPStoreIdle(getStore(true), "Demo-Inbox",
100);
+ TestThread[] threads = testIMAPStoreIdle(getStore(true), "Mock-Inbox",
100);
Assert.assertNotNull(threads);
Assert.assertFalse(getThreadsSpentTime(threads).contains("-1"));
}
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java?rev=1175763&r1=1175762&r2=1175763&view=diff
==============================================================================
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/mock/MockImapFolderTest.java
Mon Sep 26 10:06:09 2011
@@ -18,18 +18,17 @@
****************************************************************/
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 org.apache.hupa.server.HupaGuiceTestCase;
+
public class MockImapFolderTest extends HupaGuiceTestCase {
public void testReadMessageFile() throws Exception {
- URL url =
Thread.currentThread().getContextClassLoader().getResource(DemoModeConstants.DEMO_MODE_MESSAGES_LOCATION
+ "0.msg");
+ URL url =
Thread.currentThread().getContextClassLoader().getResource(MockIMAPFolder.MOCK_MESSAGES_LOCATION
+ "0.msg");
assertNotNull("There aren't message files for demo mode, check that
the files mime/\\d.msg are in your classpath", url);
}
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=1175763&r1=1175762&r2=1175763&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
Mon Sep 26 10:06:09 2011
@@ -19,37 +19,36 @@
package org.apache.hupa.server.utils;
-import com.sun.mail.imap.IMAPStore;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.hupa.server.FileItemRegistry;
-import org.apache.hupa.server.guice.DemoModeConstants;
-import org.apache.hupa.server.handler.AbstractSendMessageHandler;
-import org.apache.hupa.shared.data.MessageAttachment;
-import org.apache.hupa.shared.data.SMTPMessage;
-
-import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import javax.mail.BodyPart;
import javax.mail.Folder;
import javax.mail.Message;
+import javax.mail.Message.RecipientType;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Part;
import javax.mail.Session;
-import javax.mail.Message.RecipientType;
import javax.mail.internet.AddressException;
import javax.mail.internet.MimeMessage;
+import junit.framework.TestCase;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.hupa.server.FileItemRegistry;
+import org.apache.hupa.server.handler.AbstractSendMessageHandler;
+import org.apache.hupa.server.mock.MockIMAPFolder;
+import org.apache.hupa.shared.data.MessageAttachment;
+import org.apache.hupa.shared.data.SMTPMessage;
+
+import com.sun.mail.imap.IMAPStore;
+
/**
* A bunch of useful methods used for testing
*/
@@ -126,10 +125,9 @@ public class TestUtils extends TestCase
* @throws Exception
*/
public static MimeMessage loadMessageFromFile(Session session, String
msgFile) throws Exception {
- msgFile = DemoModeConstants.DEMO_MODE_MESSAGES_LOCATION + msgFile;
- URL url =
Thread.currentThread().getContextClassLoader().getResource(msgFile);
+ msgFile = MockIMAPFolder.MOCK_MESSAGES_LOCATION + msgFile;
- FileInputStream is = new FileInputStream(url.getFile());
+ InputStream is =
Thread.currentThread().getContextClassLoader().getResourceAsStream(msgFile);
return new MimeMessage(session, is);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
