Author: norman
Date: Mon Jun 20 10:10:51 2011
New Revision: 1137578
URL: http://svn.apache.org/viewvc?rev=1137578&view=rev
Log:
Adjust tests
Modified:
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
Modified:
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java?rev=1137578&r1=1137577&r2=1137578&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
(original)
+++
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
Mon Jun 20 10:10:51 2011
@@ -26,14 +26,14 @@ import org.apache.james.imap.processor.m
import org.apache.james.imap.tester.ImapHostSystem;
import org.apache.james.imap.tester.base.HostSystem;
import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
-import org.apache.james.mailbox.inmemory.InMemorySubscriptionManager;
import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.StoreMailboxManager;
+import org.apache.james.mailbox.store.StoreSubscriptionManager;
public class InMemoryHostSystem extends ImapHostSystem {
- private InMemoryMailboxManager mailboxManager;
+ private StoreMailboxManager<Long> mailboxManager;
private MockAuthenticator userManager;
private InMemoryMailboxSessionMapperFactory factory;
@@ -59,10 +59,10 @@ public class InMemoryHostSystem extends
private void initFields() throws MailboxException {
userManager = new MockAuthenticator();
factory = new InMemoryMailboxSessionMapperFactory();
- mailboxManager = new InMemoryMailboxManager(factory, userManager);
+ mailboxManager = new StoreMailboxManager<Long>(factory, userManager);
mailboxManager.init();
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
InMemorySubscriptionManager(factory));
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
StoreSubscriptionManager(factory));
configure(new DefaultImapDecoderFactory().buildImapDecoder(),
new DefaultImapEncoderFactory().buildImapEncoder(),
defaultImapProcessorFactory);
Modified:
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java?rev=1137578&r1=1137577&r2=1137578&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
(original)
+++
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
Mon Jun 20 10:10:51 2011
@@ -28,19 +28,19 @@ import org.apache.james.imap.processor.m
import org.apache.james.imap.tester.ImapHostSystem;
import org.apache.james.imap.tester.base.HostSystem;
import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.maildir.MaildirMailboxManager;
import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
import org.apache.james.mailbox.maildir.MaildirStore;
-import org.apache.james.mailbox.maildir.MaildirSubscriptionManager;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.StoreMailboxManager;
+import org.apache.james.mailbox.store.StoreSubscriptionManager;
public class MaildirHostSystem extends ImapHostSystem {
public static final String META_DATA_DIRECTORY = "target/user-meta-data";
private static final String MAILDIR_HOME = "target/Maildir";
- private final MaildirMailboxManager mailboxManager;
+ private final StoreMailboxManager<Integer> mailboxManager;
private final MockAuthenticator userManager;
private final MaildirMailboxSessionMapperFactory
mailboxSessionMapperFactory;
@@ -50,10 +50,11 @@ public class MaildirHostSystem extends I
public MaildirHostSystem() throws MailboxException {
userManager = new MockAuthenticator();
- MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user", new
JVMMailboxPathLocker());
+ JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
+ MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user", locker);
mailboxSessionMapperFactory = new
MaildirMailboxSessionMapperFactory(store);
- MaildirSubscriptionManager sm = new
MaildirSubscriptionManager(mailboxSessionMapperFactory);
- mailboxManager = new
MaildirMailboxManager(mailboxSessionMapperFactory, userManager);
+ StoreSubscriptionManager sm = new
StoreSubscriptionManager(mailboxSessionMapperFactory);
+ mailboxManager = new
StoreMailboxManager<Integer>(mailboxSessionMapperFactory, userManager, locker);
mailboxManager.init();
final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, sm);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
