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 no...@apache.org on 2010/09/30 15:35:17 UTC

svn commit: r1003059 - in /james/imap/trunk: jcr/src/test/java/org/apache/james/mailbox/jcr/ jpa/src/test/java/org/apache/james/mailbox/jpa/ maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ protocol-tester/src/main/java/org/apache/jam...

Author: norman
Date: Thu Sep 30 13:35:17 2010
New Revision: 1003059

URL: http://svn.apache.org/viewvc?rev=1003059&view=rev
Log:
No need to limit AbstractStressTest to StoreMailboxManager implementations

Modified:
    james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
    james/imap/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java
    james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/AbstractStressTest.java

Modified: james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java?rev=1003059&r1=1003058&r2=1003059&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java (original)
+++ james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java Thu Sep 30 13:35:17 2010
@@ -26,6 +26,7 @@ import org.apache.commons.logging.impl.S
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.james.imap.functional.AbstractStressTest;
+import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.jcr.GlobalMailboxSessionJCRRepository;
 import org.apache.james.mailbox.jcr.JCRMailboxManager;
@@ -33,7 +34,6 @@ import org.apache.james.mailbox.jcr.JCRM
 import org.apache.james.mailbox.jcr.JCRUtils;
 import org.apache.james.mailbox.jcr.JCRVmNodeLocker;
 import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository;
-import org.apache.james.mailbox.store.StoreMailboxManager;
 import org.junit.After;
 import org.junit.Before;
 import org.xml.sax.InputSource;
@@ -80,7 +80,7 @@ public class JCRStressTest extends Abstr
 
     
     @Override
-    protected StoreMailboxManager<?> getMailboxManager() {
+    protected MailboxManager getMailboxManager() {
         return mailboxManager;
     }
 

Modified: james/imap/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java?rev=1003059&r1=1003058&r2=1003059&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java (original)
+++ james/imap/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java Thu Sep 30 13:35:17 2010
@@ -26,6 +26,7 @@ import javax.persistence.EntityManagerFa
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.imap.functional.AbstractStressTest;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory;
 import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
@@ -36,7 +37,6 @@ import org.apache.james.mailbox.jpa.mail
 import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
 import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
 import org.apache.james.mailbox.jpa.user.model.JPASubscription;
-import org.apache.james.mailbox.store.StoreMailboxManager;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.junit.After;
 import org.junit.Before;
@@ -100,7 +100,7 @@ public class JPAStressTest extends Abstr
     }
 
     @Override
-    protected StoreMailboxManager<?> getMailboxManager() {
+    protected MailboxManager getMailboxManager() {
         return mailboxManager;
     }
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java?rev=1003059&r1=1003058&r2=1003059&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java Thu Sep 30 13:35:17 2010
@@ -24,9 +24,9 @@ import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.apache.james.imap.functional.AbstractStressTest;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.maildir.MaildirMailboxManager;
 import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
-import org.apache.james.mailbox.store.StoreMailboxManager;
 import org.junit.After;
 import org.junit.Before;
 
@@ -56,7 +56,7 @@ public class MaildirStressTest extends A
     }
 
     @Override
-    protected StoreMailboxManager<?> getMailboxManager() {
+    protected MailboxManager getMailboxManager() {
         return mailboxManager;
     }
 

Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/AbstractStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/AbstractStressTest.java?rev=1003059&r1=1003058&r2=1003059&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/AbstractStressTest.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/AbstractStressTest.java Thu Sep 30 13:35:17 2010
@@ -30,23 +30,23 @@ import javax.mail.Flags;
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.store.StoreMailboxManager;
 import org.junit.Test;
 
 public abstract class AbstractStressTest {
 
-    private final static int APPEND_OPERATIONS = 200;
+    private final static int APPEND_OPERATIONS = 100;
     
     
-    protected abstract StoreMailboxManager<?> getMailboxManager();
+    protected abstract MailboxManager getMailboxManager();
     
     @Test
     public void testStessTest() throws InterruptedException, MailboxException {
        
-        final CountDownLatch latch = new CountDownLatch(APPEND_OPERATIONS);
+        final CountDownLatch latch = new CountDownLatch(200);
         final ExecutorService pool = Executors.newFixedThreadPool(APPEND_OPERATIONS/2);
         
         MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
@@ -58,7 +58,7 @@ public abstract class AbstractStressTest
         final AtomicBoolean fail = new AtomicBoolean(false);
         
         // fire of 1000 append operations
-        for (int i = 0 ; i < APPEND_OPERATIONS; i++) {
+        for (int i = 0 ; i < 200; i++) {
             pool.execute(new Runnable() {
                 
                 public void run() {
@@ -67,9 +67,10 @@ public abstract class AbstractStressTest
                         return;
                     }
                     
-                    MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
 
                     try {
+                        MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
+
                         getMailboxManager().startProcessingRequest(session);
                         MessageManager m = getMailboxManager().getMailbox(path, session);
                         



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org