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 bt...@apache.org on 2018/07/25 10:08:09 UTC
[07/15] james-project git commit: JAMES-2470 Use a single Cassandra
Cluster for a full test class
JAMES-2470 Use a single Cassandra Cluster for a full test class
Avoid establishing a new connection bases and leads to significant improvments
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/61b8caa3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/61b8caa3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/61b8caa3
Branch: refs/heads/master
Commit: 61b8caa33d3d4d215148fdb9b4c6f36c08384687
Parents: 13d7655
Author: benwa <bt...@linagora.com>
Authored: Fri Jul 20 15:35:03 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 16:44:13 2018 +0700
----------------------------------------------------------------------
.../backends/cassandra/CassandraCluster.java | 10 +++-
.../backends/cassandra/utils/PaggingTest.java | 22 ++++++--
.../versions/CassandraSchemaVersionDAOTest.java | 18 +++++--
.../CassandraGenericEventStoreExtension.java | 8 +--
.../CassandraCombinationManagerTest.java | 51 +++++++++++-------
.../CassandraMailboxManagerStressTest.java | 54 ++++++++++++--------
.../cassandra/CassandraMailboxManagerTest.java | 52 +++++++++++--------
.../CassandraMessageIdManagerQuotaTest.java | 51 +++++++++++-------
...CassandraMessageIdManagerSideEffectTest.java | 45 ++++++++++------
.../CassandraMessageIdManagerStorageTest.java | 45 ++++++++++------
.../CassandraSubscriptionManagerTest.java | 21 ++++++--
...istributedMailboxDelegatingListenerTest.java | 17 +++++-
...CassandraMailboxPathRegistrerMapperTest.java | 17 +++++-
.../cassandra/mail/CassandraACLMapperTest.java | 20 ++++++--
.../mail/CassandraAnnotationMapperTest.java | 18 +++++--
.../mail/CassandraApplicableFlagDAOTest.java | 19 +++++--
.../mail/CassandraAttachmentDAOTest.java | 20 ++++++--
.../mail/CassandraAttachmentDAOV2Test.java | 23 ++++++---
.../mail/CassandraAttachmentFallbackTest.java | 28 ++++++----
.../mail/CassandraAttachmentMapperTest.java | 23 ++++++---
.../mail/CassandraAttachmentOwnerDAOTest.java | 18 +++++--
.../mail/CassandraDeletedMessageDAOTest.java | 20 ++++++--
.../mail/CassandraFirstUnseenDAOTest.java | 20 ++++++--
.../mail/CassandraGenericMailboxMapperTest.java | 27 +++++++---
.../mail/CassandraIndexTableHandlerTest.java | 27 +++++++---
.../mail/CassandraMailboxCounterDAOTest.java | 18 +++++--
.../cassandra/mail/CassandraMailboxDAOTest.java | 22 +++++---
.../CassandraMailboxManagerAttachmentTest.java | 47 ++++++++++-------
.../mail/CassandraMailboxMapperAclTest.java | 29 +++++++----
.../CassandraMailboxMapperConcurrencyTest.java | 21 ++++++--
.../mail/CassandraMailboxMapperTest.java | 20 ++++++--
.../mail/CassandraMailboxPathDAOTest.java | 18 +++++--
.../mail/CassandraMailboxRecentDAOTest.java | 20 ++++++--
.../cassandra/mail/CassandraMapperProvider.java | 5 --
.../cassandra/mail/CassandraMessageDAOTest.java | 19 +++++--
.../mail/CassandraMessageIdDAOTest.java | 18 +++++--
.../mail/CassandraMessageIdMapperTest.java | 47 ++++++++++-------
.../CassandraMessageIdToImapUidDAOTest.java | 20 ++++++--
.../mail/CassandraMessageMapperTest.java | 45 ++++++++++------
.../mail/CassandraMessageMoveTest.java | 47 ++++++++++-------
...assandraMessageWithAttachmentMapperTest.java | 45 ++++++++++------
.../mail/CassandraModSeqProviderTest.java | 20 +++++---
.../mail/CassandraUidProviderTest.java | 22 ++++++--
.../mail/CassandraUserMailboxRightsDAOTest.java | 19 +++++--
.../AttachmentMessageIdCreationTest.java | 30 ++++++++---
.../migration/AttachmentV2MigrationTest.java | 29 ++++++++---
.../migration/MailboxPathV2MigrationTest.java | 24 +++++----
.../quota/CassandraCurrentQuotaManagerTest.java | 18 +++++--
.../CassandraPerUserMaxQuotaManagerTest.java | 19 +++++--
.../user/CassandraSubscriptionMapperTest.java | 17 ++++--
.../mailbox/jpa/mail/JPAMapperProvider.java | 5 --
.../inmemory/mail/InMemoryMapperProvider.java | 5 --
.../store/mail/model/MapperProvider.java | 2 -
.../blob/cassandra/CassandraBlobsDAOTest.java | 23 ++++++---
...tSourcingDLPConfigurationStoreExtension.java | 20 +++-----
.../cassandra/CassandraDomainListTest.java | 17 ++++--
...assandraMailRepositoryUrlStoreExtension.java | 10 ++--
.../CassandraRecipientRewriteTableTest.java | 16 ++++--
.../james/rrt/cassandra/CassandraStepdefs.java | 2 +-
.../cassandra/CassandraActiveScriptDAOTest.java | 19 +++++--
.../sieve/cassandra/CassandraSieveDAOTest.java | 19 +++++--
.../cassandra/CassandraSieveQuotaDAOTest.java | 19 +++++--
.../cassandra/CassandraSieveRepositoryTest.java | 22 +++++---
.../cassandra/CassandraUsersRepositoryTest.java | 19 +++++--
.../CassandraAccessTokenRepositoryTest.java | 20 ++++++--
.../CassandraNotificationRegistryTest.java | 16 +++++-
.../CassandraVacationRepositoryTest.java | 19 +++++--
.../CassandraMailRepositoryCountDAOTest.java | 22 +++++---
.../CassandraMailRepositoryKeysDAOTest.java | 23 ++++++---
.../CassandraMailRepositoryMailDAOTest.java | 23 ++++++---
.../cassandra/CassandraMailRepositoryTest.java | 29 +++++++----
71 files changed, 1154 insertions(+), 509 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
index 03490c9..3d0304b 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
@@ -86,7 +86,15 @@ public final class CassandraCluster implements AutoCloseable {
@Override
public void close() {
- new CassandraTableManager(module, session).clearAllTables();
+ clearTables();
+ closeCluster();
+ }
+
+ public void closeCluster() {
cluster.closeAsync();
}
+
+ public void clearTables() {
+ new CassandraTableManager(module, session).clearAllTables();
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java
index bc0f678..9fde48f 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java
@@ -35,7 +35,9 @@ import org.apache.james.backends.cassandra.components.CassandraTable;
import org.apache.james.backends.cassandra.components.CassandraType;
import org.apache.james.util.CompletableFutureUtil;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -53,11 +55,12 @@ public class PaggingTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
private CassandraAsyncExecutor executor;
- @Before
- public void setUp() {
+
+ @BeforeClass
+ public static void setUpClass() {
CassandraModule modules = new CassandraModule() {
@Override
public List<CassandraTable> moduleTables() {
@@ -73,13 +76,22 @@ public class PaggingTest {
return ImmutableList.of();
}
};
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
+
+ @Before
+ public void setUp() {
executor = new CassandraAsyncExecutor(cassandra.getConf());
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
index 5bd83b5..463fb63 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
@@ -27,7 +27,9 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -35,20 +37,28 @@ public class CassandraSchemaVersionDAOTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
private CassandraSchemaVersionDAO testee;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraSchemaVersionModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() {
- cassandra = CassandraCluster.create(new CassandraSchemaVersionModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
-
testee = new CassandraSchemaVersionDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java
----------------------------------------------------------------------
diff --git a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java
index 699153d..59d0248 100644
--- a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java
+++ b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java
@@ -52,18 +52,18 @@ public class CassandraGenericEventStoreExtension implements BeforeAllCallback, A
public void beforeAll(ExtensionContext context) throws Exception {
dockerCassandraExtension.beforeAll(context);
dockerCassandra = dockerCassandraExtension.getDockerCassandra();
+ cassandra = CassandraCluster.create(
+ new CassandraEventStoreModule(), dockerCassandra.getIp(), dockerCassandra.getBindingPort());
}
@Override
public void afterAll(ExtensionContext context) throws Exception {
+ cassandra.closeCluster();
dockerCassandraExtension.afterAll(context);
}
@Override
public void beforeEach(ExtensionContext context) {
- cassandra = CassandraCluster.create(
- new CassandraEventStoreModule(), dockerCassandra.getIp(), dockerCassandra.getBindingPort());
-
JsonEventSerializer jsonEventSerializer = new JsonEventSerializer(modules);
eventStoreDao = new EventStoreDao(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION,
@@ -72,7 +72,7 @@ public class CassandraGenericEventStoreExtension implements BeforeAllCallback, A
@Override
public void afterEach(ExtensionContext context) {
- cassandra.close();
+ cassandra.clearTables();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java
index ad412d5..2ad6deb 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTest.java
@@ -37,45 +37,58 @@ import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
import org.apache.james.mailbox.cassandra.modules.CassandraMailboxRecentsModule;
import org.apache.james.mailbox.cassandra.modules.CassandraMessageModule;
import org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule;
+import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule;
import org.apache.james.mailbox.cassandra.modules.CassandraUidModule;
import org.apache.james.mailbox.store.AbstractCombinationManagerTest;
import org.apache.james.mailbox.store.CombinationManagerTestSystem;
import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraCombinationManagerTest extends AbstractCombinationManagerTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraAclModule(),
+ new CassandraMailboxModule(),
+ new CassandraMessageModule(),
+ new CassandraBlobModule(),
+ new CassandraMailboxCounterModule(),
+ new CassandraMailboxRecentsModule(),
+ new CassandraFirstUnseenModule(),
+ new CassandraUidModule(),
+ new CassandraModSeqModule(),
+ new CassandraSubscriptionModule(),
+ new CassandraAttachmentModule(),
+ new CassandraDeletedMessageModule(),
+ new CassandraAnnotationModule(),
+ new CassandraApplicableFlagsModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
@Override
@Before
public void setUp() throws Exception {
- CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraMessageModule(),
- new CassandraMailboxCounterModule(),
- new CassandraMailboxRecentsModule(),
- new CassandraFirstUnseenModule(),
- new CassandraDeletedMessageModule(),
- new CassandraUidModule(),
- new CassandraModSeqModule(),
- new CassandraAttachmentModule(),
- new CassandraAnnotationModule(),
- new CassandraApplicableFlagsModule(),
- new CassandraBlobModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
super.setUp();
}
-
+
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
index f511f06..f84be5a 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
@@ -40,34 +40,40 @@ import org.apache.james.mailbox.cassandra.modules.CassandraQuotaModule;
import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule;
import org.apache.james.mailbox.cassandra.modules.CassandraUidModule;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraMailboxManagerStressTest extends MailboxManagerStressTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraAclModule(),
+ new CassandraMailboxModule(),
+ new CassandraMessageModule(),
+ new CassandraBlobModule(),
+ new CassandraMailboxCounterModule(),
+ new CassandraMailboxRecentsModule(),
+ new CassandraFirstUnseenModule(),
+ new CassandraUidModule(),
+ new CassandraModSeqModule(),
+ new CassandraSubscriptionModule(),
+ new CassandraAttachmentModule(),
+ new CassandraDeletedMessageModule(),
+ new CassandraAnnotationModule(),
+ new CassandraApplicableFlagsModule(),
+ new CassandraQuotaModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ }
@Before
public void setup() throws Exception {
- CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraMessageModule(),
- new CassandraBlobModule(),
- new CassandraMailboxCounterModule(),
- new CassandraMailboxRecentsModule(),
- new CassandraFirstUnseenModule(),
- new CassandraUidModule(),
- new CassandraModSeqModule(),
- new CassandraSubscriptionModule(),
- new CassandraAttachmentModule(),
- new CassandraDeletedMessageModule(),
- new CassandraAnnotationModule(),
- new CassandraApplicableFlagsModule(),
- new CassandraQuotaModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
super.setUp();
}
@@ -76,8 +82,14 @@ public class CassandraMailboxManagerStressTest extends MailboxManagerStressTest
return CassandraMailboxManagerProvider.provideMailboxManager(cassandra.getConf(), cassandra.getTypesProvider());
}
+
@After
- public void tearDown() {
- cassandra.close();
+ public void tearDown() throws Exception {
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
index 4594300..0995257 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
@@ -39,37 +39,42 @@ import org.apache.james.mailbox.cassandra.modules.CassandraQuotaModule;
import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule;
import org.apache.james.mailbox.cassandra.modules.CassandraUidModule;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraMailboxManagerTest extends MailboxManagerTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
-
- @Before
- public void setup() throws Exception {
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraMessageModule(),
- new CassandraBlobModule(),
- new CassandraMailboxCounterModule(),
- new CassandraMailboxRecentsModule(),
- new CassandraFirstUnseenModule(),
- new CassandraUidModule(),
- new CassandraModSeqModule(),
- new CassandraSubscriptionModule(),
- new CassandraAttachmentModule(),
- new CassandraDeletedMessageModule(),
- new CassandraAnnotationModule(),
- new CassandraApplicableFlagsModule(),
- new CassandraQuotaModule());
+ new CassandraAclModule(),
+ new CassandraMailboxModule(),
+ new CassandraMessageModule(),
+ new CassandraBlobModule(),
+ new CassandraMailboxCounterModule(),
+ new CassandraMailboxRecentsModule(),
+ new CassandraFirstUnseenModule(),
+ new CassandraUidModule(),
+ new CassandraModSeqModule(),
+ new CassandraSubscriptionModule(),
+ new CassandraAttachmentModule(),
+ new CassandraDeletedMessageModule(),
+ new CassandraAnnotationModule(),
+ new CassandraApplicableFlagsModule(),
+ new CassandraQuotaModule());
cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ }
+
+ @Before
+ public void setup() throws Exception {
super.setUp();
}
-
@Override
protected MailboxManager provideMailboxManager() {
@@ -80,7 +85,12 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest {
@After
public void tearDown() throws Exception {
super.tearDown();
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java
index 62ecd26..2103071 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java
@@ -35,6 +35,7 @@ import org.apache.james.mailbox.cassandra.modules.CassandraMailboxRecentsModule;
import org.apache.james.mailbox.cassandra.modules.CassandraMessageModule;
import org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule;
import org.apache.james.mailbox.cassandra.modules.CassandraQuotaModule;
+import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule;
import org.apache.james.mailbox.cassandra.modules.CassandraUidModule;
import org.apache.james.mailbox.quota.CurrentQuotaManager;
import org.apache.james.mailbox.quota.MaxQuotaManager;
@@ -43,40 +44,52 @@ import org.apache.james.mailbox.store.AbstractMessageIdManagerQuotaTest;
import org.apache.james.mailbox.store.MessageIdManagerTestSystem;
import org.apache.james.mailbox.store.quota.StoreQuotaManager;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraMessageIdManagerQuotaTest extends AbstractMessageIdManagerQuotaTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraAclModule(),
+ new CassandraMailboxModule(),
+ new CassandraMessageModule(),
+ new CassandraBlobModule(),
+ new CassandraMailboxCounterModule(),
+ new CassandraMailboxRecentsModule(),
+ new CassandraFirstUnseenModule(),
+ new CassandraUidModule(),
+ new CassandraModSeqModule(),
+ new CassandraSubscriptionModule(),
+ new CassandraAttachmentModule(),
+ new CassandraDeletedMessageModule(),
+ new CassandraAnnotationModule(),
+ new CassandraApplicableFlagsModule(),
+ new CassandraQuotaModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
@Override
@Before
public void setUp() throws Exception {
- CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraMessageModule(),
- new CassandraMailboxCounterModule(),
- new CassandraMailboxRecentsModule(),
- new CassandraFirstUnseenModule(),
- new CassandraDeletedMessageModule(),
- new CassandraUidModule(),
- new CassandraModSeqModule(),
- new CassandraAttachmentModule(),
- new CassandraAnnotationModule(),
- new CassandraApplicableFlagsModule(),
- new CassandraQuotaModule(),
- new CassandraBlobModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
super.setUp();
}
-
+
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
index 4326bf7..952f1f7 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerSideEffectTest.java
@@ -40,39 +40,50 @@ import org.apache.james.mailbox.store.AbstractMessageIdManagerSideEffectTest;
import org.apache.james.mailbox.store.MessageIdManagerTestSystem;
import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraMessageIdManagerSideEffectTest extends AbstractMessageIdManagerSideEffectTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraAclModule(),
+ new CassandraMailboxModule(),
+ new CassandraMessageModule(),
+ new CassandraMailboxCounterModule(),
+ new CassandraMailboxRecentsModule(),
+ new CassandraFirstUnseenModule(),
+ new CassandraDeletedMessageModule(),
+ new CassandraUidModule(),
+ new CassandraModSeqModule(),
+ new CassandraAttachmentModule(),
+ new CassandraAnnotationModule(),
+ new CassandraApplicableFlagsModule(),
+ new CassandraBlobModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
@Override
@Before
public void setUp() throws Exception {
- CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraMessageModule(),
- new CassandraMailboxCounterModule(),
- new CassandraMailboxRecentsModule(),
- new CassandraFirstUnseenModule(),
- new CassandraDeletedMessageModule(),
- new CassandraUidModule(),
- new CassandraModSeqModule(),
- new CassandraAttachmentModule(),
- new CassandraAnnotationModule(),
- new CassandraApplicableFlagsModule(),
- new CassandraBlobModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
super.setUp();
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
index 5e3b728..95cb7c7 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
@@ -43,39 +43,50 @@ import org.apache.james.mailbox.store.MessageIdManagerTestSystem;
import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraMessageIdManagerStorageTest extends AbstractMessageIdManagerStorageTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraAclModule(),
+ new CassandraMailboxModule(),
+ new CassandraMessageModule(),
+ new CassandraMailboxCounterModule(),
+ new CassandraMailboxRecentsModule(),
+ new CassandraFirstUnseenModule(),
+ new CassandraDeletedMessageModule(),
+ new CassandraUidModule(),
+ new CassandraModSeqModule(),
+ new CassandraAttachmentModule(),
+ new CassandraAnnotationModule(),
+ new CassandraApplicableFlagsModule(),
+ new CassandraBlobModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
@Override
@Before
public void setUp() throws Exception {
- CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraMessageModule(),
- new CassandraMailboxCounterModule(),
- new CassandraMailboxRecentsModule(),
- new CassandraFirstUnseenModule(),
- new CassandraDeletedMessageModule(),
- new CassandraUidModule(),
- new CassandraModSeqModule(),
- new CassandraAttachmentModule(),
- new CassandraAnnotationModule(),
- new CassandraApplicableFlagsModule(),
- new CassandraBlobModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
super.setUp();
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
index 2835838..b0df27d 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
@@ -50,7 +50,9 @@ import org.apache.james.mailbox.cassandra.modules.CassandraMailboxCounterModule;
import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule;
import org.apache.james.mailbox.exception.SubscriptionException;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
/**
@@ -59,22 +61,31 @@ import org.junit.ClassRule;
public class CassandraSubscriptionManagerTest extends AbstractSubscriptionManagerTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
- @Before
- public void init() {
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
CassandraModuleComposite modules = new CassandraModuleComposite(
new CassandraSubscriptionModule(),
new CassandraMailboxCounterModule());
cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
+
+ @Before
+ public void init() {
super.setup();
}
@After
public void close() throws SubscriptionException {
super.teardown();
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java
index 18d350a..ab2293f 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java
@@ -47,7 +47,9 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.util.EventCollector;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -68,7 +70,8 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra = CassandraCluster.create(new CassandraRegistrationModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
+ private static CassandraCluster cassandra;
+
private RegisteredDelegatingMailboxListener registeredDelegatingMailboxListener1;
private RegisteredDelegatingMailboxListener registeredDelegatingMailboxListener2;
private RegisteredDelegatingMailboxListener registeredDelegatingMailboxListener3;
@@ -80,6 +83,11 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest {
private EventCollector eventCollectorOnce3;
private MailboxSession mailboxSession;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraRegistrationModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() throws Exception {
PublisherReceiver publisherReceiver = new PublisherReceiver();
@@ -145,7 +153,12 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest {
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java
index 99b57da..1459edb 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java
@@ -30,7 +30,9 @@ import org.apache.james.mailbox.cassandra.modules.CassandraRegistrationModule;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.publisher.Topic;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -38,7 +40,8 @@ public class CassandraMailboxPathRegistrerMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private final CassandraCluster cassandra = CassandraCluster.create(new CassandraRegistrationModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
+ private static CassandraCluster cassandra;
+
private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", "user", "name");
private static final MailboxPath MAILBOX_PATH_2 = new MailboxPath("namespace2", "user2", "name2");
private static final Topic TOPIC = new Topic("topic");
@@ -47,6 +50,11 @@ public class CassandraMailboxPathRegistrerMapperTest {
private CassandraMailboxPathRegisterMapper mapper;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraRegistrationModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() {
mapper = new CassandraMailboxPathRegisterMapper(cassandra.getConf(),
@@ -57,7 +65,12 @@ public class CassandraMailboxPathRegistrerMapperTest {
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java
index 0bf13a7..c8169a8 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java
@@ -41,22 +41,29 @@ import org.apache.james.mailbox.cassandra.table.CassandraACLTable;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxACL;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
public class CassandraACLMapperTest {
public static final CassandraId MAILBOX_ID = CassandraId.of(UUID.fromString("464765a0-e4e7-11e4-aba4-710c1de3782b"));
+
+ @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private static CassandraCluster cassandra;
+
private CassandraACLMapper cassandraACLMapper;
- private CassandraCluster cassandra;
private ExecutorService executor;
- @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraAclModule(), cassandraServer.getHost());
+ }
@Before
public void setUp() {
- cassandra = CassandraCluster.create(new CassandraAclModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
cassandraACLMapper = GuiceUtils.testInjector(cassandra)
.getInstance(CassandraACLMapper.class);
executor = Executors.newFixedThreadPool(2);
@@ -65,7 +72,12 @@ public class CassandraACLMapperTest {
@After
public void tearDown() {
executor.shutdownNow();
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java
index 53aca9e..7bde1a7 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapperTest.java
@@ -28,25 +28,35 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.store.mail.AnnotationMapper;
import org.apache.james.mailbox.store.mail.model.AnnotationMapperTest;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraAnnotationMapperTest extends AnnotationMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraAnnotationModule(), cassandraServer.getHost());
+ }
@Override
@Before
public void setUp() throws Exception {
- this.cassandra = CassandraCluster.create(new CassandraAnnotationModule(), cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
index f6b4004..af07d23 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
@@ -29,7 +29,9 @@ import org.apache.james.mailbox.FlagsBuilder;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.modules.CassandraApplicableFlagsModule;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -43,19 +45,28 @@ public class CassandraApplicableFlagDAOTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
private CassandraApplicableFlagDAO testee;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraApplicableFlagsModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
+ }
+
@Before
public void setUp() throws Exception {
- cassandra = CassandraCluster.create(new CassandraApplicableFlagsModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
testee = new CassandraApplicableFlagDAO(cassandra.getConf());
}
@After
- public void tearDown() throws Exception {
- cassandra.close();
+ public void tearDown() {
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOTest.java
index 6944618..eefdaff 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOTest.java
@@ -32,7 +32,9 @@ import org.apache.james.mailbox.cassandra.modules.CassandraAttachmentModule;
import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.AttachmentId;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -45,22 +47,30 @@ public class CassandraAttachmentDAOTest {
@ClassRule
public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
private CassandraAttachmentDAO testee;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraAttachmentModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() throws Exception {
- cassandra = CassandraCluster.create(new CassandraAttachmentModule(),
- cassandraServer.getIp(), cassandraServer.getBindingPort());
testee = new CassandraAttachmentDAO(cassandra.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION,
CassandraConfiguration.DEFAULT_CONFIGURATION);
}
@After
- public void tearDown() throws Exception {
- cassandra.close();
+ public void tearDown() {
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java
index d5f7ca4..38619d0 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2Test.java
@@ -33,7 +33,9 @@ import org.apache.james.mailbox.cassandra.modules.CassandraAttachmentModule;
import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.AttachmentId;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -44,23 +46,28 @@ public class CassandraAttachmentDAOV2Test {
@ClassRule
public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
private CassandraAttachmentDAOV2 testee;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraAttachmentModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() throws Exception {
- cassandra = CassandraCluster.create(
- new CassandraAttachmentModule(),
- cassandraServer.getIp(),
- cassandraServer.getBindingPort());
-
testee = new CassandraAttachmentDAOV2(BLOB_ID_FACTORY, cassandra.getConf());
}
@After
- public void tearDown() throws Exception {
- cassandra.close();
+ public void tearDown() {
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java
index 6a8517a..fc1794a 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java
@@ -39,7 +39,9 @@ import org.apache.james.mailbox.exception.AttachmentNotFoundException;
import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.AttachmentId;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
@@ -52,7 +54,7 @@ public class CassandraAttachmentFallbackTest {
@ClassRule
public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
private CassandraAttachmentDAOV2 attachmentDAOV2;
private CassandraAttachmentDAO attachmentDAO;
@@ -60,17 +62,16 @@ public class CassandraAttachmentFallbackTest {
private CassandraBlobsDAO blobsDAO;
private CassandraAttachmentMessageIdDAO attachmentMessageIdDAO;
- @Before
- public void setUp() throws Exception {
- CassandraModuleComposite compositeModule = new CassandraModuleComposite(
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
new CassandraAttachmentModule(),
new CassandraBlobModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
- cassandra = CassandraCluster.create(
- compositeModule,
- cassandraServer.getIp(),
- cassandraServer.getBindingPort());
-
+ @Before
+ public void setUp() throws Exception {
attachmentDAOV2 = new CassandraAttachmentDAOV2(BLOB_ID_FACTORY, cassandra.getConf());
attachmentDAO = new CassandraAttachmentDAO(cassandra.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION,
@@ -82,8 +83,13 @@ public class CassandraAttachmentFallbackTest {
}
@After
- public void tearDown() throws Exception {
- cassandra.close();
+ public void tearDown() {
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java
index 82a1ff2..745edbc 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapperTest.java
@@ -31,28 +31,39 @@ import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.store.mail.AttachmentMapper;
import org.apache.james.mailbox.store.mail.model.AttachmentMapperTest;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraAttachmentMapperTest extends AttachmentMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraAttachmentModule(),
+ new CassandraBlobModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
@Override
@Before
public void setUp() throws MailboxException {
- CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAttachmentModule(),
- new CassandraBlobModule());
- this.cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java
index f96fdf2..adf73b1 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAOTest.java
@@ -32,7 +32,9 @@ import org.apache.james.mailbox.store.mail.model.Username;
import org.apache.james.util.FluentFutureStream;
import org.apache.james.util.streams.JamesCollectors;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -44,21 +46,29 @@ public class CassandraAttachmentOwnerDAOTest {
@ClassRule
public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
private CassandraAttachmentOwnerDAO testee;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraAttachmentModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() throws Exception {
- cassandra = CassandraCluster.create(new CassandraAttachmentModule(),
- cassandraServer.getIp(), cassandraServer.getBindingPort());
testee = new CassandraAttachmentOwnerDAO(cassandra.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION);
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java
index 98f6b28..4d2ae8d 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java
@@ -31,7 +31,9 @@ import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.modules.CassandraDeletedMessageModule;
import org.apache.james.mailbox.model.MessageRange;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -48,20 +50,28 @@ public class CassandraDeletedMessageDAOTest {
public static final MessageUid UID_8 = MessageUid.of(8);
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
private CassandraDeletedMessageDAO testee;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraDeletedMessageModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() {
- cassandra = CassandraCluster.create(
- new CassandraDeletedMessageModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
testee = new CassandraDeletedMessageDAO(cassandra.getConf());
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java
index a911b3e..e2bbeb0 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAOTest.java
@@ -27,7 +27,9 @@ import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.modules.CassandraFirstUnseenModule;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -38,20 +40,28 @@ public class CassandraFirstUnseenDAOTest {
public static final MessageUid UID_2 = MessageUid.of(2);
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
private CassandraFirstUnseenDAO testee;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraFirstUnseenModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() {
- cassandra = CassandraCluster.create(
- new CassandraFirstUnseenModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
testee = new CassandraFirstUnseenDAO(cassandra.getConf());
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java
index c7dea0f..16e2620 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraGenericMailboxMapperTest.java
@@ -32,30 +32,41 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.MailboxMapperTest;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraGenericMailboxMapperTest extends MailboxMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraAclModule(),
+ new CassandraMailboxModule(),
+ new CassandraModSeqModule(),
+ new CassandraUidModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
@Override
@Before
public void setUp() throws Exception {
- CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraModSeqModule(),
- new CassandraUidModule());
- this.cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
index aee1922..8b6c3f2 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
@@ -48,7 +48,9 @@ import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -63,8 +65,8 @@ public class CassandraIndexTableHandlerTest {
public static final long MODSEQ = 17;
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
private CassandraMailboxCounterDAO mailboxCounterDAO;
private CassandraMailboxRecentsDAO mailboxRecentsDAO;
private CassandraApplicableFlagDAO applicableFlagDAO;
@@ -73,15 +75,19 @@ public class CassandraIndexTableHandlerTest {
private CassandraDeletedMessageDAO deletedMessageDAO;
private Mailbox mailbox;
- @Before
- public void setUp() {
- cassandra = CassandraCluster.create(
- new CassandraModuleComposite(
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
new CassandraMailboxCounterModule(),
new CassandraMailboxRecentsModule(),
new CassandraFirstUnseenModule(),
new CassandraApplicableFlagsModule(),
- new CassandraDeletedMessageModule()), cassandraServer.getIp(), cassandraServer.getBindingPort());
+ new CassandraDeletedMessageModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
+
+ @Before
+ public void setUp() {
mailboxCounterDAO = new CassandraMailboxCounterDAO(cassandra.getConf());
mailboxRecentsDAO = new CassandraMailboxRecentsDAO(cassandra.getConf());
firstUnseenDAO = new CassandraFirstUnseenDAO(cassandra.getConf());
@@ -101,7 +107,12 @@ public class CassandraIndexTableHandlerTest {
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
index 2220008..7f0ac27 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
@@ -29,7 +29,9 @@ import org.apache.james.mailbox.model.MailboxCounters;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -38,14 +40,17 @@ public class CassandraMailboxCounterDAOTest {
public static final CassandraId MAILBOX_ID = CassandraId.timeBased();
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
private CassandraMailboxCounterDAO testee;
private SimpleMailbox mailbox;
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraMailboxCounterModule(), cassandraServer.getHost());
+ }
+
@Before
public void setUp() {
- cassandra = CassandraCluster.create(new CassandraMailboxCounterModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
testee = new CassandraMailboxCounterDAO(cassandra.getConf());
mailbox = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY, MAILBOX_ID);
@@ -53,7 +58,12 @@ public class CassandraMailboxCounterDAOTest {
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
index b04b360..35565e3 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
@@ -33,7 +33,9 @@ import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -48,17 +50,20 @@ public class CassandraMailboxDAOTest {
public static CassandraId CASSANDRA_ID_2 = CassandraId.timeBased();
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
private CassandraMailboxDAO testee;
private SimpleMailbox mailbox1;
private SimpleMailbox mailbox2;
- @Before
- public void setUp() {
+ @BeforeClass
+ public static void setUpClass() {
CassandraModuleComposite modules = new CassandraModuleComposite(new CassandraMailboxModule(), new CassandraAclModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
+ @Before
+ public void setUp() {
testee = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider());
mailbox1 = new SimpleMailbox(MailboxPath.forUser("user", "abcd"),
@@ -71,7 +76,12 @@ public class CassandraMailboxDAOTest {
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
index d7f1a41..210911d 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
@@ -56,46 +56,55 @@ import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.mail.AttachmentMapperFactory;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraMailboxManagerAttachmentTest extends AbstractMailboxManagerAttachmentTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
+ private static CassandraCluster cassandra;
private CassandraMailboxSessionMapperFactory mailboxSessionMapperFactory;
private CassandraMailboxManager mailboxManager;
private CassandraMailboxManager parseFailingMailboxManager;
- private CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules =
+ new CassandraModuleComposite(
+ new CassandraAclModule(),
+ new CassandraMailboxModule(),
+ new CassandraMessageModule(),
+ new CassandraBlobModule(),
+ new CassandraMailboxCounterModule(),
+ new CassandraMailboxRecentsModule(),
+ new CassandraFirstUnseenModule(),
+ new CassandraDeletedMessageModule(),
+ new CassandraModSeqModule(),
+ new CassandraUidModule(),
+ new CassandraAttachmentModule(),
+ new CassandraApplicableFlagsModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
@Before
public void init() throws Exception {
-
- CassandraModuleComposite modules =
- new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraMessageModule(),
- new CassandraBlobModule(),
- new CassandraMailboxCounterModule(),
- new CassandraMailboxRecentsModule(),
- new CassandraFirstUnseenModule(),
- new CassandraDeletedMessageModule(),
- new CassandraModSeqModule(),
- new CassandraUidModule(),
- new CassandraAttachmentModule(),
- new CassandraApplicableFlagsModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
initSystemUnderTest();
super.setUp();
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
-
private void initSystemUnderTest() throws Exception {
CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory();
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java
index 6e65bac..d111653 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java
@@ -26,36 +26,43 @@ import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.mail.utils.GuiceUtils;
import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
-import org.apache.james.mailbox.cassandra.modules.CassandraModSeqModule;
-import org.apache.james.mailbox.cassandra.modules.CassandraUidModule;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.MailboxMapperACLTest;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
public class CassandraMailboxMapperAclTest extends MailboxMapperACLTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+
+ private static CassandraCluster cassandra;
+
+ @BeforeClass
+ public static void setUpClass() {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraAclModule(),
+ new CassandraMailboxModule());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
@Override
@Before
public void setUp() throws Exception {
- CassandraModuleComposite modules = new CassandraModuleComposite(
- new CassandraAclModule(),
- new CassandraMailboxModule(),
- new CassandraModSeqModule(),
- new CassandraUidModule());
- this.cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
index 8f99a59..020dd22 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
@@ -35,7 +35,9 @@ import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -47,22 +49,31 @@ public class CassandraMailboxMapperConcurrencyTest {
private static final int OPERATION_COUNT = 10;
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- private CassandraCluster cassandra;
+
+ private static CassandraCluster cassandra;
+
private CassandraMailboxMapper testee;
- @Before
- public void setUp() {
+ @BeforeClass
+ public static void setUpClass() {
CassandraModuleComposite modules = new CassandraModuleComposite(new CassandraMailboxModule(), new CassandraAclModule());
cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
+ }
+ @Before
+ public void setUp() {
testee = GuiceUtils.testInjector(cassandra)
.getInstance(CassandraMailboxMapper.class);
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index 8442e02..a849645 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@ -40,7 +40,9 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -60,16 +62,21 @@ public class CassandraMailboxMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- private CassandraCluster cassandra;
+ private static CassandraCluster cassandra;
+
private CassandraMailboxDAO mailboxDAO;
private CassandraMailboxPathDAOImpl mailboxPathDAO;
private CassandraMailboxPathV2DAO mailboxPathV2DAO;
private CassandraMailboxMapper testee;
- @Before
- public void setUp() {
+ @BeforeClass
+ public static void setUpClass() {
CassandraModuleComposite modules = new CassandraModuleComposite(new CassandraMailboxModule(), new CassandraAclModule());
cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ }
+
+ @Before
+ public void setUp() {
mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider());
mailboxPathDAO = new CassandraMailboxPathDAOImpl(cassandra.getConf(), cassandra.getTypesProvider());
mailboxPathV2DAO = new CassandraMailboxPathV2DAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
@@ -86,7 +93,12 @@ public class CassandraMailboxMapperTest {
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
index 14741a7..8468aa9 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
@@ -29,7 +29,9 @@ import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
import org.apache.james.mailbox.model.MailboxPath;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -50,22 +52,30 @@ public abstract class CassandraMailboxPathDAOTest {
public static final MailboxPath OTHER_USER_MAILBOXPATH = MailboxPath.forUser(OTHER_USER, "INBOX");
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
-
- protected CassandraCluster cassandra;
+
+ protected static CassandraCluster cassandra;
protected CassandraMailboxPathDAO testee;
abstract CassandraMailboxPathDAO testee();
+ @BeforeClass
+ public static void setUpClass() {
+ cassandra = CassandraCluster.create(new CassandraMailboxModule(), cassandraServer.getHost());
+ }
@Before
public void setUp() throws Exception {
- cassandra = CassandraCluster.create(new CassandraMailboxModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
testee = testee();
}
@After
public void tearDown() {
- cassandra.close();
+ cassandra.clearTables();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ cassandra.closeCluster();
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org