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 ma...@apache.org on 2017/09/02 06:00:10 UTC
[08/13] james-project git commit: JAMES-2133 Switch from
cassandraunit to cassandra in docker
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
index edf4623..69021a8 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
@@ -28,11 +28,17 @@ import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider;
import org.apache.james.mailbox.jpa.mail.JPAUidProvider;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.junit.After;
+import org.junit.Before;
public class JPASubscriptionManagerTest extends AbstractSubscriptionManagerTest{
private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ @Before
+ public void setUp() throws Exception {
+ super.setup();
+ }
+
@Override
public SubscriptionManager createSubscriptionManager() {
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java
index a3ed58c..3ddf4cd 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerStressTest.java
@@ -27,12 +27,18 @@ import org.apache.james.mailbox.MailboxManagerStressTest;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.junit.After;
+import org.junit.Before;
public class JpaMailboxManagerStressTest extends MailboxManagerStressTest {
private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
private Optional<OpenJPAMailboxManager> openJPAMailboxManager = Optional.empty();
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MailboxManager provideManager() {
if (!openJPAMailboxManager.isPresent()) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
index 1a68198..19ce386 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
@@ -19,7 +19,6 @@
package org.apache.james.mailbox.jpa.mail;
-import java.io.IOException;
import java.util.List;
import java.util.Random;
@@ -98,11 +97,6 @@ public class JPAMapperProvider implements MapperProvider {
}
@Override
- public void ensureMapperPrepared() throws MailboxException {
-
- }
-
- @Override
public boolean supportPartialAttachmentFetch() {
return false;
}
@@ -132,8 +126,4 @@ public class JPAMapperProvider implements MapperProvider {
throw new NotImplementedException();
}
- @Override
- public void close() throws IOException {
-
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java
index f61200f..c35cbf3 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaAnnotationMapperTest.java
@@ -23,11 +23,17 @@ import org.apache.james.backends.jpa.JpaTestCluster;
import org.apache.james.mailbox.jpa.JPAMailboxFixture;
import org.apache.james.mailbox.store.mail.model.AnnotationMapperTest;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
+import org.junit.Before;
public class JpaAnnotationMapperTest extends AnnotationMapperTest {
public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new JPAMapperProvider(JPA_TEST_CLUSTER);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java
index 4dde441..224b8f1 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMailboxMapperTest.java
@@ -23,13 +23,25 @@ import org.apache.james.backends.jpa.JpaTestCluster;
import org.apache.james.mailbox.jpa.JPAMailboxFixture;
import org.apache.james.mailbox.store.mail.model.MailboxMapperTest;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
+import org.junit.After;
+import org.junit.Before;
public class JpaMailboxMapperTest extends MailboxMapperTest {
public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new JPAMapperProvider(JPA_TEST_CLUSTER);
}
+
+ @After
+ public void cleanUp() {
+ JPA_TEST_CLUSTER.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES);
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java
index 1230ae4..2e9328e 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JpaMessageMapperTest.java
@@ -23,13 +23,25 @@ import org.apache.james.backends.jpa.JpaTestCluster;
import org.apache.james.mailbox.jpa.JPAMailboxFixture;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
import org.apache.james.mailbox.store.mail.model.MessageMapperTest;
+import org.junit.After;
+import org.junit.Before;
public class JpaMessageMapperTest extends MessageMapperTest {
public static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAMailboxFixture.MAILBOX_PERSISTANCE_CLASSES);
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new JPAMapperProvider(JPA_TEST_CLUSTER);
}
+
+ @After
+ public void cleanUp() {
+ JPA_TEST_CLUSTER.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES);
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
index 58d8fe9..d90cd2f 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerStressTest.java
@@ -21,6 +21,7 @@ package org.apache.james.mailbox.maildir;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxManagerStressTest;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -30,6 +31,11 @@ public class DomainUserMaildirMailboxManagerStressTest extends MailboxManagerStr
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MailboxManager provideManager() {
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java
index ab27808..ab0a6d2 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/DomainUserMaildirMailboxManagerTest.java
@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxManagerTest;
import org.apache.james.mailbox.exception.MailboxException;
+import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -34,6 +35,11 @@ public class DomainUserMaildirMailboxManagerTest extends MailboxManagerTest {
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MailboxManager provideMailboxManager() {
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
index e2ef938..3e87c41 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerStressTest.java
@@ -21,6 +21,7 @@ package org.apache.james.mailbox.maildir;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxManagerStressTest;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -30,6 +31,11 @@ public class FullUserMaildirMailboxManagerStressTest extends MailboxManagerStres
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MailboxManager provideManager() {
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java
index d6140b8..a1abd45 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/FullUserMaildirMailboxManagerTest.java
@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxManagerTest;
import org.apache.james.mailbox.exception.MailboxException;
+import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -34,6 +35,11 @@ public class FullUserMaildirMailboxManagerTest extends MailboxManagerTest {
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MailboxManager provideMailboxManager() {
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
index 7b5c390..50b1052 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
@@ -22,12 +22,23 @@ import org.apache.james.mailbox.AbstractSubscriptionManagerTest;
import org.apache.james.mailbox.SubscriptionManager;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
public class MaildirSubscriptionManagerTest extends AbstractSubscriptionManagerTest{
+ @Rule
+ public TemporaryFolder tmpFolder = new TemporaryFolder();
+
+ @Before
+ public void setUp() throws Exception {
+ super.setup();
+ }
+
@Override
public SubscriptionManager createSubscriptionManager() {
- MaildirStore store = new MaildirStore("target/Maildir/%domain/%user", new JVMMailboxPathLocker());
+ MaildirStore store = new MaildirStore(tmpFolder + "/Maildir/%domain/%user", new JVMMailboxPathLocker());
MaildirMailboxSessionMapperFactory factory = new MaildirMailboxSessionMapperFactory(store);
return new StoreSubscriptionManager(factory);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
index f7c8479..f12e6f4 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/UserMaildirMailboxManagerStressTest.java
@@ -21,6 +21,7 @@ package org.apache.james.mailbox.maildir;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxManagerStressTest;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -30,6 +31,11 @@ public class UserMaildirMailboxManagerStressTest extends MailboxManagerStressTes
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MailboxManager provideManager() {
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
index 3f60bde..0a63c02 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTest.java
@@ -20,9 +20,15 @@ package org.apache.james.mailbox.inmemory;
import org.apache.james.mailbox.store.AbstractCombinationManagerTest;
import org.apache.james.mailbox.store.CombinationManagerTestSystem;
+import org.junit.Before;
public class InMemoryCombinationManagerTest extends AbstractCombinationManagerTest {
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
public CombinationManagerTestSystem createTestingData() {
return MessageIdManagerTestSystemProvider.createManagersTestingData();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java
index 42f7a12..5b96a3a 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java
@@ -50,10 +50,4 @@ public class InMemoryCombinationManagerTestSystem extends CombinationManagerTest
return new SimpleMailbox(mailboxPath, UID_VALIDITY, messageManager.getId());
}
- @Override
- public void clean() {
-
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java
index 4172fe9..b9aa92b 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerStorageTest.java
@@ -20,9 +20,15 @@ package org.apache.james.mailbox.inmemory;
import org.apache.james.mailbox.store.AbstractMessageIdManagerStorageTest;
import org.apache.james.mailbox.store.MessageIdManagerTestSystem;
+import org.junit.Before;
public class InMemoryMessageIdManagerStorageTest extends AbstractMessageIdManagerStorageTest {
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MessageIdManagerTestSystem createTestingData() {
return MessageIdManagerTestSystemProvider.createTestingData();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java
index 7c0b77e..e5c6600 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManagerTestSystem.java
@@ -102,11 +102,6 @@ public class InMemoryMessageIdManagerTestSystem extends MessageIdManagerTestSyst
}
@Override
- public void clean() {
-
- }
-
- @Override
public int getConstantMessageSize() {
return CONTENT.length;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
index 2f23939..b8b03c1 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerStressTest.java
@@ -21,8 +21,15 @@ package org.apache.james.mailbox.inmemory;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxManagerStressTest;
+import org.junit.Before;
public class MemoryMailboxManagerStressTest extends MailboxManagerStressTest {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MailboxManager provideManager() {
return MemoryMailboxManagerProvider.provideMailboxManager();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java
index 9d77ed4..c958a14 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/MemoryMailboxManagerTest.java
@@ -21,8 +21,15 @@ package org.apache.james.mailbox.inmemory;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxManagerTest;
+import org.junit.Before;
public class MemoryMailboxManagerTest extends MailboxManagerTest {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MailboxManager provideMailboxManager() {
return MemoryMailboxManagerProvider.provideMailboxManager();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
index df422f0..9a9f755 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
@@ -37,6 +37,7 @@ import org.apache.james.mailbox.store.Authorizator;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.NoMailboxPathLocker;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.junit.Before;
public class InMemoryMailboxManagerAttachmentTest extends AbstractMailboxManagerAttachmentTest {
@@ -44,7 +45,9 @@ public class InMemoryMailboxManagerAttachmentTest extends AbstractMailboxManager
private InMemoryMailboxManager mailboxManager;
private InMemoryMailboxManager parseFailingMailboxManager;
- public InMemoryMailboxManagerAttachmentTest() throws Exception {
+
+ @Before
+ public void setUp() throws Exception {
mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
Authenticator noAuthenticator = null;
Authorizator noAuthorizator = null;
@@ -58,6 +61,7 @@ public class InMemoryMailboxManagerAttachmentTest extends AbstractMailboxManager
parseFailingMailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, noAuthenticator, noAuthorizator, new NoMailboxPathLocker(),
new UnionMailboxACLResolver(), null, failingMessageParser, messageIdFactory);
parseFailingMailboxManager.init();
+ super.setUp();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
index 230adae..f9463fe 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
@@ -19,7 +19,6 @@
package org.apache.james.mailbox.inmemory.mail;
-import java.io.IOException;
import java.util.List;
import java.util.Random;
@@ -93,11 +92,6 @@ public class InMemoryMapperProvider implements MapperProvider {
}
@Override
- public void ensureMapperPrepared() throws MailboxException {
-
- }
-
- @Override
public boolean supportPartialAttachmentFetch() {
return false;
}
@@ -134,8 +128,4 @@ public class InMemoryMapperProvider implements MapperProvider {
.highestModSeq(new MockMailboxSession("user"), mailbox);
}
- @Override
- public void close() throws IOException {
-
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java
index 816844c..1ed19c4 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAnnotationMapperTest.java
@@ -21,8 +21,15 @@ package org.apache.james.mailbox.inmemory.mail;
import org.apache.james.mailbox.store.mail.model.AnnotationMapperTest;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
+import org.junit.Before;
public class MemoryAnnotationMapperTest extends AnnotationMapperTest {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new InMemoryMapperProvider();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java
index a67688a..7b60d83 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryAttachmentMapperTest.java
@@ -19,10 +19,18 @@
package org.apache.james.mailbox.inmemory.mail;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.mail.model.AttachmentMapperTest;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
+import org.junit.Before;
public class MemoryAttachmentMapperTest extends AttachmentMapperTest {
+
+ @Before
+ public void setUp() throws MailboxException {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new InMemoryMapperProvider();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java
index 26acf6a..188b927 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMailboxMapperTest.java
@@ -21,8 +21,15 @@ package org.apache.james.mailbox.inmemory.mail;
import org.apache.james.mailbox.store.mail.model.MailboxMapperTest;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
+import org.junit.Before;
public class MemoryMailboxMapperTest extends MailboxMapperTest {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new InMemoryMapperProvider();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java
index 298786d..fef061d 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMapperTest.java
@@ -21,8 +21,15 @@ package org.apache.james.mailbox.inmemory.mail;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
import org.apache.james.mailbox.store.mail.model.MessageMapperTest;
+import org.junit.Before;
public class MemoryMessageMapperTest extends MessageMapperTest {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new InMemoryMapperProvider();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java
index 0b8e2fb..4d848c3 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageMoveTest.java
@@ -21,9 +21,15 @@ package org.apache.james.mailbox.inmemory.mail;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
import org.apache.james.mailbox.store.mail.model.MessageMoveTest;
+import org.junit.Before;
public class MemoryMessageMoveTest extends MessageMoveTest {
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new InMemoryMapperProvider();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java
index 3bab206..525aa75 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/MemoryMessageWithAttachmentMapperTest.java
@@ -21,8 +21,15 @@ package org.apache.james.mailbox.inmemory.mail;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
import org.apache.james.mailbox.store.mail.model.MessageWithAttachmentMapperTest;
+import org.junit.Before;
public class MemoryMessageWithAttachmentMapperTest extends MessageWithAttachmentMapperTest {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
@Override
protected MapperProvider createMapperProvider() {
return new InMemoryMapperProvider();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java
index 61b51e6..21dd3fb 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java
@@ -47,13 +47,12 @@ import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.model.MultimailboxesSearchQuery;
import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
public abstract class AbstractCombinationManagerTest {
+
private static final Flags FLAGS = new Flags();
private static final byte[] MAIL_CONTENT = "Subject: test\r\n\r\ntestmail".getBytes();
private static final int DEFAULT_MAXIMUM_LIMIT = 256;
@@ -74,7 +73,6 @@ public abstract class AbstractCombinationManagerTest {
public abstract CombinationManagerTestSystem createTestingData() throws Exception ;
- @Before
public void setUp() throws Exception {
session = new MockMailboxSession(MailboxManagerFixture.USER);
testingData = createTestingData();
@@ -88,10 +86,6 @@ public abstract class AbstractCombinationManagerTest {
messageManager2 = testingData.createMessageManager(mailbox2, session);
}
- @After
- public void tearDown() throws Exception {
- testingData.clean();
- }
@Test
public void getMessageCountFromMessageManagerShouldReturnDataSetInMailboxesFromMessageIdManager() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
index a20217b..3657561 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
@@ -43,8 +43,6 @@ import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
public abstract class AbstractMailboxManagerAttachmentTest {
@@ -64,10 +62,6 @@ public abstract class AbstractMailboxManagerAttachmentTest {
protected abstract MailboxManager getParseFailingMailboxManager();
protected abstract MailboxSessionMapperFactory getMailboxSessionMapperFactory();
- protected void clean() {
- }
-
- @Before
public void setUp() throws Exception {
mailboxSession = new MockMailboxSession(USERNAME);
messageMapper = getMailboxSessionMapperFactory().getMessageMapper(mailboxSession);
@@ -80,11 +74,6 @@ public abstract class AbstractMailboxManagerAttachmentTest {
attachmentMapper = getMailboxSessionMapperFactory().getAttachmentMapper(mailboxSession);
}
- @After
- public void tearDown() {
- clean();
- }
-
@Test
public void appendMessageShouldStoreWithoutAttachmentWhenMailWithoutAttachment() throws Exception {
String mail = "Subject: Test\n\nBody";
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java
index 757f434..98f2fb1 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerQuotaTest.java
@@ -32,7 +32,6 @@ import org.apache.james.mailbox.quota.CurrentQuotaManager;
import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -77,11 +76,6 @@ public abstract class AbstractMessageIdManagerQuotaTest {
mailbox3 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH3, session);
}
- @After
- public void tearDown() {
- testingData.clean();
- }
-
@Test
public void setInMailboxesShouldNotThrowWhenMessageQuotaNotExceeded() throws Exception {
maxQuotaManager.setDefaultMaxMessage(1);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
index 8c84b8a..d7a1201 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
@@ -54,8 +54,6 @@ import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.quota.QuotaImpl;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -82,7 +80,6 @@ public abstract class AbstractMessageIdManagerSideEffectTest {
protected abstract MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, MailboxEventDispatcher dispatcher) throws Exception;
- @Before
public void setUp() throws Exception {
dispatcher = mock(MailboxEventDispatcher.class);
quotaManager = mock(QuotaManager.class);
@@ -96,10 +93,6 @@ public abstract class AbstractMessageIdManagerSideEffectTest {
mailbox3 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH3, session);
}
- @After
- public void tearDown() {
- testingData.clean();
- }
@Test
public void deleteShouldCallEventDispatcher() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
index 626c9a7..1d964cb 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
@@ -38,8 +38,6 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -68,7 +66,6 @@ public abstract class AbstractMessageIdManagerStorageTest {
protected abstract MessageIdManagerTestSystem createTestingData() throws Exception;
- @Before
public void setUp() throws Exception {
session = new MockMailboxSession(MailboxManagerFixture.USER);
otherSession = new MockMailboxSession(MailboxManagerFixture.OTHER_USER);
@@ -82,11 +79,6 @@ public abstract class AbstractMessageIdManagerStorageTest {
mailbox4 = testingData.createMailbox(MailboxManagerFixture.MAILBOX_PATH4, otherSession);
}
- @After
- public void tearDown() {
- testingData.clean();
- }
-
@Test
public void getMessagesShouldReturnEmptyListWhenMessageIdNotUsed() throws Exception {
MessageId messageId = testingData.createNotUsedMessageId();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/CombinationManagerTestSystem.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/CombinationManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/CombinationManagerTestSystem.java
index 97d0f0f..5c9743f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/CombinationManagerTestSystem.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/CombinationManagerTestSystem.java
@@ -48,5 +48,4 @@ public abstract class CombinationManagerTestSystem {
public abstract MessageManager createMessageManager(Mailbox mailbox, MailboxSession session) throws MailboxException;
- public abstract void clean();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java
index ecb45d8e..0fb31dc 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageIdManagerTestSystem.java
@@ -60,7 +60,5 @@ public abstract class MessageIdManagerTestSystem {
public abstract void deleteMailbox(MailboxId mailboxId, MailboxSession session);
- public abstract void clean();
-
public abstract int getConstantMessageSize();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java
index d4445e9..6fb614b 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerSideEffectTest.java
@@ -25,9 +25,14 @@ import org.apache.james.mailbox.model.TestMessageId;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
+import org.junit.Before;
public class StoreMessageIdManagerSideEffectTest extends AbstractMessageIdManagerSideEffectTest {
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
@Override
protected MessageIdManagerTestSystem createTestSystem(QuotaManager quotaManager, MailboxEventDispatcher dispatcher) throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java
index 2f68685..c312921 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java
@@ -85,11 +85,6 @@ public class StoreMessageIdManagerTestSystem extends MessageIdManagerTestSystem
return messageIdFactory.generate();
}
- @Override
- public void clean() {
- mapperFactory.clean();
- }
-
private MailboxMessage createMessage(MailboxId mailboxId, Flags flags, MessageId messageId, MessageUid uid) {
MailboxMessage mailboxMessage = mock(MailboxMessage.class);
when(mailboxMessage.getMessageId()).thenReturn(messageId);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AnnotationMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AnnotationMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AnnotationMapperTest.java
index a3003d4..06b8f2a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AnnotationMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AnnotationMapperTest.java
@@ -26,9 +26,7 @@ import org.apache.james.mailbox.model.MailboxAnnotation;
import org.apache.james.mailbox.model.MailboxAnnotationKey;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.store.mail.AnnotationMapper;
-import org.junit.After;
import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -61,22 +59,14 @@ public abstract class AnnotationMapperTest {
protected abstract MapperProvider createMapperProvider();
- @Before
- public final void setUp() throws MailboxException {
+ public void setUp() throws Exception {
mapperProvider = createMapperProvider();
- mapperProvider.ensureMapperPrepared();
Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.ANNOTATION));
this.annotationMapper = mapperProvider.createAnnotationMapper();
this.mailboxId = mapperProvider.generateId();
}
- @After
- public void tearDown() throws Exception {
- mapperProvider.clearMapper();
- mapperProvider.close();
- }
-
@Test
public void insertAnnotationShouldThrowExceptionWithNilData() {
expected.expect(IllegalArgumentException.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java
index 0da9407..a915d36 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AttachmentMapperTest.java
@@ -28,9 +28,7 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.AttachmentId;
import org.apache.james.mailbox.store.mail.AttachmentMapper;
-import org.junit.After;
import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -48,19 +46,12 @@ public abstract class AttachmentMapperTest {
protected abstract MapperProvider createMapperProvider();
- @Before
- public final void setUp() throws MailboxException {
+ public void setUp() throws MailboxException {
mapperProvider = createMapperProvider();
Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.ATTACHMENT));
this.attachmentMapper = mapperProvider.createAttachmentMapper();
}
- @After
- public void tearDown() throws Exception {
- mapperProvider.clearMapper();
- mapperProvider.close();
- }
-
@Test
public void getAttachmentShouldThrowWhenNullAttachmentId() throws Exception {
expected.expect(IllegalArgumentException.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
index 598cfda..92ab5b8 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
@@ -32,9 +32,7 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
-import org.junit.After;
import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -86,8 +84,7 @@ public abstract class MailboxMapperTest {
protected abstract MapperProvider createMapperProvider();
- @Before
- public final void setUp() throws MailboxException {
+ public void setUp() throws Exception {
this.mapperProvider = createMapperProvider();
Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.MAILBOX));
@@ -96,12 +93,6 @@ public abstract class MailboxMapperTest {
initData();
}
- @After
- public void tearDown() throws Exception {
- mapperProvider.clearMapper();
- mapperProvider.close();
- }
-
@Test
public void findMailboxByPathWhenAbsentShouldFail() throws MailboxException {
expected.expect(MailboxNotFoundException.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java
index ff9ada6..cea5d59 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java
@@ -19,7 +19,6 @@
package org.apache.james.mailbox.store.mail.model;
-import java.io.Closeable;
import java.util.List;
import org.apache.james.mailbox.MessageUid;
@@ -32,7 +31,7 @@ import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.MessageIdMapper;
import org.apache.james.mailbox.store.mail.MessageMapper;
-public interface MapperProvider extends Closeable {
+public interface MapperProvider {
enum Capabilities {
MESSAGE,
MAILBOX,
@@ -66,8 +65,6 @@ public interface MapperProvider extends Closeable {
void clearMapper() throws MailboxException;
- void ensureMapperPrepared() throws MailboxException;
-
boolean supportPartialAttachmentFetch();
MessageId generateMessageId();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
index 9a51f12..73d5a14 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
@@ -47,9 +47,7 @@ import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
import org.assertj.core.data.MapEntry;
-import org.junit.After;
import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -83,12 +81,10 @@ public abstract class MessageIdMapperTest {
protected abstract MapperProvider provideMapper();
- @Before
- public final void setUp() throws MailboxException {
+ public void setUp() throws MailboxException {
this.mapperProvider = provideMapper();
Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.UNIQUE_MESSAGE_ID));
- this.mapperProvider.ensureMapperPrepared();
this.sut = mapperProvider.createMessageIdMapper();
this.messageMapper = mapperProvider.createMessageMapper();
this.mailboxMapper = mapperProvider.createMailboxMapper();
@@ -102,12 +98,6 @@ public abstract class MessageIdMapperTest {
message4 = createMessage(benwaWorkMailbox, "Subject: Test4 \n\nBody4\n.\n", BODY_START, new PropertyBuilder());
}
- @After
- public void tearDown() throws Exception {
- mapperProvider.clearMapper();
- mapperProvider.close();
- }
-
@Test
public void findShouldReturnEmptyWhenIdListIsEmpty() throws MailboxException {
assertThat(sut.find(ImmutableList.<MessageId> of(), FetchType.Full)).isEmpty();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
index 3cfc96d..16004a1 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
@@ -51,9 +51,7 @@ import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
-import org.junit.After;
import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -89,10 +87,8 @@ public abstract class MessageMapperTest {
protected abstract MapperProvider createMapperProvider();
- @Before
- public final void setProducer() throws MailboxException {
+ public void setUp() throws Exception {
this.mapperProvider = createMapperProvider();
- this.mapperProvider.ensureMapperPrepared();
Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.MESSAGE));
@@ -114,12 +110,6 @@ public abstract class MessageMapperTest {
message6 = createMessage(benwaWorkMailbox, mapperProvider.generateMessageId(), "Subject: Test6 \n\nBody6\n.\n", BODY_START, new PropertyBuilder());
}
- @After
- public void tearDown() throws Exception {
- mapperProvider.clearMapper();
- mapperProvider.close();
- }
-
@Test
public void emptyMailboxShouldHaveZeroMessageCount() throws MailboxException {
assertThat(messageMapper.countMessagesInMailbox(benwaInboxMailbox)).isEqualTo(0);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
index de266ab..7efd7c8 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
@@ -37,9 +37,7 @@ import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
-import org.junit.After;
import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -64,10 +62,8 @@ public abstract class MessageMoveTest {
@Rule
public ExpectedException expected = ExpectedException.none();
- @Before
- public final void setUp() throws MailboxException {
+ public void setUp() throws Exception {
this.mapperProvider = createMapperProvider();
- this.mapperProvider.ensureMapperPrepared();
Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.MOVE));
this.messageMapper = mapperProvider.createMessageMapper();
Assume.assumeNotNull(messageMapper);
@@ -77,12 +73,6 @@ public abstract class MessageMoveTest {
message1 = createMessage(benwaInboxMailbox, mapperProvider.generateMessageId(), "Subject: Test1 \n\nBody1\n.\n", BODY_START, new PropertyBuilder());
}
- @After
- public void tearDown() throws Exception {
- mapperProvider.clearMapper();
- mapperProvider.close();
- }
-
@Test
public void movingAMessageShouldWork() throws Exception {
messageMapper.add(benwaInboxMailbox, message1);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
index 0ece2a8..3320e67 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
@@ -44,9 +44,7 @@ import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
-import org.junit.After;
import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -74,10 +72,8 @@ public abstract class MessageWithAttachmentMapperTest {
protected abstract MapperProvider createMapperProvider();
- @Before
- public final void setUp() throws MailboxException {
+ public void setUp() throws Exception {
this.mapperProvider = createMapperProvider();
- this.mapperProvider.ensureMapperPrepared();
Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.MESSAGE));
Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.ATTACHMENT));
@@ -121,12 +117,6 @@ public abstract class MessageWithAttachmentMapperTest {
}
- @After
- public void tearDown() throws Exception {
- mapperProvider.clearMapper();
- mapperProvider.close();
- }
-
@Test
public void messagesRetrievedUsingFetchTypeFullShouldHaveAttachmentsLoadedWhenOneAttachment() throws MailboxException, IOException{
saveMessages();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java
----------------------------------------------------------------------
diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java
index 2797182..82ac712 100644
--- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java
+++ b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java
@@ -60,11 +60,11 @@ public class TikaContainer extends ExternalResource {
}
public String getIp() {
- return tika.getIp();
+ return tika.getHostIp();
}
public int getPort() {
- return DEFAULT_TIKA_PORT;
+ return tika.getMappedPort(DEFAULT_TIKA_PORT);
}
public int getTimeoutInMillis() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
index ccd0122..0464da4 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
@@ -54,10 +54,6 @@ public interface HostSystem extends SessionFactory {
*/
Session newSession(Continuation continuation) throws Exception;
- void beforeTests() throws Exception;
-
- void afterTests() throws Exception;
-
void beforeTest() throws Exception;
void afterTest() throws Exception;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/core/src/main/java/org/apache/james/mpt/script/SimpleScriptedTestProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/SimpleScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/SimpleScriptedTestProtocol.java
index 30c7210..1655378 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/script/SimpleScriptedTestProtocol.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/script/SimpleScriptedTestProtocol.java
@@ -2,8 +2,8 @@ package org.apache.james.mpt.script;
import org.apache.james.mpt.api.HostSystem;
-public class SimpleScriptedTestProtocol extends GenericSimpleScriptedTestProtocol<HostSystem, SimpleScriptedTestProtocol> {
+public class SimpleScriptedTestProtocol extends GenericSimpleScriptedTestProtocol<HostSystem, SimpleScriptedTestProtocol> {
public SimpleScriptedTestProtocol(String scriptDirectory, HostSystem hostSystem) throws Exception {
super(scriptDirectory, hostSystem);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/pom.xml b/mpt/impl/imap-mailbox/cassandra/pom.xml
index 6eccb8c..4c473f1 100644
--- a/mpt/impl/imap-mailbox/cassandra/pom.xml
+++ b/mpt/impl/imap-mailbox/cassandra/pom.xml
@@ -49,10 +49,5 @@
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.cassandraunit</groupId>
- <artifactId>cassandra-unit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlain.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlain.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlain.java
index a86c2a1..a8e83d9 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlain.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlain.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.AuthenticatePlain;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraAuthenticatePlain extends AuthenticatePlain {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedState.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedState.java
index 4a0b277..be1d1d8 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedState.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.AuthenticatedState;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraAuthenticatedState extends AuthenticatedState {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessions.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessions.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessions.java
index 53963af..f235e5c 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessions.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessions.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.ConcurrentSessions;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraConcurrentSessions extends ConcurrentSessions {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java
index 38666f6..c5648d5 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstore.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.Condstore;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraCondstore extends Condstore {
- private JamesImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private JamesImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(JamesImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopy.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopy.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopy.java
index 298593f..45aa8f9 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopy.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopy.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.Copy;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraCopy extends Copy {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEvents.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEvents.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEvents.java
index 1632fd7..28007e6 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEvents.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEvents.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.Events;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraEvents extends Events {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpunge.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpunge.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpunge.java
index ef30799..a7ae30e 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpunge.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpunge.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.Expunge;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraExpunge extends Expunge {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetch.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetch.java
index c8f2eec..d5f6ddb 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetch.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetch.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.Fetch;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraFetch extends Fetch {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySection.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySection.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySection.java
index 67fd6ad..47fcb3f 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySection.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySection.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.FetchBodySection;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraFetchBodySection extends FetchBodySection {
+
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
private ImapHostSystem system;
-
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructure.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructure.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructure.java
index c9e2cd7..c0b2a31 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructure.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructure.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.FetchBodyStructure;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraFetchBodyStructure extends FetchBodyStructure {
+
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
private ImapHostSystem system;
-
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeaders.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeaders.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeaders.java
index bd8c1e6..bd3be46 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeaders.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeaders.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.FetchHeaders;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraFetchHeaders extends FetchHeaders {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a18a4488/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListing.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListing.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListing.java
index 983ff29..c29de81 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListing.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListing.java
@@ -19,22 +19,27 @@
package org.apache.james.mpt.imapmailbox.cassandra;
+import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.suite.Listing;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class CassandraListing extends Listing {
- private ImapHostSystem system;
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private ImapHostSystem system;
+
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraMailboxTestModule());
+ Injector injector = Guice.createInjector(new CassandraMailboxTestModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
super.setUp();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org