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:07 UTC
[05/15] james-project git commit: JAMES-2470 Use a single Cassandra
Cluster for a full test class
http://git-wip-us.apache.org/repos/asf/james-project/blob/61b8caa3/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
index bfbed2c..2d73711 100644
--- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
+++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
@@ -29,7 +29,9 @@ import org.apache.james.blob.cassandra.CassandraBlobsDAO;
import org.apache.james.mailrepository.MailRepositoryContract;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailrepository.api.MailRepositoryUrl;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -41,16 +43,18 @@ class CassandraMailRepositoryTest implements MailRepositoryContract {
static final CassandraBlobId.Factory BLOB_ID_FACTORY = new CassandraBlobId.Factory();
CassandraMailRepository cassandraMailRepository;
- CassandraCluster cassandra;
+ static CassandraCluster cassandra;
- @BeforeEach
- void setup(DockerCassandraExtension.DockerCassandra dockerCassandra) {
- cassandra = CassandraCluster.create(
- new CassandraModuleComposite(
- new CassandraMailRepositoryModule(),
- new CassandraBlobModule()),
- dockerCassandra.getIp(), dockerCassandra.getBindingPort());
+ @BeforeAll
+ static void setUpClass(DockerCassandraExtension.DockerCassandra dockerCassandra) {
+ CassandraModuleComposite modules = new CassandraModuleComposite(
+ new CassandraMailRepositoryModule(),
+ new CassandraBlobModule());
+ cassandra = CassandraCluster.create(modules, dockerCassandra.getIp(), dockerCassandra.getBindingPort());
+ }
+ @BeforeEach
+ void setup() {
CassandraMailRepositoryMailDAO mailDAO = new CassandraMailRepositoryMailDAO(cassandra.getConf(), BLOB_ID_FACTORY, cassandra.getTypesProvider());
CassandraMailRepositoryKeysDAO keysDAO = new CassandraMailRepositoryKeysDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
CassandraMailRepositoryCountDAO countDAO = new CassandraMailRepositoryCountDAO(cassandra.getConf());
@@ -61,8 +65,13 @@ class CassandraMailRepositoryTest implements MailRepositoryContract {
}
@AfterEach
- public void tearDown() {
- cassandra.close();
+ void tearDown() {
+ cassandra.clearTables();
+ }
+
+ @AfterAll
+ static void tearDownClass() {
+ cassandra.closeCluster();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org