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 0c290e1f5a1b46f770af7a447b97b35b39fe83ce
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Wed Apr 3 10:37:59 2019 +0700
JAMES-2721 Implement new restart Rules strategy in mailbox/cassandra test
files
---
.../james/mailbox/cassandra/CassandraCombinationManagerTest.java | 8 ++++++++
.../mailbox/cassandra/CassandraMailboxManagerStressTest.java | 8 ++++++++
.../mailbox/cassandra/CassandraMessageIdManagerQuotaTest.java | 8 ++++++++
.../cassandra/CassandraMessageIdManagerSideEffectTest.java | 8 ++++++++
.../mailbox/cassandra/CassandraMessageIdManagerStorageTest.java | 8 ++++++++
.../mailbox/cassandra/CassandraSubscriptionManagerTest.java | 8 ++++++++
.../mailbox/cassandra/mail/CassandraAnnotationMapperTest.java | 9 +++++++++
.../mailbox/cassandra/mail/CassandraAttachmentMapperTest.java | 8 ++++++++
.../cassandra/mail/CassandraGenericMailboxMapperTest.java | 8 ++++++++
.../cassandra/mail/CassandraMailboxManagerAttachmentTest.java | 9 +++++++++
.../mailbox/cassandra/mail/CassandraMailboxMapperAclTest.java | 8 ++++++++
.../james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java | 8 ++++++++
.../mailbox/cassandra/mail/CassandraMessageIdMapperTest.java | 9 +++++++++
.../james/mailbox/cassandra/mail/CassandraMessageMapperTest.java | 8 ++++++++
.../james/mailbox/cassandra/mail/CassandraMessageMoveTest.java | 8 ++++++++
.../cassandra/mail/CassandraMessageWithAttachmentMapperTest.java | 8 ++++++++
.../cassandra/quota/CassandraCurrentQuotaManagerTest.java | 8 ++++++++
.../cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java | 8 ++++++++
.../mailbox/cassandra/user/CassandraSubscriptionMapperTest.java | 8 ++++++++
19 files changed, 155 insertions(+)
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 ad58afe..9de4870 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,6 +20,8 @@
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;
import org.apache.james.mailbox.events.InVMEventBus;
@@ -33,11 +35,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraCombinationManagerTest extends
AbstractCombinationManagerTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 360005d..fefbc69 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,6 +20,8 @@
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;
import org.apache.james.mailbox.cassandra.mail.MailboxAggregateModule;
@@ -30,11 +32,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraMailboxManagerStressTest extends
MailboxManagerStressTest<CassandraMailboxManager> {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 0c8d9f4..ff1cd53 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,6 +20,8 @@
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;
import org.apache.james.mailbox.quota.CurrentQuotaManager;
@@ -33,11 +35,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraMessageIdManagerQuotaTest extends
AbstractMessageIdManagerQuotaTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 2d76328..f7a3d1e 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,6 +22,8 @@ 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;
import org.apache.james.mailbox.events.EventBus;
@@ -34,11 +36,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraMessageIdManagerSideEffectTest extends
AbstractMessageIdManagerSideEffectTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 99a9093..46ab196 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,6 +20,8 @@
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;
import org.apache.james.mailbox.events.InVMEventBus;
@@ -34,11 +36,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraMessageIdManagerStorageTest extends
AbstractMessageIdManagerStorageTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 517b85e..13fa851 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,6 +20,8 @@
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;
import org.apache.james.backends.cassandra.utils.CassandraUtils;
@@ -52,6 +54,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
/**
* Test Cassandra subscription against some general purpose written code.
@@ -60,6 +63,11 @@ 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;
@BeforeClass
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 f0f5550..30628ac 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,6 +20,8 @@
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;
import org.apache.james.mailbox.cassandra.mail.utils.GuiceUtils;
@@ -32,10 +34,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
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;
@BeforeClass
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 e0d7be7..041b3b4 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,6 +20,8 @@
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;
import org.apache.james.blob.cassandra.CassandraBlobModule;
@@ -35,10 +37,16 @@ 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();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
private static CassandraCluster cassandra;
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 1e4ad2b..c7c26bb 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,6 +20,8 @@
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;
import
org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
@@ -37,10 +39,16 @@ 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();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
private static CassandraCluster cassandra;
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 8055312..f3ab6c2 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,6 +23,8 @@ 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;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
@@ -55,10 +57,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraMailboxManagerAttachmentTest extends
AbstractMailboxManagerAttachmentTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
private CassandraMailboxSessionMapperFactory mailboxSessionMapperFactory;
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 7484657..3fe61d6 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,6 +20,8 @@
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;
import
org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
@@ -35,11 +37,17 @@ 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();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 a2a3ff8..f1b7616 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,6 +26,8 @@ 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;
import
org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
@@ -45,6 +47,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
public class CassandraMailboxMapperTest {
@@ -62,6 +65,11 @@ public class CassandraMailboxMapperTest {
private static final String WILDCARD = "%";
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
private static CassandraCluster cassandra;
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 7a47973..6ff86b5 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,6 +24,8 @@ 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;
import org.apache.james.mailbox.MailboxSession;
@@ -40,6 +42,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
@@ -47,8 +50,14 @@ import com.google.common.collect.ImmutableList;
public class CassandraMessageIdMapperTest extends MessageIdMapperTest {
private static final MailboxSession MAILBOX_SESSION =
MailboxSessionUtil.create("benwa");
+
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 25a850e..8b0e9f9 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,6 +20,8 @@
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;
@@ -28,11 +30,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
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;
@BeforeClass
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 0d5d264..3998b3d 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,6 +20,8 @@
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;
@@ -28,11 +30,17 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
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;
@BeforeClass
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 25dfc0c..f586b3e 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,6 +20,8 @@
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;
@@ -28,10 +30,16 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraMessageWithAttachmentMapperTest extends
MessageWithAttachmentMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
private static CassandraCluster cassandra;
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 949b7e1..9be1a71 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,6 +20,8 @@
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;
@@ -28,11 +30,17 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraCurrentQuotaManagerTest extends
StoreCurrentQuotaManagerTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 3c65881..a3a514f 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,6 +20,8 @@
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;
import org.apache.james.mailbox.cassandra.modules.CassandraQuotaModule;
@@ -29,11 +31,17 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
public class CassandraPerUserMaxQuotaManagerTest extends
GenericMaxQuotaManagerTest {
@ClassRule public static DockerCassandraRule cassandraServer = new
DockerCassandraRule();
+ @ClassRule public static DockerCassandraRestartRule cassandraRestartRule =
new DockerCassandraRestartRule();
+
+ @Rule
+ public DockerCassandraIncrementTestsPlayedRule cassandraIncrementRule =
new DockerCassandraIncrementTestsPlayedRule();
+
private static CassandraCluster cassandra;
@BeforeClass
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 f3c127b..320149d 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,6 +19,8 @@
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;
import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule;
@@ -28,11 +30,17 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Rule;
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();
+
private static CassandraCluster cassandra;
@BeforeClass
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
