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:18 UTC
[james-project] 05/17: JAMES-2751 Fixing Docker Cassandra restart
rule
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 ff5f484f2b2bf438488616330a5d7fbcf3de2fdf
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Thu May 9 11:30:44 2019 +0700
JAMES-2751 Fixing Docker Cassandra restart rule
---
.../james/backends/cassandra/DockerCassandraRule.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
index e213125..d89fd55 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
@@ -20,13 +20,11 @@
package org.apache.james.backends.cassandra;
import org.apache.james.util.Host;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
+import org.junit.rules.ExternalResource;
import org.testcontainers.containers.GenericContainer;
-public class DockerCassandraRule implements TestRule {
+public class DockerCassandraRule extends ExternalResource {
private boolean allowRestart = false;
@@ -36,16 +34,15 @@ public class DockerCassandraRule implements TestRule {
}
@Override
- public Statement apply(Statement base, Description description) {
- return base;
+ protected void before() {
+ if (allowRestart) {
+ DockerCassandraSingleton.restartAfterMaxTestsPlayed();
+ }
+ DockerCassandraSingleton.incrementTestsPlayed();
}
public void start() {
DockerCassandraSingleton.singleton.start();
- DockerCassandraSingleton.incrementTestsPlayed();
- if (allowRestart) {
- DockerCassandraSingleton.restartAfterMaxTestsPlayed();
- }
}
public void stop() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org