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:04:59 UTC
[1/4] james-project git commit: JAMES-2221 Rename method to match its
current behaviour
Repository: james-project
Updated Branches:
refs/heads/master 9ba015d4d -> ae7a4be5a
JAMES-2221 Rename method to match its current behaviour
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0b5cb970
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0b5cb970
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0b5cb970
Branch: refs/heads/master
Commit: 0b5cb9702de17618b4eda84da7d9000c7f7f1a82
Parents: 9ba015d
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Nov 17 14:24:21 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Nov 17 14:24:21 2017 +0100
----------------------------------------------------------------------
.../james/backends/cassandra/ContainerLifecycleConfiguration.java | 2 +-
.../mailbox/cassandra/CassandraMessageIdManagerStorageTest.java | 3 +--
.../james/mailbox/cassandra/mail/CassandraMessageMapperTest.java | 3 +--
.../james/jmap/cassandra/CassandraGetMessageListMethodTest.java | 2 +-
.../james/jmap/cassandra/CassandraSetMessagesMethodTest.java | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b5cb970/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java
index cabda1f..0768f51 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java
@@ -28,7 +28,7 @@ import org.testcontainers.shaded.com.google.common.base.Preconditions;
public class ContainerLifecycleConfiguration {
- public static Builder builder() {
+ public static Builder withDefaultIterationsBetweenRestart() {
return new Builder();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b5cb970/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerStorageTest.java
----------------------------------------------------------------------
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 d7b42d4..2132688 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
@@ -55,8 +55,7 @@ public class CassandraMessageIdManagerStorageTest extends AbstractMessageIdManag
private CassandraCluster cassandra;
- public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.builder()
- .iterationsBetweenRestart(20)
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart()
.container(cassandraServer.getRawContainer())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b5cb970/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
----------------------------------------------------------------------
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 97aed9c..0fdde79 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
@@ -48,8 +48,7 @@ public class CassandraMessageMapperTest extends MessageMapperTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
- public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.builder()
- .iterationsBetweenRestart(20)
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart()
.container(cassandraServer.getRawContainer())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b5cb970/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
index 1d8857b..b4bf8ff 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java
@@ -33,7 +33,7 @@ public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
- public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.builder().iterationsBetweenRestart(20).container(cassandra.getRawContainer()).build();
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
@Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b5cb970/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
index d553182..9581396 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java
@@ -37,7 +37,7 @@ public class CassandraSetMessagesMethodTest extends SetMessagesMethodTest {
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
- public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.builder().iterationsBetweenRestart(20).container(cassandra.getRawContainer()).build();
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
@Rule
public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/4] james-project git commit: JAMES-2221 Ensure Cassandra container
is well restarted in Cassandra JMAP integration tests
Posted by ad...@apache.org.
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
[4/4] james-project git commit: Merge remote-tracking branch
'mine/MAILET-160'
Posted by ad...@apache.org.
Merge remote-tracking branch 'mine/MAILET-160'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ae7a4be5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ae7a4be5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ae7a4be5
Branch: refs/heads/master
Commit: ae7a4be5a4b31bacc38be2a0d95f4e7064be9165
Parents: 663bd14 e8f5203
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Nov 20 14:04:26 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Nov 20 14:04:26 2017 +0100
----------------------------------------------------------------------
.../james/transport/mailets/ContactExtractor.java | 5 +++--
.../james/transport/mailets/ContactExtractorTest.java | 12 ++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/4] james-project git commit: MAILET-160 Don't fail when the
MimeMessage has not recipient
Posted by ad...@apache.org.
MAILET-160 Don't fail when the MimeMessage has not recipient
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e8f52033
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e8f52033
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e8f52033
Branch: refs/heads/master
Commit: e8f52033170074e716b206d4a27a2e79bff9aecd
Parents: 9ba015d
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Nov 20 10:39:16 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Nov 20 10:39:16 2017 +0100
----------------------------------------------------------------------
.../james/transport/mailets/ContactExtractor.java | 5 +++--
.../james/transport/mailets/ContactExtractorTest.java | 12 ++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e8f52033/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContactExtractor.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContactExtractor.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContactExtractor.java
index bf5665b..6c8f23e 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContactExtractor.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContactExtractor.java
@@ -105,8 +105,9 @@ public class ContactExtractor extends GenericMailet implements Mailet {
.map(Throwing.function(extractedContacts -> objectMapper.writeValueAsString(extractedContacts)));
}
- private boolean hasRecipients(MimeMessage mimeMessage) throws MessagingException {
- return mimeMessage.getAllRecipients().length > 0;
+ @VisibleForTesting boolean hasRecipients(MimeMessage mimeMessage) throws MessagingException {
+ return mimeMessage.getAllRecipients() != null
+ && mimeMessage.getAllRecipients().length > 0;
}
private ImmutableList<String> recipients(MimeMessage mimeMessage) throws MessagingException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/e8f52033/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
index 0ba88ba..ccde3d6 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -233,6 +233,18 @@ public class ContactExtractorTest {
mailet.service(mail);
assertThat(mail.getAttribute(ATTRIBUTE)).isNull();
+ }
+
+ @Test
+ public void hasRecipientsShouldNotThrowWhenNoRecipient() throws Exception {
+ MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ .setSender(SENDER)
+ .setSubject("Contact collection Rocks")
+ .setText("This is my email")
+ .build();
+
+ boolean hasRecipients = mailet.hasRecipients(message);
+ assertThat(hasRecipients).isFalse();
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org