Author: manolo
Date: Tue Mar 2 22:25:27 2010
New Revision: 918225
URL: http://svn.apache.org/viewvc?rev=918225&view=rev
Log:
Avoid using "UID EXPUNGE" in InImapUserPreferences, because it is not included
in the standard set of IMAP commands
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerTestModule.java?rev=918225&r1=918224&r2=918225&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
Tue Mar 2 22:25:27 2010
@@ -140,6 +140,42 @@
}
+ /**
+ * Configuration of a Apache-James server.
+ * Customize it for your integration tests.
+ */
+ public static final Properties jamesProperties = new Properties() {
+ private static final long serialVersionUID = 1L;
+ {
+ /// SET THIS
+ put("Username","manolo");
+ put("Password","***");
+ ///
+
+ put("IMAPServerAddress", "localhost");
+ put("IMAPServerPort", "143");
+ put("IMAPS", "fase");
+
+ put("IMAPConnectionPoolSize", "4");
+ put("IMAPConnectionPoolTimeout", "300000");
+
+ put("DefaultInboxFolder", "INBOX");
+ put("DefaultTrashFolder", "Trash");
+ put("DefaultSentFolder", "Sent");
+ put("DefaultDraftsFolder", "Drafts");
+
+ put("PostFetchMessageCount", "0");
+
+ put("SMTPServerAddress", "localhost");
+ put("SMTPServerPort", "25");
+ put("SMTPS", "false");
+ put("SMTPAuth", "true");
+
+ put("SessionDebug", "false");
+
+ put("DefaultUserSessionId", "just_an_id");
+ }
+ };
/**
* Configuration of an IMAP server.
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java?rev=918225&r1=918224&r2=918225&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java
Tue Mar 2 22:25:27 2010
@@ -139,7 +139,6 @@
for (Message msg : msgs) {
if (subject.equals(msg.getSubject())) {
msg.setFlag(Flag.DELETED, true);
- folder.expunge(new Message[] { msg });
}
}
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java?rev=918225&r1=918224&r2=918225&view=diff
==============================================================================
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
Tue Mar 2 22:25:27 2010
@@ -31,12 +31,18 @@
*/
static class MyModule extends GuiceServerTestModule {
public MyModule() {
+ // Select a valid imap provider, comment all to use Mock
// properties = courierProperties;
// properties = gmailProperties;
+ // properties = jamesProperties;
+
+ // Uncomment to use production logger
// logClass = LogProvider.class;
- userPreferencesClass = InImapUserPreferencesStorage.class;
+
// Change the default delay to run test faster
- InImapUserPreferencesStorage.IMAP_SAVE_DELAY = 400;
+ // InImapUserPreferencesStorage.IMAP_SAVE_DELAY = 400;
+
+ userPreferencesClass = InImapUserPreferencesStorage.class;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
