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 2019/05/10 11:30:19 UTC
[james-project] 06/17: JAMES-2751 Docker Cassandra restart should
be done before the cluster's creation
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 c8bed496ecd72dbbe684ffc8abbb760148a2d03d
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Thu May 9 14:28:43 2019 +0700
JAMES-2751 Docker Cassandra restart should be done before the cluster's creation
---
.../mpt/imapmailbox/cassandra/CassandraAuthenticatePlainTest.java | 6 ++++--
.../mpt/imapmailbox/cassandra/CassandraAuthenticatedStateTest.java | 6 ++++--
.../mpt/imapmailbox/cassandra/CassandraConcurrentSessionsTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraCondstoreTest.java | 6 ++++--
.../apache/james/mpt/imapmailbox/cassandra/CassandraCopyTest.java | 6 ++++--
.../apache/james/mpt/imapmailbox/cassandra/CassandraEventsTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraExpungeTest.java | 6 ++++--
.../mpt/imapmailbox/cassandra/CassandraFetchBodySectionTest.java | 6 ++++--
.../mpt/imapmailbox/cassandra/CassandraFetchBodyStructureTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraFetchHeadersTest.java | 6 ++++--
.../apache/james/mpt/imapmailbox/cassandra/CassandraFetchTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraListingTest.java | 6 ++++--
.../mpt/imapmailbox/cassandra/CassandraListingWithSharingTest.java | 6 ++++--
.../mpt/imapmailbox/cassandra/CassandraMailboxAnnotationTest.java | 6 ++++--
.../cassandra/CassandraMailboxWithLongNameErrorTest.java | 6 ++++--
.../apache/james/mpt/imapmailbox/cassandra/CassandraMoveTest.java | 6 ++++--
.../imapmailbox/cassandra/CassandraNonAuthenticatedStateTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraPartialFetchTest.java | 6 ++++--
.../apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java | 6 ++++--
.../apache/james/mpt/imapmailbox/cassandra/CassandraRenameTest.java | 6 ++++--
.../apache/james/mpt/imapmailbox/cassandra/CassandraSearchTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraSecurityTest.java | 6 ++++--
.../apache/james/mpt/imapmailbox/cassandra/CassandraSelectTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraSelectedInboxTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraSelectedStateTest.java | 6 ++++--
.../mpt/imapmailbox/cassandra/CassandraUidSearchOnIndexTest.java | 6 ++++--
.../james/mpt/imapmailbox/cassandra/CassandraUidSearchTest.java | 6 ++++--
.../mpt/imapmailbox/cassandra/CassandraUserFlagsSupportTest.java | 6 ++++--
28 files changed, 112 insertions(+), 56 deletions(-)
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlainTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlainTest.java
index c0efd9c..dfce173 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlainTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatePlainTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.AuthenticatePlain;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraAuthenticatePlainTest extends AuthenticatePlain {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedStateTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedStateTest.java
index 9011297..ea55f59 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedStateTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraAuthenticatedStateTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.AuthenticatedState;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraAuthenticatedStateTest extends AuthenticatedState {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessionsTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessionsTest.java
index 74f83ff..af41afc 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessionsTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraConcurrentSessionsTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.ConcurrentSessions;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraConcurrentSessionsTest extends ConcurrentSessions {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstoreTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstoreTest.java
index 276ae22..ab0a51a 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstoreTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCondstoreTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Condstore;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraCondstoreTest extends Condstore {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected JamesImapHostSystem createJamesImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopyTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopyTest.java
index f6cc114..8e85c47 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopyTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraCopyTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Copy;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraCopyTest extends Copy {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEventsTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEventsTest.java
index c76a5f3..532b7a9 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEventsTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraEventsTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Events;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraEventsTest extends Events {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpungeTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpungeTest.java
index 556c49e..f5afd12 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpungeTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraExpungeTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Expunge;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraExpungeTest extends Expunge {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySectionTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySectionTest.java
index bca8ed6..1cdf4c6 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySectionTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodySectionTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.FetchBodySection;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraFetchBodySectionTest extends FetchBodySection {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructureTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructureTest.java
index 0a5878b..8a48092 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructureTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchBodyStructureTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.FetchBodyStructure;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraFetchBodyStructureTest extends FetchBodyStructure {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeadersTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeadersTest.java
index 57b6248..aa5d71b 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeadersTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchHeadersTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.FetchHeaders;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraFetchHeadersTest extends FetchHeaders {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchTest.java
index 8adfa3a..e8885ef 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraFetchTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Fetch;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraFetchTest extends Fetch {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingTest.java
index f163bfd..6b419cd 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Listing;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraListingTest extends Listing {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingWithSharingTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingWithSharingTest.java
index aa3d61b..158f3c4 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingWithSharingTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraListingWithSharingTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.ListingWithSharingTest;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraListingWithSharingTest extends ListingWithSharingTest {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotationTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotationTest.java
index d8191f8..a6e50e6 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotationTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxAnnotationTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.MailboxAnnotation;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraMailboxAnnotationTest extends MailboxAnnotation {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameErrorTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameErrorTest.java
index ae4ff99..1a549f0 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameErrorTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxWithLongNameErrorTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.MailboxWithLongNameError;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraMailboxWithLongNameErrorTest extends MailboxWithLongNameError {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMoveTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMoveTest.java
index 005928e..c0f5907 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMoveTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMoveTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Move;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraMoveTest extends Move {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedStateTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedStateTest.java
index 6024d38..3a3428f 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedStateTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraNonAuthenticatedStateTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.NonAuthenticatedState;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraNonAuthenticatedStateTest extends NonAuthenticatedState {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetchTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetchTest.java
index 299127d..76816d9 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetchTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraPartialFetchTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.PartialFetch;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraPartialFetchTest extends PartialFetch {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java
index 12d0d9f..474c9cb 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraQuotaTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.QuotaTest;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraQuotaTest extends QuotaTest {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRenameTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRenameTest.java
index 4ecfba3..c6a38b2 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRenameTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraRenameTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Rename;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraRenameTest extends Rename {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearchTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearchTest.java
index b4b9212..9b4d05a 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearchTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSearchTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Search;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraSearchTest extends Search {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurityTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurityTest.java
index 68be8ae..d64613a 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurityTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSecurityTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Security;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraSecurityTest extends Security {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectTest.java
index 11afa50..fc9c1b4 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.Select;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraSelectTest extends Select {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInboxTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInboxTest.java
index f2856b4..78d0796 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInboxTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedInboxTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.SelectedInbox;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraSelectedInboxTest extends SelectedInbox {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedStateTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedStateTest.java
index dac4c4f..2bc0c37 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedStateTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraSelectedStateTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.SelectedState;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraSelectedStateTest extends SelectedState {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndexTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndexTest.java
index 97218af..d356731 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndexTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchOnIndexTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.UidSearchOnIndex;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraUidSearchOnIndexTest extends UidSearchOnIndex {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchTest.java
index 1259c41..bbe8158 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUidSearchTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.UidSearch;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraUidSearchTest extends UidSearch {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupportTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupportTest.java
index a04082b..a8eecdc 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupportTest.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraUserFlagsSupportTest.java
@@ -24,13 +24,15 @@ import org.apache.james.mpt.api.ImapHostSystem;
import org.apache.james.mpt.imapmailbox.cassandra.host.CassandraHostSystemRule;
import org.apache.james.mpt.imapmailbox.suite.UserFlagsSupport;
import org.junit.Rule;
+import org.junit.rules.RuleChain;
public class CassandraUserFlagsSupportTest extends UserFlagsSupport {
- @Rule
public DockerCassandraRule cassandraServer = new DockerCassandraRule().allowRestart();
- @Rule
public CassandraHostSystemRule cassandraHostSystemRule = new CassandraHostSystemRule(cassandraServer);
+ @Rule
+ public RuleChain ruleChain = RuleChain.outerRule(cassandraServer).around(cassandraHostSystemRule);
+
@Override
protected ImapHostSystem createImapHostSystem() {
return cassandraHostSystemRule.getImapHostSystem();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org