This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ec199e27eb7c04a3525f9387a0e4c648d270bf28
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Wed Apr 10 15:52:29 2019 +0700
JAMES-2721 Refactor restart Rule strategy between tests instead of test
classes
---
.../DockerCassandraIncrementTestsPlayedRule.java | 29 ------------------
.../cassandra/DockerCassandraRestartRule.java | 1 +
.../cassandra/DockerCassandraSingleton.java | 2 +-
.../cassandra/CassandraCombinationManagerTest.java | 19 ++----------
.../CassandraMailboxManagerStressTest.java | 19 ++----------
.../CassandraMessageIdManagerQuotaTest.java | 19 ++----------
.../CassandraMessageIdManagerSideEffectTest.java | 19 ++----------
.../CassandraMessageIdManagerStorageTest.java | 19 ++----------
.../CassandraSubscriptionManagerTest.java | 19 ++----------
.../mail/CassandraAnnotationMapperTest.java | 19 ++----------
.../mail/CassandraAttachmentMapperTest.java | 28 +++++-------------
.../mail/CassandraGenericMailboxMapperTest.java | 34 +++++++---------------
.../CassandraMailboxManagerAttachmentTest.java | 19 ++----------
.../mail/CassandraMailboxMapperAclTest.java | 30 ++++++-------------
.../cassandra/mail/CassandraMailboxMapperTest.java | 30 ++++++-------------
.../mail/CassandraMessageIdMapperTest.java | 19 ++----------
.../cassandra/mail/CassandraMessageMapperTest.java | 19 ++----------
.../cassandra/mail/CassandraMessageMoveTest.java | 19 ++----------
.../CassandraMessageWithAttachmentMapperTest.java | 19 ++----------
.../quota/CassandraCurrentQuotaManagerTest.java | 21 +++++--------
.../quota/CassandraPerUserMaxQuotaManagerTest.java | 18 ++++++------
.../user/CassandraSubscriptionMapperTest.java | 20 +++++--------
22 files changed, 98 insertions(+), 343 deletions(-)
diff --git
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraIncrementTestsPlayedRule.java
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraIncrementTestsPlayedRule.java
deleted file mode 100644
index e8289dd..0000000
---
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraIncrementTestsPlayedRule.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.backends.cassandra;
-
-import org.junit.rules.ExternalResource;
-
-public class DockerCassandraIncrementTestsPlayedRule extends ExternalResource {
- @Override
- protected void before() {
- DockerCassandraSingleton.incrementTestsPlayed();
- }
-}
diff --git
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRestartRule.java
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRestartRule.java
index 622f09c..2c313cb 100644
---
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRestartRule.java
+++
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRestartRule.java
@@ -24,6 +24,7 @@ import org.junit.rules.ExternalResource;
public class DockerCassandraRestartRule extends ExternalResource {
@Override
protected void before() {
+ DockerCassandraSingleton.incrementTestsPlayed();
DockerCassandraSingleton.restartAfterMaxTestsPlayed();
}
}
diff --git
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraSingleton.java
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraSingleton.java
index 2374b10..9684e63 100644
---
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraSingleton.java
+++
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraSingleton.java
@@ -20,7 +20,7 @@
package org.apache.james.backends.cassandra;
public class DockerCassandraSingleton {
- private static final int MAX_TEST_PLAYED = 200;
+ private static final int MAX_TEST_PLAYED = 100;
private static int testsPlayedCount = 0;
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 9de4870..c520d24 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule;
@@ -31,9 +30,7 @@ import
org.apache.james.mailbox.store.CombinationManagerTestSystem;
import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -41,31 +38,21 @@ public class CassandraCombinationManagerTest extends
AbstractCombinationManagerT
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 fefbc69..9eacb54 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.MailboxManagerStressTest;
@@ -28,9 +27,7 @@ import
org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule;
import org.apache.james.mailbox.events.EventBus;
import org.apache.james.mailbox.store.PreDeletionHooks;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -38,20 +35,14 @@ public class CassandraMailboxManagerStressTest extends
MailboxManagerStressTest<
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra =
CassandraCluster.create(MailboxAggregateModule.MODULE_WITH_QUOTA,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Before
public void setup() throws Exception {
+ cassandra =
CassandraCluster.create(MailboxAggregateModule.MODULE_WITH_QUOTA,
cassandraServer.getHost());
super.setUp();
}
@@ -68,10 +59,6 @@ public class CassandraMailboxManagerStressTest extends
MailboxManagerStressTest<
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
}
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 ff1cd53..eb799d3 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule;
@@ -31,9 +30,7 @@ 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;
import org.junit.Rule;
@@ -41,31 +38,21 @@ public class CassandraMessageIdManagerQuotaTest extends
AbstractMessageIdManager
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra =
CassandraCluster.create(MailboxAggregateModule.MODULE_WITH_QUOTA,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra =
CassandraCluster.create(MailboxAggregateModule.MODULE_WITH_QUOTA,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 f7a3d1e..d019c88 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
@@ -22,7 +22,6 @@ package org.apache.james.mailbox.cassandra;
import java.util.Set;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule;
@@ -32,9 +31,7 @@ import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.store.AbstractMessageIdManagerSideEffectTest;
import org.apache.james.mailbox.store.MessageIdManagerTestSystem;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -42,31 +39,21 @@ public class CassandraMessageIdManagerSideEffectTest
extends AbstractMessageIdMa
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 46ab196..5bee496 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule;
@@ -32,9 +31,7 @@ import
org.apache.james.mailbox.store.MessageIdManagerTestSystem;
import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -42,31 +39,21 @@ public class CassandraMessageIdManagerStorageTest extends
AbstractMessageIdManag
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 13fa851..9ae43ba 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import
org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
@@ -50,9 +49,7 @@ import
org.apache.james.mailbox.cassandra.mail.CassandraUserMailboxRightsDAO;
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;
import org.junit.Rule;
@@ -63,20 +60,14 @@ public class CassandraSubscriptionManagerTest extends
AbstractSubscriptionManage
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra =
CassandraCluster.create(CassandraSubscriptionModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Before
public void init() {
+ cassandra =
CassandraCluster.create(CassandraSubscriptionModule.MODULE,
cassandraServer.getHost());
super.setup();
}
@@ -84,10 +75,6 @@ public class CassandraSubscriptionManagerTest extends
AbstractSubscriptionManage
public void close() throws SubscriptionException {
super.teardown();
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 30628ac..9b8fedc 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra.mail;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
@@ -30,9 +29,7 @@ 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;
import org.junit.Rule;
@@ -40,31 +37,21 @@ public class CassandraAnnotationMapperTest extends
AnnotationMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(CassandraAnnotationModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(CassandraAnnotationModule.MODULE,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 041b3b4..459d33e 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra.mail;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.backends.cassandra.components.CassandraModule;
@@ -33,44 +32,33 @@ 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;
import org.junit.Rule;
public class CassandraAttachmentMapperTest extends AttachmentMapperTest {
-
- @ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+ private static final CassandraModule MODULES =
CassandraModule.aggregateModules(
+ CassandraAttachmentModule.MODULE,
+ CassandraBlobModule.MODULE);
+
+ @ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- CassandraModule modules = CassandraModule.aggregateModules(
- CassandraAttachmentModule.MODULE,
- CassandraBlobModule.MODULE);
- cassandra = CassandraCluster.create(modules,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws MailboxException {
+ cassandra = CassandraCluster.create(MODULES,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 c7c26bb..7dc87c3 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra.mail;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.backends.cassandra.components.CassandraModule;
@@ -35,47 +34,36 @@ 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;
import org.junit.Rule;
public class CassandraGenericMailboxMapperTest extends MailboxMapperTest {
-
- @ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+ private static final CassandraModule MODULES =
CassandraModule.aggregateModules(
+ CassandraSchemaVersionModule.MODULE,
+ CassandraAclModule.MODULE,
+ CassandraMailboxModule.MODULE,
+ CassandraModSeqModule.MODULE,
+ CassandraUidModule.MODULE);
+
+ @ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- CassandraModule modules = CassandraModule.aggregateModules(
- CassandraSchemaVersionModule.MODULE,
- CassandraAclModule.MODULE,
- CassandraMailboxModule.MODULE,
- CassandraModSeqModule.MODULE,
- CassandraUidModule.MODULE);
- cassandra = CassandraCluster.create(modules,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(MODULES,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 f3ab6c2..6ae1479 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
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.MailboxManager;
@@ -53,9 +52,7 @@ import
org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -63,24 +60,18 @@ public class CassandraMailboxManagerAttachmentTest extends
AbstractMailboxManage
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- private static CassandraCluster cassandra;
+ private CassandraCluster cassandra;
private CassandraMailboxSessionMapperFactory mailboxSessionMapperFactory;
private CassandraMailboxManager mailboxManager;
private CassandraMailboxManager parseFailingMailboxManager;
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
- }
-
@Before
public void init() throws Exception {
+ cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
initSystemUnderTest();
super.setUp();
}
@@ -88,10 +79,6 @@ public class CassandraMailboxManagerAttachmentTest extends
AbstractMailboxManage
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 3fe61d6..03238a5 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
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra.mail;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.backends.cassandra.components.CassandraModule;
@@ -33,45 +32,34 @@ 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;
import org.junit.Rule;
public class CassandraMailboxMapperAclTest extends MailboxMapperACLTest {
-
- @ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+ private static final CassandraModule MODULES =
CassandraModule.aggregateModules(
+ CassandraSchemaVersionModule.MODULE,
+ CassandraAclModule.MODULE,
+ CassandraMailboxModule.MODULE);
- @Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+ @ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- private static CassandraCluster cassandra;
+ @Rule
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- CassandraModule modules = CassandraModule.aggregateModules(
- CassandraSchemaVersionModule.MODULE,
- CassandraAclModule.MODULE,
- CassandraMailboxModule.MODULE);
- cassandra = CassandraCluster.create(modules,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(MODULES,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
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 f1b7616..f6131c6 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
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.backends.cassandra.components.CassandraModule;
@@ -42,9 +41,7 @@ import org.apache.james.mailbox.model.Mailbox;
import org.apache.james.mailbox.model.MailboxConstants;
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.Ignore;
import org.junit.Rule;
@@ -64,31 +61,26 @@ public class CassandraMailboxMapperTest {
private static final Mailbox MAILBOX_BIS = new Mailbox(MAILBOX_PATH,
UID_VALIDITY, MAILBOX_ID_2);
private static final String WILDCARD = "%";
- @ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ private static final CassandraModule MODULES =
CassandraModule.aggregateModules(
+ CassandraMailboxModule.MODULE,
+ CassandraSchemaVersionModule.MODULE,
+ CassandraAclModule.MODULE);
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+ @ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
+
+ private CassandraCluster cassandra;
private CassandraMailboxDAO mailboxDAO;
private CassandraMailboxPathDAOImpl mailboxPathDAO;
private CassandraMailboxPathV2DAO mailboxPathV2DAO;
private CassandraMailboxMapper testee;
- @BeforeClass
- public static void setUpClass() {
- CassandraModule modules = CassandraModule.aggregateModules(
- CassandraMailboxModule.MODULE,
- CassandraSchemaVersionModule.MODULE,
- CassandraAclModule.MODULE);
- cassandra = CassandraCluster.create(modules,
cassandraServer.getHost());
- }
-
@Before
public void setUp() {
+ cassandra = CassandraCluster.create(MODULES,
cassandraServer.getHost());
mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(),
cassandra.getTypesProvider());
mailboxPathDAO = new CassandraMailboxPathDAOImpl(cassandra.getConf(),
cassandra.getTypesProvider());
mailboxPathV2DAO = new CassandraMailboxPathV2DAO(cassandra.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION);
@@ -106,10 +98,6 @@ public class CassandraMailboxMapperTest {
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
index 6ff86b5..15a4f0c 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java
@@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import
org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
@@ -38,9 +37,7 @@ import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.MessageIdMapperTest;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -53,31 +50,21 @@ public class CassandraMessageIdMapperTest extends
MessageIdMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws MailboxException {
+ cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
index 8b0e9f9..f567b69 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
@@ -20,15 +20,12 @@
package org.apache.james.mailbox.cassandra.mail;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
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.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -36,31 +33,21 @@ public class CassandraMessageMapperTest extends
MessageMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java
index 3998b3d..c01b882 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMoveTest.java
@@ -20,15 +20,12 @@
package org.apache.james.mailbox.cassandra.mail;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
import org.apache.james.mailbox.store.mail.model.MessageMoveTest;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -36,31 +33,21 @@ public class CassandraMessageMoveTest extends
MessageMoveTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java
index f586b3e..8fc2103 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageWithAttachmentMapperTest.java
@@ -20,15 +20,12 @@
package org.apache.james.mailbox.cassandra.mail;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.store.mail.model.MapperProvider;
import
org.apache.james.mailbox.store.mail.model.MessageWithAttachmentMapperTest;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -36,31 +33,21 @@ public class CassandraMessageWithAttachmentMapperTest
extends MessageWithAttachm
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
-
- private static CassandraCluster cassandra;
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- @BeforeClass
- public static void setUpClass() {
- cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
- }
+ private CassandraCluster cassandra;
@Override
@Before
public void setUp() throws Exception {
+ cassandra = CassandraCluster.create(MailboxAggregateModule.MODULE,
cassandraServer.getHost());
super.setUp();
}
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
index 9be1a71..5068c09 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
@@ -20,15 +20,13 @@
package org.apache.james.mailbox.cassandra.quota;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.cassandra.modules.CassandraQuotaModule;
import org.apache.james.mailbox.store.quota.StoreCurrentQuotaManager;
import org.apache.james.mailbox.store.quota.StoreCurrentQuotaManagerTest;
import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -36,16 +34,16 @@ public class CassandraCurrentQuotaManagerTest extends
StoreCurrentQuotaManagerTe
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- private static CassandraCluster cassandra;
+ private CassandraCluster cassandra;
- @BeforeClass
- public static void setUpClass() {
+ @Override
+ @Before
+ public void setUp() throws Exception {
cassandra = CassandraCluster.create(CassandraQuotaModule.MODULE,
cassandraServer.getHost());
+ super.setUp();
}
@Override
@@ -56,11 +54,6 @@ public class CassandraCurrentQuotaManagerTest extends
StoreCurrentQuotaManagerTe
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
-
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
index a3a514f..c4db01f 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.cassandra.quota;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mailbox.cassandra.mail.utils.GuiceUtils;
@@ -29,7 +28,7 @@ import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.store.quota.GenericMaxQuotaManagerTest;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -37,16 +36,16 @@ public class CassandraPerUserMaxQuotaManagerTest extends
GenericMaxQuotaManagerT
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- private static CassandraCluster cassandra;
+ private CassandraCluster cassandra;
- @BeforeClass
- public static void setUpClass() {
+ @Override
+ @Before
+ public void setUp() {
cassandra = CassandraCluster.create(CassandraQuotaModule.MODULE,
cassandraServer.getHost());
+ super.setUp();
}
@Override
@@ -58,11 +57,12 @@ public class CassandraPerUserMaxQuotaManagerTest extends
GenericMaxQuotaManagerT
@After
public void cleanUp() {
cassandra.clearTables();
+ cassandra.closeCluster();
}
@AfterClass
public static void tearDownClass() {
- cassandra.closeCluster();
+
}
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
index 320149d..e2e388f 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
@@ -19,7 +19,6 @@
package org.apache.james.mailbox.cassandra.user;
import org.apache.james.backends.cassandra.CassandraCluster;
-import
org.apache.james.backends.cassandra.DockerCassandraIncrementTestsPlayedRule;
import org.apache.james.backends.cassandra.DockerCassandraRestartRule;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.backends.cassandra.utils.CassandraUtils;
@@ -27,8 +26,7 @@ import
org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule;
import org.apache.james.mailbox.store.user.SubscriptionMapper;
import org.apache.james.mailbox.store.user.SubscriptionMapperTest;
import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -36,16 +34,16 @@ public class CassandraSubscriptionMapperTest extends
SubscriptionMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
- @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
-
@Rule
- public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+ public DockerCassandraRestartRule cassandraRestartRule = new
DockerCassandraRestartRule();
- private static CassandraCluster cassandra;
+ private CassandraCluster cassandra;
- @BeforeClass
- public static void setUpClass() {
+ @Override
+ @Before
+ public void setUp() {
cassandra =
CassandraCluster.create(CassandraSubscriptionModule.MODULE,
cassandraServer.getHost());
+ super.setUp();
}
@Override
@@ -56,10 +54,6 @@ public class CassandraSubscriptionMapperTest extends
SubscriptionMapperTest {
@After
public void tearDown() {
cassandra.clearTables();
- }
-
- @AfterClass
- public static void tearDownClass() {
cassandra.closeCluster();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
