JAMES-1746 MailboxManager tests should be done with junit-contracts

apache · Jun 8, 2016 · 728b037 · 728b037
1 parent e2a1708
commit 728b037
Show file tree

Hide file tree

Showing 18 changed files with 720 additions and 938 deletions.
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
@@ -65,6 +65,11 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.xenei</groupId>
+            <artifactId>junit-contracts</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java
diff --git a/...che/james/mailbox/AbstractStressTest.java → ...mes/mailbox/MailboxManagerStressTest.java b/...che/james/mailbox/AbstractStressTest.java → ...mes/mailbox/MailboxManagerStressTest.java
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.mailbox;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
@@ -36,28 +37,45 @@
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailbox.model.MailboxPath;
-import org.junit.Test;
+import org.junit.After;
 import org.slf4j.LoggerFactory;
+import org.xenei.junit.contract.Contract;
+import org.xenei.junit.contract.ContractTest;
+import org.xenei.junit.contract.IProducer;
 
-public abstract class AbstractStressTest {
+import com.google.common.collect.ImmutableSet;
+
+@Contract(MailboxManager.class)
+public class MailboxManagerStressTest<T extends MailboxManager> {
 
     private final static int APPEND_OPERATIONS = 200;
 
+    private IProducer<T> producer;
+    private MailboxManager mailboxManager;
+
+    @Contract.Inject
+    public final void setProducer(IProducer<T> producer) throws MailboxException {
+        this.producer = producer;
+        this.mailboxManager = producer.newInstance();
+    }
 
-    protected abstract MailboxManager getMailboxManager();
+    @After
+    public void tearDown() {
+        producer.cleanUp();
+    }
 
-    @Test
-    public void testStessTest() throws InterruptedException, MailboxException {
+    @ContractTest
+    public void testStressTest() throws InterruptedException, MailboxException {
 
         final CountDownLatch latch = new CountDownLatch(APPEND_OPERATIONS);
         final ExecutorService pool = Executors.newFixedThreadPool(APPEND_OPERATIONS / 2);
         final List<Long> uList = new ArrayList<Long>();
         final String username = "username";
-        MailboxSession session = getMailboxManager().createSystemSession(username, LoggerFactory.getLogger("Test"));
-        getMailboxManager().startProcessingRequest(session);
+        MailboxSession session = mailboxManager.createSystemSession(username, LoggerFactory.getLogger("Test"));
+        mailboxManager.startProcessingRequest(session);
         final MailboxPath path = new MailboxPath(MailboxConstants.USER_NAMESPACE, username, "INBOX");
-        getMailboxManager().createMailbox(path, session);
-        getMailboxManager().addListener(path, new MailboxListener() {
+        mailboxManager.createMailbox(path, session);
+        mailboxManager.addListener(path, new MailboxListener() {
 
             @Override
             public ListenerType getType() {
@@ -75,8 +93,8 @@ public void event(Event event) {
                 uList.add(u);
             }
         }, session);
-        getMailboxManager().endProcessingRequest(session);
-        getMailboxManager().logout(session, false);
+        mailboxManager.endProcessingRequest(session);
+        mailboxManager.logout(session, false);
 
         final AtomicBoolean fail = new AtomicBoolean(false);
         final ConcurrentHashMap<Long, Object> uids = new ConcurrentHashMap<Long, Object>();
@@ -93,18 +111,18 @@ public void run() {
 
 
                     try {
-                        MailboxSession session = getMailboxManager().createSystemSession(username, LoggerFactory.getLogger("Test"));
+                        MailboxSession session = mailboxManager.createSystemSession(username, LoggerFactory.getLogger("Test"));
 
-                        getMailboxManager().startProcessingRequest(session);
-                        MessageManager m = getMailboxManager().getMailbox(path, session);
+                        mailboxManager.startProcessingRequest(session);
+                        MessageManager m = mailboxManager.getMailbox(path, session);
                         Long uid = m.appendMessage(new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), session, false, new Flags());
 
                         System.out.println("Append message with uid=" + uid);
                         if (uids.put(uid, new Object()) != null) {
                             fail.set(true);
                         }
-                        getMailboxManager().endProcessingRequest(session);
-                        getMailboxManager().logout(session, false);
+                        mailboxManager.endProcessingRequest(session);
+                        mailboxManager.logout(session, false);
                     } catch (MailboxException e) {
                         e.printStackTrace();
                         fail.set(true);