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 ad...@apache.org on 2017/11/20 13:05:00 UTC
[2/4] james-project git commit: JAMES-2221 Ensure Cassandra container
is well restarted in Cassandra JMAP integration tests
JAMES-2221 Ensure Cassandra container is well restarted in Cassandra JMAP integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/663bd146
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/663bd146
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/663bd146
Branch: refs/heads/master
Commit: 663bd146abc0c83e5fbecfe713896feb1a5e396d
Parents: 0b5cb97
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Nov 17 14:29:09 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Nov 17 14:29:09 2017 +0100
----------------------------------------------------------------------
.../cassandra/CassandraGetMailboxesMethodTest.java | 11 +++++++++--
.../cassandra/CassandraGetVacationResponseTest.java | 11 +++++++++--
.../cassandra/CassandraJmapAuthenticationTest.java | 11 +++++++++--
.../cassandra/CassandraSetMailboxesMethodTest.java | 11 +++++++++--
.../cassandra/CassandraSetVacationResponseTest.java | 11 +++++++++--
.../CassandraUserProvisionningConcurrencyTest.java | 9 ++++++++-
.../cassandra/CassandraVacationIntegrationTest.java | 9 ++++++++-
.../CassandraVacationRelayIntegrationTest.java | 15 +++++++++++----
8 files changed, 72 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/663bd146/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
index 34f0335..41691a7 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java
@@ -22,17 +22,24 @@ package org.apache.james.jmap.cassandra;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest;
import org.junit.ClassRule;
import org.junit.Rule;
+import org.junit.rules.TestRule;
public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest {
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
-
- @Rule
+
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
+ @Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+
+ @Rule
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
@Override
protected GuiceJamesServer createJmapServer() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/663bd146/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
index 7d7a3cc..507d3ba 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java
@@ -22,18 +22,25 @@ package org.apache.james.jmap.cassandra;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.jmap.methods.integration.GetVacationResponseTest;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.junit.ClassRule;
import org.junit.Rule;
+import org.junit.rules.TestRule;
public class CassandraGetVacationResponseTest extends GetVacationResponseTest {
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
-
- @Rule
+
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
+ @Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+
+ @Rule
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
@Override
protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/663bd146/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
index db874ef..13c442c 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
@@ -21,19 +21,26 @@ package org.apache.james.jmap.cassandra;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
import org.apache.james.jmap.JMAPAuthenticationTest;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.junit.ClassRule;
import org.junit.Rule;
+import org.junit.rules.TestRule;
public class CassandraJmapAuthenticationTest extends JMAPAuthenticationTest {
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
-
- @Rule
+
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
+ @Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+
+ @Rule
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
@Override
protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/663bd146/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
index 5eb0929..6a39a6a 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
@@ -22,18 +22,25 @@ package org.apache.james.jmap.cassandra;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule;
+import org.junit.rules.TestRule;
public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest {
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
-
- @Rule
+
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
+ @Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+
+ @Rule
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
@Override
protected GuiceJamesServer createJmapServer() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/663bd146/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
index f1003e8..b22122b 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java
@@ -22,17 +22,24 @@ package org.apache.james.jmap.cassandra;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.jmap.methods.integration.SetVacationResponseTest;
import org.junit.ClassRule;
import org.junit.Rule;
+import org.junit.rules.TestRule;
public class CassandraSetVacationResponseTest extends SetVacationResponseTest {
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
-
- @Rule
+
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
+ @Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+
+ @Rule
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
@Override
protected GuiceJamesServer createJmapServer() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/663bd146/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraUserProvisionningConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraUserProvisionningConcurrencyTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraUserProvisionningConcurrencyTest.java
index d9c71f1..4762f7b 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraUserProvisionningConcurrencyTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraUserProvisionningConcurrencyTest.java
@@ -22,18 +22,25 @@ package org.apache.james.jmap.cassandra;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.jmap.UserProvisionningConcurrencyTest;
import org.junit.ClassRule;
import org.junit.Rule;
+import org.junit.rules.TestRule;
public class CassandraUserProvisionningConcurrencyTest extends UserProvisionningConcurrencyTest {
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
-
+
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
@Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+ @Rule
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
+
@Override
protected GuiceJamesServer createJmapServer() {
return rule.jmapServer(cassandra.getModule());
http://git-wip-us.apache.org/repos/asf/james-project/blob/663bd146/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
index 197aad9..e1bddfe 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java
@@ -22,17 +22,24 @@ package org.apache.james.jmap.cassandra;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.jmap.VacationIntegrationTest;
import org.junit.ClassRule;
import org.junit.Rule;
+import org.junit.rules.TestRule;
public class CassandraVacationIntegrationTest extends VacationIntegrationTest {
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
- @Rule
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
+ @Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+
+ @Rule
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
@Override
protected GuiceJamesServer createJmapServer() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/663bd146/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java
index 15d7d54..4e1139f 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java
@@ -22,11 +22,13 @@ package org.apache.james.jmap.cassandra;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.InMemoryDNSService;
import org.apache.james.jmap.VacationRelayIntegrationTest;
import org.junit.ClassRule;
import org.junit.Rule;
+import org.junit.rules.TestRule;
public class CassandraVacationRelayIntegrationTest extends VacationRelayIntegrationTest {
@@ -34,20 +36,25 @@ public class CassandraVacationRelayIntegrationTest extends VacationRelayIntegrat
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
-
+
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
+ @Rule
+ public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+
@Rule
- public CassandraJmapTestRule jamesServerRule = CassandraJmapTestRule.defaultTestRule();
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
@Override
protected GuiceJamesServer getJmapServer() {
- return jamesServerRule.jmapServer(
+ return rule.jmapServer(
cassandra.getModule(),
(binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService));
}
@Override
protected void await() {
- jamesServerRule.await();
+ rule.await();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org